Skip to content

Commit 167fb5f

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'develop' into feature/loading-screen
2 parents aeaa412 + 721b16f commit 167fb5f

Some content is hidden

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

42 files changed

+2243
-628
lines changed

‎Assets/BossRoom/Models/Animation Controllers/CharacterSetController.controller

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,7 @@ AnimatorState:
925925
m_Transitions:
926926
- {fileID: 8727437690882463675}
927927
- {fileID: 5784886232730517633}
928+
- {fileID: -3605610604413125243}
928929
m_StateMachineBehaviours: []
929930
m_Position: {x: 50, y: 50, z: 0}
930931
m_IKOnFeet: 0
@@ -1068,6 +1069,28 @@ AnimatorStateTransition:
10681069
m_InterruptionSource: 0
10691070
m_OrderedInterruption: 1
10701071
m_CanTransitionToSelf: 1
1072+
--- !u!1101 &-3605610604413125243
1073+
AnimatorStateTransition:
1074+
m_ObjectHideFlags: 1
1075+
m_CorrespondingSourceObject: {fileID: 0}
1076+
m_PrefabInstance: {fileID: 0}
1077+
m_PrefabAsset: {fileID: 0}
1078+
m_Name:
1079+
m_Conditions: []
1080+
m_DstStateMachine: {fileID: 0}
1081+
m_DstState: {fileID: 1411007122952585507}
1082+
m_Solo: 0
1083+
m_Mute: 0
1084+
m_IsExit: 0
1085+
serializedVersion: 3
1086+
m_TransitionDuration: 0.25
1087+
m_TransitionOffset: 0
1088+
m_ExitTime: 0.8809527
1089+
m_HasExitTime: 1
1090+
m_HasFixedDuration: 1
1091+
m_InterruptionSource: 0
1092+
m_OrderedInterruption: 1
1093+
m_CanTransitionToSelf: 1
10711094
--- !u!1101 &-3576141394984483750
10721095
AnimatorStateTransition:
10731096
m_ObjectHideFlags: 1
@@ -1571,7 +1594,7 @@ AnimatorStateMachine:
15711594
m_Position: {x: 20, y: -310, z: 0}
15721595
- serializedVersion: 1
15731596
m_State: {fileID: -3914668711228621697}
1574-
m_Position: {x: 210, y: -230, z: 0}
1597+
m_Position: {x: 300, y: -250, z: 0}
15751598
- serializedVersion: 1
15761599
m_State: {fileID: 1411007122952585507}
15771600
m_Position: {x: 290, y: -140, z: 0}
@@ -1712,175 +1735,175 @@ AnimatorController:
17121735
m_DefaultFloat: 0
17131736
m_DefaultInt: 0
17141737
m_DefaultBool: 0
1715-
m_Controller: {fileID: 0}
1738+
m_Controller: {fileID: 9100000}
17161739
- m_Name: Attack1
17171740
m_Type: 9
17181741
m_DefaultFloat: 0
17191742
m_DefaultInt: 0
17201743
m_DefaultBool: 0
1721-
m_Controller: {fileID: 0}
1744+
m_Controller: {fileID: 9100000}
17221745
- m_Name: HitReact1
17231746
m_Type: 9
17241747
m_DefaultFloat: 0
17251748
m_DefaultInt: 0
17261749
m_DefaultBool: 0
1727-
m_Controller: {fileID: 0}
1750+
m_Controller: {fileID: 9100000}
17281751
- m_Name: FallDown
17291752
m_Type: 9
17301753
m_DefaultFloat: 0
17311754
m_DefaultInt: 0
17321755
m_DefaultBool: 0
1733-
m_Controller: {fileID: 0}
1756+
m_Controller: {fileID: 9100000}
17341757
- m_Name: StandUp
17351758
m_Type: 9
17361759
m_DefaultFloat: 0
17371760
m_DefaultInt: 0
17381761
m_DefaultBool: 0
1739-
m_Controller: {fileID: 0}
1762+
m_Controller: {fileID: 9100000}
17401763
- m_Name: BeginRevive
17411764
m_Type: 9
17421765
m_DefaultFloat: 0
17431766
m_DefaultInt: 0
17441767
m_DefaultBool: 0
1745-
m_Controller: {fileID: 0}
1768+
m_Controller: {fileID: 9100000}
17461769
- m_Name: Dead
17471770
m_Type: 9
17481771
m_DefaultFloat: 0
17491772
m_DefaultInt: 0
17501773
m_DefaultBool: 0
1751-
m_Controller: {fileID: 0}
1774+
m_Controller: {fileID: 9100000}
17521775
- m_Name: Attack2
17531776
m_Type: 9
17541777
m_DefaultFloat: 0
17551778
m_DefaultInt: 0
17561779
m_DefaultBool: 0
1757-
m_Controller: {fileID: 0}
1780+
m_Controller: {fileID: 9100000}
17581781
- m_Name: Emote1
17591782
m_Type: 9
17601783
m_DefaultFloat: 0
17611784
m_DefaultInt: 0
17621785
m_DefaultBool: 0
1763-
m_Controller: {fileID: 0}
1786+
m_Controller: {fileID: 9100000}
17641787
- m_Name: Emote2
17651788
m_Type: 9
17661789
m_DefaultFloat: 0
17671790
m_DefaultInt: 0
17681791
m_DefaultBool: 0
1769-
m_Controller: {fileID: 0}
1792+
m_Controller: {fileID: 9100000}
17701793
- m_Name: Emote3
17711794
m_Type: 9
17721795
m_DefaultFloat: 0
17731796
m_DefaultInt: 0
17741797
m_DefaultBool: 0
1775-
m_Controller: {fileID: 0}
1798+
m_Controller: {fileID: 9100000}
17761799
- m_Name: Emote4
17771800
m_Type: 9
17781801
m_DefaultFloat: 0
17791802
m_DefaultInt: 0
17801803
m_DefaultBool: 0
1781-
m_Controller: {fileID: 0}
1804+
m_Controller: {fileID: 9100000}
17821805
- m_Name: Trample
17831806
m_Type: 9
17841807
m_DefaultFloat: 0
17851808
m_DefaultInt: 0
17861809
m_DefaultBool: 0
1787-
m_Controller: {fileID: 0}
1810+
m_Controller: {fileID: 9100000}
17881811
- m_Name: SkillHeal
17891812
m_Type: 9
17901813
m_DefaultFloat: 0
17911814
m_DefaultInt: 0
17921815
m_DefaultBool: 0
1793-
m_Controller: {fileID: 0}
1816+
m_Controller: {fileID: 9100000}
17941817
- m_Name: Stunned
17951818
m_Type: 9
17961819
m_DefaultFloat: 0
17971820
m_DefaultInt: 0
17981821
m_DefaultBool: 0
1799-
m_Controller: {fileID: 0}
1822+
m_Controller: {fileID: 9100000}
18001823
- m_Name: Unstunned
18011824
m_Type: 9
18021825
m_DefaultFloat: 0
18031826
m_DefaultInt: 0
18041827
m_DefaultBool: 0
1805-
m_Controller: {fileID: 0}
1828+
m_Controller: {fileID: 9100000}
18061829
- m_Name: ShieldBuffStart
18071830
m_Type: 9
18081831
m_DefaultFloat: 0
18091832
m_DefaultInt: 0
18101833
m_DefaultBool: 0
1811-
m_Controller: {fileID: 0}
1834+
m_Controller: {fileID: 9100000}
18121835
- m_Name: ShieldBuffEnd
18131836
m_Type: 9
18141837
m_DefaultFloat: 0
18151838
m_DefaultInt: 0
18161839
m_DefaultBool: 0
1817-
m_Controller: {fileID: 0}
1840+
m_Controller: {fileID: 9100000}
18181841
- m_Name: ChargedShotStart
18191842
m_Type: 9
18201843
m_DefaultFloat: 0
18211844
m_DefaultInt: 0
18221845
m_DefaultBool: 0
1823-
m_Controller: {fileID: 0}
1846+
m_Controller: {fileID: 9100000}
18241847
- m_Name: ChargedShotEnd
18251848
m_Type: 9
18261849
m_DefaultFloat: 0
18271850
m_DefaultInt: 0
18281851
m_DefaultBool: 0
1829-
m_Controller: {fileID: 0}
1852+
m_Controller: {fileID: 9100000}
18301853
- m_Name: EntryFainted
18311854
m_Type: 9
18321855
m_DefaultFloat: 0
18331856
m_DefaultInt: 0
18341857
m_DefaultBool: 0
1835-
m_Controller: {fileID: 0}
1858+
m_Controller: {fileID: 9100000}
18361859
- m_Name: EntryDead
18371860
m_Type: 9
18381861
m_DefaultFloat: 0
18391862
m_DefaultInt: 0
18401863
m_DefaultBool: 0
1841-
m_Controller: {fileID: 0}
1864+
m_Controller: {fileID: 9100000}
18421865
- m_Name: Buff1
18431866
m_Type: 9
18441867
m_DefaultFloat: 0
18451868
m_DefaultInt: 0
18461869
m_DefaultBool: 0
1847-
m_Controller: {fileID: 0}
1870+
m_Controller: {fileID: 9100000}
18481871
- m_Name: AnticipateMove
18491872
m_Type: 9
18501873
m_DefaultFloat: 0
18511874
m_DefaultInt: 0
18521875
m_DefaultBool: 0
1853-
m_Controller: {fileID: 0}
1876+
m_Controller: {fileID: 9100000}
18541877
- m_Name: Invincible
18551878
m_Type: 3
18561879
m_DefaultFloat: 0
18571880
m_DefaultInt: 0
18581881
m_DefaultBool: 0
1859-
m_Controller: {fileID: 0}
1882+
m_Controller: {fileID: 9100000}
18601883
- m_Name: TrampleStop
18611884
m_Type: 9
18621885
m_DefaultFloat: 0
18631886
m_DefaultInt: 0
18641887
m_DefaultBool: 0
1865-
m_Controller: {fileID: 0}
1888+
m_Controller: {fileID: 9100000}
18661889
- m_Name: DashAttackStart
18671890
m_Type: 9
18681891
m_DefaultFloat: 0
18691892
m_DefaultInt: 0
18701893
m_DefaultBool: 0
1871-
m_Controller: {fileID: 0}
1894+
m_Controller: {fileID: 9100000}
18721895
- m_Name: DashAttackEnd
18731896
m_Type: 9
18741897
m_DefaultFloat: 0
18751898
m_DefaultInt: 0
18761899
m_DefaultBool: 0
1877-
m_Controller: {fileID: 0}
1900+
m_Controller: {fileID: 9100000}
18781901
- m_Name: DashAttackCanceled
18791902
m_Type: 9
18801903
m_DefaultFloat: 0
18811904
m_DefaultInt: 0
18821905
m_DefaultBool: 0
1883-
m_Controller: {fileID: 0}
1906+
m_Controller: {fileID: 9100000}
18841907
m_AnimatorLayers:
18851908
- serializedVersion: 5
18861909
m_Name: Base Layer

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ MonoBehaviour:
8080
m_Name:
8181
m_EditorClassIdentifier:
8282
m_ClientVisualsAnimator: {fileID: 1829276847453002016}
83-
m_CharacterSwapper: {fileID: 0}
8483
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
8584
--- !u!1001 &7831782662127126385
8685
PrefabInstance:
@@ -293,7 +292,7 @@ MonoBehaviour:
293292
m_NetworkHealthState: {fileID: 7751377510591478590}
294293
m_ClientCharacter: {fileID: 2292431908892550450}
295294
m_BaseHP: {fileID: 0}
296-
m_TransformToTrack: {fileID: 0}
295+
m_TransformToTrack: {fileID: 7902288483105483375}
297296
m_VerticalWorldOffset: 2.2
298297
m_VerticalScreenOffset: 20
299298
--- !u!114 &3481187672596608374
@@ -361,7 +360,6 @@ MonoBehaviour:
361360
m_Script: {fileID: 11500000, guid: 7bb02fcdd8d85034794f2a32382009e3, type: 3}
362361
m_Name:
363362
m_EditorClassIdentifier:
364-
m_ClientCharacter: {fileID: 2292431908892550450}
365363
m_GraphicsAnimator: {fileID: 1829276847453002016}
366364
m_NetworkAvatarGuidState: {fileID: 2466014342928185240}
367365
--- !u!114 &7232939173259361562

