Skip to content

Commit 2b3e99a

Browse files
fernando-cortezfernando-cortez
committed
merge release
2 parents 06cdd18 + 0a3a88c commit 2b3e99a

40 files changed

+602
-296
lines changed

‎Assets/BossRoom/Material/Characters/Hero_Eyes_sheet.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ Material:
106106
- _UVSec: 0
107107
- _ZWrite: 0
108108
m_Colors:
109-
- _BaseColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
109+
- _BaseColor: {r: 0.248, g: 0.248, b: 0.248, a: 1}
110110
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
111-
- _EmissionColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1}
111+
- _EmissionColor: {r: 0.135, g: 0.135, b: 0.135, a: 1}
112112
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
113113
m_BuildTextureStacks: []
114114
--- !u!114 &4340826014879142409

‎Assets/BossRoom/Models/ClickFeedbackController.controller

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1107 &-3408950728626638424
4+
AnimatorStateMachine:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 1
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Base Layer
11+
m_ChildStates:
12+
- serializedVersion: 1
13+
m_State: {fileID: 8953144010422057453}
14+
m_Position: {x: 210, y: 10, z: 0}
15+
m_ChildStateMachines: []
16+
m_AnyStateTransitions: []
17+
m_EntryTransitions: []
18+
m_StateMachineTransitions: {}
19+
m_StateMachineBehaviours: []
20+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
21+
m_EntryPosition: {x: 50, y: 120, z: 0}
22+
m_ExitPosition: {x: 800, y: 120, z: 0}
23+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
24+
m_DefaultState: {fileID: 8953144010422057453}
25+
--- !u!91 &9100000
26+
AnimatorController:
27+
m_ObjectHideFlags: 0
28+
m_CorrespondingSourceObject: {fileID: 0}
29+
m_PrefabInstance: {fileID: 0}
30+
m_PrefabAsset: {fileID: 0}
31+
m_Name: ClickFeedbackController
32+
serializedVersion: 5
33+
m_AnimatorParameters: []
34+
m_AnimatorLayers:
35+
- serializedVersion: 5
36+
m_Name: Base Layer
37+
m_StateMachine: {fileID: -3408950728626638424}
38+
m_Mask: {fileID: 0}
39+
m_Motions: []
40+
m_Behaviours: []
41+
m_BlendingMode: 0
42+
m_SyncedLayerIndex: -1
43+
m_DefaultWeight: 0
44+
m_IKPass: 0
45+
m_SyncedLayerAffectsTiming: 0
46+
m_Controller: {fileID: 9100000}
47+
--- !u!1102 &8953144010422057453
48+
AnimatorState:
49+
serializedVersion: 6
50+
m_ObjectHideFlags: 1
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_Name: UI_GroundClick
55+
m_Speed: 1
56+
m_CycleOffset: 0
57+
m_Transitions: []
58+
m_StateMachineBehaviours: []
59+
m_Position: {x: 50, y: 50, z: 0}
60+
m_IKOnFeet: 0
61+
m_WriteDefaultValues: 1
62+
m_Mirror: 0
63+
m_SpeedParameterActive: 0
64+
m_MirrorParameterActive: 0
65+
m_CycleOffsetParameterActive: 0
66+
m_TimeParameterActive: 0
67+
m_Motion: {fileID: 7400000, guid: afc67a48ae8dfea4793e330e10545ddc, type: 2}
68+
m_Tag:
69+
m_SpeedParameter:
70+
m_MirrorParameter:
71+
m_CycleOffsetParameter:
72+
m_TimeParameter:

‎Assets/BossRoom/Models/ClickFeedbackController.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.

‎Assets/BossRoom/Models/UI_GroundClick.anim

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:20225d855c2b5c5457fcfb2a6eb7cbecffdb5b5f0696f3aaebe218f7e8d88ec2
3+
size 5249

‎Assets/BossRoom/Models/UI_GroundClick.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/Models/UI_LobbyBox_LockedIn.anim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1bc7905b3d3e1909976a255d8cdebeaf45cdeb0f7398db5591431c57ad937223
2+
oid sha256:038a2df2a177de24ef8ae5860f9967b0a8dcbc98fdc46a33a87fabd422d13a20
33
size 4134

