Skip to content

Commit 9fad5c0

Browse files
committed
Merge branch 'feature/bump-2021' into feature/bump-2021-feat/RNSM-dogfooding
* feature/bump-2021: material update update with right package lock generated files as well tmp commit for merge feat: test utilities script including Playmode test helpers (#484) feat: bump to pre.8 and fix compile issues [MTT-3413] (#631) feat: client network transform move to samples [MTT-3406] (#629) feat: in-game message feed [MTT-2678] [MTT-2318] (#601) feat: networked message channel (#605) Fixed Z Fighting of Floor Tiles Near Edge of Main Boss Room (#616) fix: SceneBootstrapper detects and allows TestRunner launches (#483) removed feature to set all players unready in char select when a player leaves or joins (#625) removed setting disconnect reason to UserRequested on clients entering post-game (#626) Disallowing portait orientation for auto rotation (#627) chore: removing QoS (#623) # Conflicts: # Assets/BossRoom/Scenes/Startup.unity # Packages/manifest.json
2 parents 020bc46 + d49af7d commit 9fad5c0

File tree

205 files changed

+4198
-974
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+4198
-974
lines changed

Assets/BossRoom/Animations.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/BossRoom/Animations/UI.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1101 &-8271959049630102114
4+
AnimatorStateTransition:
5+
m_ObjectHideFlags: 1
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name:
10+
m_Conditions: []
11+
m_DstStateMachine: {fileID: 0}
12+
m_DstState: {fileID: 8336730943762134427}
13+
m_Solo: 0
14+
m_Mute: 0
15+
m_IsExit: 0
16+
serializedVersion: 3
17+
m_TransitionDuration: 0
18+
m_TransitionOffset: 0
19+
m_ExitTime: 1
20+
m_HasExitTime: 1
21+
m_HasFixedDuration: 1
22+
m_InterruptionSource: 0
23+
m_OrderedInterruption: 1
24+
m_CanTransitionToSelf: 1
25+
--- !u!1107 &-6517374293630203477
26+
AnimatorStateMachine:
27+
serializedVersion: 6
28+
m_ObjectHideFlags: 1
29+
m_CorrespondingSourceObject: {fileID: 0}
30+
m_PrefabInstance: {fileID: 0}
31+
m_PrefabAsset: {fileID: 0}
32+
m_Name: Base Layer
33+
m_ChildStates:
34+
- serializedVersion: 1
35+
m_State: {fileID: 8773687198468971542}
36+
m_Position: {x: 30, y: 280, z: 0}
37+
- serializedVersion: 1
38+
m_State: {fileID: -2660560960858769395}
39+
m_Position: {x: 326.7693, y: 29.06958, z: 0}
40+
- serializedVersion: 1
41+
m_State: {fileID: 8336730943762134427}
42+
m_Position: {x: 320, y: 280, z: 0}
43+
m_ChildStateMachines: []
44+
m_AnyStateTransitions:
45+
- {fileID: 6947869538029660717}
46+
- {fileID: -2135654591094134350}
47+
m_EntryTransitions: []
48+
m_StateMachineTransitions: {}
49+
m_StateMachineBehaviours: []
50+
m_AnyStatePosition: {x: 10, y: -60, z: 0}
51+
m_EntryPosition: {x: -100, y: 120, z: 0}
52+
m_ExitPosition: {x: 800, y: 120, z: 0}
53+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
54+
m_DefaultState: {fileID: 8336730943762134427}
55+
--- !u!1102 &-2660560960858769395
56+
AnimatorState:
57+
serializedVersion: 6
58+
m_ObjectHideFlags: 1
59+
m_CorrespondingSourceObject: {fileID: 0}
60+
m_PrefabInstance: {fileID: 0}
61+
m_PrefabAsset: {fileID: 0}
62+
m_Name: Anim_UI_Message_Hide
63+
m_Speed: 1
64+
m_CycleOffset: 0
65+
m_Transitions: []
66+
m_StateMachineBehaviours: []
67+
m_Position: {x: 50, y: 50, z: 0}
68+
m_IKOnFeet: 0
69+
m_WriteDefaultValues: 1
70+
m_Mirror: 0
71+
m_SpeedParameterActive: 0
72+
m_MirrorParameterActive: 0
73+
m_CycleOffsetParameterActive: 0
74+
m_TimeParameterActive: 0
75+
m_Motion: {fileID: 7400000, guid: cbf7c4f341ab3e84ca34f98d4b245587, type: 2}
76+
m_Tag:
77+
m_SpeedParameter:
78+
m_MirrorParameter:
79+
m_CycleOffsetParameter:
80+
m_TimeParameter:
81+
--- !u!1101 &-2135654591094134350
82+
AnimatorStateTransition:
83+
m_ObjectHideFlags: 1
84+
m_CorrespondingSourceObject: {fileID: 0}
85+
m_PrefabInstance: {fileID: 0}
86+
m_PrefabAsset: {fileID: 0}
87+
m_Name:
88+
m_Conditions:
89+
- m_ConditionMode: 1
90+
m_ConditionEvent: Display
91+
m_EventTreshold: 0
92+
m_DstStateMachine: {fileID: 0}
93+
m_DstState: {fileID: 8773687198468971542}
94+
m_Solo: 0
95+
m_Mute: 0
96+
m_IsExit: 0
97+
serializedVersion: 3
98+
m_TransitionDuration: 0
99+
m_TransitionOffset: 0
100+
m_ExitTime: 0.75
101+
m_HasExitTime: 0
102+
m_HasFixedDuration: 1
103+
m_InterruptionSource: 0
104+
m_OrderedInterruption: 1
105+
m_CanTransitionToSelf: 1
106+
--- !u!91 &9100000
107+
AnimatorController:
108+
m_ObjectHideFlags: 0
109+
m_CorrespondingSourceObject: {fileID: 0}
110+
m_PrefabInstance: {fileID: 0}
111+
m_PrefabAsset: {fileID: 0}
112+
m_Name: AnimController_UI_Message
113+
serializedVersion: 5
114+
m_AnimatorParameters:
115+
- m_Name: Display
116+
m_Type: 9
117+
m_DefaultFloat: 0
118+
m_DefaultInt: 0
119+
m_DefaultBool: 0
120+
m_Controller: {fileID: 9100000}
121+
- m_Name: Hide
122+
m_Type: 9
123+
m_DefaultFloat: 0
124+
m_DefaultInt: 0
125+
m_DefaultBool: 0
126+
m_Controller: {fileID: 9100000}
127+
m_AnimatorLayers:
128+
- serializedVersion: 5
129+
m_Name: Base Layer
130+
m_StateMachine: {fileID: -6517374293630203477}
131+
m_Mask: {fileID: 0}
132+
m_Motions: []
133+
m_Behaviours: []
134+
m_BlendingMode: 0
135+
m_SyncedLayerIndex: -1
136+
m_DefaultWeight: 0
137+
m_IKPass: 0
138+
m_SyncedLayerAffectsTiming: 0
139+
m_Controller: {fileID: 9100000}
140+
--- !u!1101 &6947869538029660717
141+
AnimatorStateTransition:
142+
m_ObjectHideFlags: 1
143+
m_CorrespondingSourceObject: {fileID: 0}
144+
m_PrefabInstance: {fileID: 0}
145+
m_PrefabAsset: {fileID: 0}
146+
m_Name:
147+
m_Conditions:
148+
- m_ConditionMode: 1
149+
m_ConditionEvent: Hide
150+
m_EventTreshold: 0
151+
m_DstStateMachine: {fileID: 0}
152+
m_DstState: {fileID: -2660560960858769395}
153+
m_Solo: 0
154+
m_Mute: 0
155+
m_IsExit: 0
156+
serializedVersion: 3
157+
m_TransitionDuration: 0
158+
m_TransitionOffset: 0
159+
m_ExitTime: 0.75
160+
m_HasExitTime: 0
161+
m_HasFixedDuration: 1
162+
m_InterruptionSource: 0
163+
m_OrderedInterruption: 1
164+
m_CanTransitionToSelf: 1
165+
--- !u!1102 &8336730943762134427
166+
AnimatorState:
167+
serializedVersion: 6
168+
m_ObjectHideFlags: 1
169+
m_CorrespondingSourceObject: {fileID: 0}
170+
m_PrefabInstance: {fileID: 0}
171+
m_PrefabAsset: {fileID: 0}
172+
m_Name: Anim_UI_Message_Idle
173+
m_Speed: 1
174+
m_CycleOffset: 0
175+
m_Transitions: []
176+
m_StateMachineBehaviours: []
177+
m_Position: {x: 50, y: 50, z: 0}
178+
m_IKOnFeet: 0
179+
m_WriteDefaultValues: 1
180+
m_Mirror: 0
181+
m_SpeedParameterActive: 0
182+
m_MirrorParameterActive: 0
183+
m_CycleOffsetParameterActive: 0
184+
m_TimeParameterActive: 0
185+
m_Motion: {fileID: 7400000, guid: 6d66bf3633728c04aadb53681ac668c9, type: 2}
186+
m_Tag:
187+
m_SpeedParameter:
188+
m_MirrorParameter:
189+
m_CycleOffsetParameter:
190+
m_TimeParameter:
191+
--- !u!1102 &8773687198468971542
192+
AnimatorState:
193+
serializedVersion: 6
194+
m_ObjectHideFlags: 1
195+
m_CorrespondingSourceObject: {fileID: 0}
196+
m_PrefabInstance: {fileID: 0}
197+
m_PrefabAsset: {fileID: 0}
198+
m_Name: Anim_UI_Message_Slide
199+
m_Speed: 1
200+
m_CycleOffset: 0
201+
m_Transitions:
202+
- {fileID: -8271959049630102114}
203+
m_StateMachineBehaviours: []
204+
m_Position: {x: 50, y: 50, z: 0}
205+
m_IKOnFeet: 0
206+
m_WriteDefaultValues: 1
207+
m_Mirror: 0
208+
m_SpeedParameterActive: 0
209+
m_MirrorParameterActive: 0
210+
m_CycleOffsetParameterActive: 0
211+
m_TimeParameterActive: 0
212+
m_Motion: {fileID: 7400000, guid: de98af101c5af20458ab3499237d078c, type: 2}
213+
m_Tag:
214+
m_SpeedParameter:
215+
m_MirrorParameter:
216+
m_CycleOffsetParameter:
217+
m_TimeParameter:

Assets/BossRoom/Animations/UI/AnimController_UI_Message.controller.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:ed064ddeba020284574428a887d944842f4384771f3c0759e5031d3cbf9cfda2
3+
size 7466

Assets/BossRoom/Animations/UI/Anim_UI_Message_Hide.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:009d9ad15faada4d667615b6a913c8cf2a238b30ec7ac242b8036ce62574de53
3+
size 4657

Assets/BossRoom/Animations/UI/Anim_UI_Message_Idle.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:33d8792a05a32a459c94f76fba36280cf7b5bfe897bc05cfc27eb14011e36352
3+
size 6963

Assets/BossRoom/Animations/UI/Anim_UI_Message_Slide.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/BossRoom/Material/Characters/Character_Shadow.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Character_Shadow
1111
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
12-
m_ShaderKeywords: _SURFACE_TYPE_TRANSPARENT
12+
m_ValidKeywords:
13+
- _SURFACE_TYPE_TRANSPARENT
14+
m_InvalidKeywords: []
1315
m_LightmapFlags: 4
1416
m_EnableInstancingVariants: 0
1517
m_DoubleSidedGI: 0

Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Enemy_Eyes_sheet
1111
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
12+
m_ValidKeywords:
13+
- _ALPHATEST_ON
14+
- _EMISSION
15+
- _RECEIVE_SHADOWS_OFF
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 2
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0

Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,19 @@ MonoBehaviour:
1515
version: 5
1616
--- !u!21 &2100000
1717
Material:
18-
serializedVersion: 6
18+
serializedVersion: 8
1919
m_ObjectHideFlags: 0
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Enemy_Mouth_sheet
2424
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
25-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
25+
m_ValidKeywords:
26+
- _ALPHATEST_ON
27+
- _EMISSION
28+
- _RECEIVE_SHADOWS_OFF
29+
- _SURFACE_TYPE_TRANSPARENT
30+
m_InvalidKeywords: []
2631
m_LightmapFlags: 2
2732
m_EnableInstancingVariants: 1
2833
m_DoubleSidedGI: 0

Assets/BossRoom/Material/Characters/Hero_Eyes_sheet.mat

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hero_Eyes_sheet
1111
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
12+
m_ValidKeywords:
13+
- _ALPHATEST_ON
14+
- _EMISSION
15+
- _RECEIVE_SHADOWS_OFF
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 2
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0

Assets/BossRoom/Material/Characters/Hero_Mouth_sheet.mat

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!21 &2100000
44
Material:
5-
serializedVersion: 6
5+
serializedVersion: 8
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Hero_Mouth_sheet
1111
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
12-
m_ShaderKeywords: _ALPHATEST_ON _EMISSION _RECEIVE_SHADOWS_OFF _SURFACE_TYPE_TRANSPARENT
12+
m_ValidKeywords:
13+
- _ALPHATEST_ON
14+
- _EMISSION
15+
- _RECEIVE_SHADOWS_OFF
16+
- _SURFACE_TYPE_TRANSPARENT
17+
m_InvalidKeywords: []
1318
m_LightmapFlags: 2
1419
m_EnableInstancingVariants: 1
1520
m_DoubleSidedGI: 0

0 commit comments

Comments
 (0)