‎Assets/BossRoom/Prefabs/DebugCheatsManager.prefab

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &776943915682426285
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 2726635115303138402}
12+
- component: {fileID: 7241368247586282332}
13+
- component: {fileID: 6695920927348029111}
14+
m_Layer: 0
15+
m_Name: DebugCheatsManager
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &2726635115303138402
22+
Transform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 776943915682426285}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!114 &7241368247586282332
36+
MonoBehaviour:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 776943915682426285}
42+
m_Enabled: 1
43+
m_EditorHideFlags: 0
44+
m_Script: {fileID: 11500000, guid: ab1e76745edfc434ab8154ad27efc5fd, type: 3}
45+
m_Name:
46+
m_EditorClassIdentifier:
47+
m_EnemyPrefab: {fileID: 3713729372785093435, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
48+
m_BossPrefab: {fileID: 3688950541947916326, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
49+
m_DebugCheatsPanel: {fileID: 0}
50+
m_OpenWindowKeyCode: 47
51+
--- !u!114 &6695920927348029111
52+
MonoBehaviour:
53+
m_ObjectHideFlags: 0
54+
m_CorrespondingSourceObject: {fileID: 0}
55+
m_PrefabInstance: {fileID: 0}
56+
m_PrefabAsset: {fileID: 0}
57+
m_GameObject: {fileID: 776943915682426285}
58+
m_Enabled: 1
59+
m_EditorHideFlags: 0
60+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
61+
m_Name:
62+
m_EditorClassIdentifier:
63+
GlobalObjectIdHash: 951099334
64+
AlwaysReplicateAsRoot: 0
65+
DontDestroyWithOwner: 0
66+
AutoObjectParentSync: 1

‎Assets/BossRoom/Prefabs/SessionManager.prefab.meta renamed to ‎Assets/BossRoom/Prefabs/DebugCheatsManager.prefab.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)