‎Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics_Mage.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ MonoBehaviour:
182182
m_PrefabSpawnDelaySeconds: 0
183183
m_PrefabCanBeAbortedUntilSecs: 0
184184
m_PrefabParent: {fileID: 1313590801738418481, guid: c94325ee327b53c49939f904d073f197, type: 3}
185-
m_PrefabParentOffset: {x: 0, y: 0, z: 50}
185+
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
186186
m_DeParentPrefab: 0
187187
m_SoundEffect: {fileID: 8300000, guid: b239f215d2645db40ad6183403eb26df, type: 3}
188188
m_SoundStartDelaySeconds: 0

‎Assets/BossRoom/Prefabs/Character/PlayerAvatar.prefab

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ MonoBehaviour:
6565
m_Name:
6666
m_EditorClassIdentifier:
6767
m_Animator: {fileID: 1829276847453002016}
68-
m_ParameterSendBits: 0
69-
m_SendRate: 0.1
7068
--- !u!114 &7209204667172237188
7169
MonoBehaviour:
7270
m_ObjectHideFlags: 0
@@ -307,7 +305,6 @@ MonoBehaviour:
307305
m_Script: {fileID: 11500000, guid: e363085af981a41fd816ab952a0a07c7, type: 3}
308306
m_Name:
309307
m_EditorClassIdentifier:
310-
m_PingIntervalSeconds: 0.1
311308
--- !u!114 &4354133789489545025
312309
MonoBehaviour:
313310
m_ObjectHideFlags: 0
@@ -333,6 +330,7 @@ MonoBehaviour:
333330
m_Script: {fileID: 11500000, guid: 331c67f15523ad7419792662b9768f44, type: 3}
334331
m_Name:
335332
m_EditorClassIdentifier:
333+
moveRate: 0.05
336334
m_CharacterClassContainer: {fileID: 5230418375993597025}
337335
m_PhysicsWrapper: {fileID: 6116655102486013040}
338336
--- !u!114 &5043718152237111612

‎Assets/BossRoom/Prefabs/Click_Feedback.prefab

Lines changed: 35 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ GameObject:
1111
- component: {fileID: 2500332623759108304}
1212
- component: {fileID: 6101625250476277925}
1313
- component: {fileID: 6375111725193425194}
14-
- component: {fileID: 7164482062141736850}
1514
- component: {fileID: 5754560017040867806}
15+
- component: {fileID: 8568434976788884338}
16+
- component: {fileID: 7961553494364404633}
1617
m_Layer: 0
1718
m_Name: Click_Feedback
1819
m_TagString: Untagged
@@ -29,9 +30,8 @@ Transform:
2930
m_GameObject: {fileID: 9137928905311479176}
3031
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
3132
m_LocalPosition: {x: 0, y: 0, z: 0}
32-
m_LocalScale: {x: 1, y: 1, z: 1}
33-
m_Children:
34-
- {fileID: 2816127936030266596}
33+
m_LocalScale: {x: 2.713, y: 2.713, z: 2.713}
34+
m_Children: []
3535
m_Father: {fileID: 0}
3636
m_RootOrder: 0
3737
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
@@ -50,7 +50,7 @@ MeshRenderer:
5050
m_PrefabInstance: {fileID: 0}
5151
m_PrefabAsset: {fileID: 0}
5252
m_GameObject: {fileID: 9137928905311479176}
53-
m_Enabled: 0
53+
m_Enabled: 1
5454
m_CastShadows: 1
5555
m_ReceiveShadows: 1
5656
m_DynamicOccludee: 1
@@ -62,7 +62,7 @@ MeshRenderer:
6262
m_RenderingLayerMask: 1
6363
m_RendererPriority: 0
6464
m_Materials:
65-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
65+
- {fileID: 2100000, guid: bfad40b971740ef4381f47a69fd3348d, type: 2}
6666
m_StaticBatchInfo:
6767
firstSubMesh: 0
6868
subMeshCount: 0
@@ -84,21 +84,39 @@ MeshRenderer:
8484
m_SortingLayer: 0
8585
m_SortingOrder: 0
8686
m_AdditionalVertexStreams: {fileID: 0}
87-
--- !u!64 &7164482062141736850
88-
MeshCollider:
87+
--- !u!114 &5754560017040867806
88+
MonoBehaviour:
8989
m_ObjectHideFlags: 0
9090
m_CorrespondingSourceObject: {fileID: 0}
9191
m_PrefabInstance: {fileID: 0}
9292
m_PrefabAsset: {fileID: 0}
9393
m_GameObject: {fileID: 9137928905311479176}
94-
m_Material: {fileID: 0}
95-
m_IsTrigger: 0
9694
m_Enabled: 1
97-
serializedVersion: 4
98-
m_Convex: 0
99-
m_CookingOptions: 30
100-
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
101-
--- !u!114 &5754560017040867806
95+
m_EditorHideFlags: 0
96+
m_Script: {fileID: 11500000, guid: b853e11fb193c8149bd7d25b17c0ddc6, type: 3}
97+
m_Name:
98+
m_EditorClassIdentifier:
99+
m_DisabledDelay: 0.75
100+
--- !u!95 &8568434976788884338
101+
Animator:
102+
serializedVersion: 3
103+
m_ObjectHideFlags: 0
104+
m_CorrespondingSourceObject: {fileID: 0}
105+
m_PrefabInstance: {fileID: 0}
106+
m_PrefabAsset: {fileID: 0}
107+
m_GameObject: {fileID: 9137928905311479176}
108+
m_Enabled: 1
109+
m_Avatar: {fileID: 0}
110+
m_Controller: {fileID: 9100000, guid: 11646ef5453865d459c8ec37484dbdf3, type: 2}
111+
m_CullingMode: 0
112+
m_UpdateMode: 0
113+
m_ApplyRootMotion: 0
114+
m_LinearVelocityBlending: 0
115+
m_WarningMessage:
116+
m_HasTransformHierarchy: 1
117+
m_AllowConstantClipSamplingOptimization: 1
118+
m_KeepAnimatorControllerStateOnDisable: 0
119+
--- !u!114 &7961553494364404633
102120
MonoBehaviour:
103121
m_ObjectHideFlags: 0
104122
m_CorrespondingSourceObject: {fileID: 0}
@@ -107,69 +125,7 @@ MonoBehaviour:
107125
m_GameObject: {fileID: 9137928905311479176}
108126
m_Enabled: 1
109127
m_EditorHideFlags: 0
110-
m_Script: {fileID: 11500000, guid: b853e11fb193c8149bd7d25b17c0ddc6, type: 3}
128+
m_Script: {fileID: 11500000, guid: 598271baef5b1d843990b429b974205f, type: 3}
111129
m_Name:
112130
m_EditorClassIdentifier:
113-
m_DisabledDelay: 0.75
114-
--- !u!1001 &5569208290851949093
115-
PrefabInstance:
116-
m_ObjectHideFlags: 0
117-
serializedVersion: 2
118-
m_Modification:
119-
m_TransformParent: {fileID: 2500332623759108304}
120-
m_Modifications:
121-
- target: {fileID: 6957808770263120477, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
122-
propertyPath: m_Name
123-
value: GroundClickFX
124-
objectReference: {fileID: 0}
125-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
126-
propertyPath: m_RootOrder
127-
value: 0
128-
objectReference: {fileID: 0}
129-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
130-
propertyPath: m_LocalPosition.x
131-
value: 0
132-
objectReference: {fileID: 0}
133-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
134-
propertyPath: m_LocalPosition.y
135-
value: 0
136-
objectReference: {fileID: 0}
137-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
138-
propertyPath: m_LocalPosition.z
139-
value: 0
140-
objectReference: {fileID: 0}
141-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
142-
propertyPath: m_LocalRotation.w
143-
value: 1
144-
objectReference: {fileID: 0}
145-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
146-
propertyPath: m_LocalRotation.x
147-
value: 0
148-
objectReference: {fileID: 0}
149-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
150-
propertyPath: m_LocalRotation.y
151-
value: 0
152-
objectReference: {fileID: 0}
153-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
154-
propertyPath: m_LocalRotation.z
155-
value: 0
156-
objectReference: {fileID: 0}
157-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
158-
propertyPath: m_LocalEulerAnglesHint.x
159-
value: 0
160-
objectReference: {fileID: 0}
161-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
162-
propertyPath: m_LocalEulerAnglesHint.y
163-
value: 0
164-
objectReference: {fileID: 0}
165-
- target: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
166-
propertyPath: m_LocalEulerAnglesHint.z
167-
value: 0
168-
objectReference: {fileID: 0}
169-
m_RemovedComponents: []
170-
m_SourcePrefab: {fileID: 100100000, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
171-
--- !u!4 &2816127936030266596 stripped
172-
Transform:
173-
m_CorrespondingSourceObject: {fileID: 7664326125434658497, guid: 7c2bd7eca3b96084f99aa3a945102b11, type: 3}
174-
m_PrefabInstance: {fileID: 5569208290851949093}
175-
m_PrefabAsset: {fileID: 0}
131+
lerpSpeed: 0.03

‎Assets/BossRoom/Prefabs/Debug Overlay Canvas.prefab

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ RectTransform:
134134
m_AnchorMin: {x: 0, y: 0}
135135
m_AnchorMax: {x: 0, y: 0}
136136
m_AnchoredPosition: {x: 40, y: 40}
137-
m_SizeDelta: {x: 200, y: 400}
137+
m_SizeDelta: {x: 240, y: 400}
138138
m_Pivot: {x: 0, y: 0}
139139
--- !u!114 &3464894946384537378
140140
MonoBehaviour:
@@ -157,8 +157,8 @@ MonoBehaviour:
157157
m_Spacing: 0
158158
m_ChildForceExpandWidth: 1
159159
m_ChildForceExpandHeight: 0
160-
m_ChildControlWidth: 0
161-
m_ChildControlHeight: 0
160+
m_ChildControlWidth: 1
161+
m_ChildControlHeight: 1
162162
m_ChildScaleWidth: 0
163163
m_ChildScaleHeight: 0
164164
m_ReverseArrangement: 0

‎Assets/BossRoom/Prefabs/NetworkingManager.prefab

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ MonoBehaviour:
5050
m_HeartbeatTimeoutMS: 500
5151
m_ConnectTimeoutMS: 1000
5252
m_MaxConnectAttempts: 60
53-
m_DisconnectTimeoutMS: 10000
53+
m_DisconnectTimeoutMS: 5000
5454
ConnectionData:
5555
Address: 127.0.0.1
5656
Port: 7777
5757
ServerListenAddress:
58+
DebugSimulator:
59+
PacketDelayMS: 0
60+
PacketJitterMS: 0
61+
PacketDropRate: 0
5862
--- !u!1 &503411707
5963
GameObject:
6064
m_ObjectHideFlags: 0
@@ -105,11 +109,15 @@ MonoBehaviour:
105109
m_HeartbeatTimeoutMS: 500
106110
m_ConnectTimeoutMS: 1000
107111
m_MaxConnectAttempts: 60
108-
m_DisconnectTimeoutMS: 10000
112+
m_DisconnectTimeoutMS: 5000
109113
ConnectionData:
110114
Address: 127.0.0.1
111115
Port: 7777
112116
ServerListenAddress:
117+
DebugSimulator:
118+
PacketDelayMS: 0
119+
PacketJitterMS: 0
120+
PacketDropRate: 0
113121
--- !u!1 &5436007408952557947
114122
GameObject:
115123
m_ObjectHideFlags: 0
@@ -219,7 +227,7 @@ MonoBehaviour:
219227
SourceHashToOverride: 0
220228
OverridingTargetPrefab: {fileID: 0}
221229
TickRate: 30
222-
ClientConnectionBufferTimeout: 10
230+
ClientConnectionBufferTimeout: 5
223231
ConnectionApproval: 1
224232
ConnectionData:
225233
EnableTimeResync: 0

0 commit comments

Comments
 (0)