Skip to content

Commit 278a524

Browse files
committed
Merge branch 'main' into worldbuilding
# Conflicts: # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/02a28a9c355f4fac879be8ab591f1a6a.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/0f35a51a6d884c8ab30219b5a3b05de7.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/108b5a6e887748a1875141cf7eefbf8e.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/177f1a363471462daaaa7e27712e2b77.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/17f9a240deb94feb8a71fae200bf7ff1.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/26347a43a1d94f6eba6efb6ca3d40208.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2ab75110e077404aaaa2789feb3cc82e.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/2f392744e4d142f7a81da2a69bdaa99f.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/512005dcb52a4d588ffc91db589f24ff.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/61ff26a35193421ca949920d7f31272e.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/62e84ee9f9e643f1a032b508500bfd5c.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/699b94c63b6645b99d8ba37316fcff93.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/6a0867b1a5ad4282a9b96ce8d42b451a.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/6a6ab855268048f090fb4a08880db14f.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/6e8f5162dafe4a83a3f169fc26b062a2.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/7745ea35700249c88587f4c5b92240bb.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/7d7b607d50204db8baf1377967c5834d.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/87545eadd98a49289cade05b8cfacfd8.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/8c6c4747caf04faa9713d5d588f21f4c.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/8e7ba89d029d480182ebbbaf7d226876.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/9a2333a5072248ea8967890cf9726479.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/9ce1bc46d9f34fda98c2c241090751e6.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/9e5bde8421c440c7a9a7cd4182430eff.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/a6633cdf656d43c982a5f0dd1f78e2d6.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/b231a51f7f7c4d3d844fcd19f431c1aa.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/b3199c19fac9465fa8be5ad4ea3c719f.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/b34a2c376d2c45e7a78cc6eaaa9acc21.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/b3b353461fc74042866f6ff646a27efd.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/bc1e40999cd3457484d0b75f946ff0d3.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/c61c3c9b2db444e59e6fa1116ddaa4ea.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/c8da1f21eddd463c8a72faaca82f8682.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/c9f58dccb1cb486ca75f49f57fdc3e92.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/cba032fc7a774819b1acd64cd4b4a05c.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/cd18d1128bbb4721ad97d02290ff913e.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/cff9f16b897f4cb98d0b4409f93996d6.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/dbfdfff642fa4240ad4054c490c63c63.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/dc440f98f27344038ca03d19508cd548.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/efa938ae8064476a8a8f59aed80178ca.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/f41f2b49ad6b4d0aa42a9ef2fb364d18.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/f63752304425437e881aa897ac1f90d4.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/f7c84a6b59a34c47868896e3746c8afd.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/fa30b31737ed49939edfb9c8dd091677.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/fa797cb5db7f42b3b3c58578354c2822.asset # UOP1_Project/Assets/ProBuilder Data/ProBuilderMeshCache/ff781790d31f4ebe94553ef82955f6ad.asset
2 parents 256194b + f96540a commit 278a524

File tree

60 files changed

+12595
-2790
lines changed

Some content is hidden

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

60 files changed

+12595
-2790
lines changed

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare.controller

Lines changed: 124 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,31 @@ AnimatorStateMachine:
7070
m_ExitPosition: {x: 870, y: 160, z: 0}
7171
m_ParentStateMachinePosition: {x: 230, y: -170, z: 0}
7272
m_DefaultState: {fileID: -5498160952533448129}
73+
--- !u!1101 &-8554734348597689868
74+
AnimatorStateTransition:
75+
m_ObjectHideFlags: 1
76+
m_CorrespondingSourceObject: {fileID: 0}
77+
m_PrefabInstance: {fileID: 0}
78+
m_PrefabAsset: {fileID: 0}
79+
m_Name:
80+
m_Conditions:
81+
- m_ConditionMode: 1
82+
m_ConditionEvent: ExitTimeline
83+
m_EventTreshold: 0
84+
m_DstStateMachine: {fileID: -8922074601772979250}
85+
m_DstState: {fileID: 0}
86+
m_Solo: 0
87+
m_Mute: 0
88+
m_IsExit: 0
89+
serializedVersion: 3
90+
m_TransitionDuration: 0.25
91+
m_TransitionOffset: 0
92+
m_ExitTime: 0.75
93+
m_HasExitTime: 1
94+
m_HasFixedDuration: 1
95+
m_InterruptionSource: 0
96+
m_OrderedInterruption: 1
97+
m_CanTransitionToSelf: 1
7398
--- !u!1101 &-8330992559062188889
7499
AnimatorStateTransition:
75100
m_ObjectHideFlags: 1
@@ -613,25 +638,37 @@ AnimatorController:
613638
m_DefaultFloat: 0
614639
m_DefaultInt: 0
615640
m_DefaultBool: 0
616-
m_Controller: {fileID: 9100000}
641+
m_Controller: {fileID: 0}
617642
- m_Name: IsTalking
618643
m_Type: 4
619644
m_DefaultFloat: 0
620645
m_DefaultInt: 0
621646
m_DefaultBool: 0
622-
m_Controller: {fileID: 9100000}
647+
m_Controller: {fileID: 0}
623648
- m_Name: JumpUp
624649
m_Type: 9
625650
m_DefaultFloat: 0
626651
m_DefaultInt: 0
627652
m_DefaultBool: 0
628-
m_Controller: {fileID: 9100000}
653+
m_Controller: {fileID: 0}
629654
- m_Name: JumpDown
630655
m_Type: 9
631656
m_DefaultFloat: 0
632657
m_DefaultInt: 0
633658
m_DefaultBool: 0
634-
m_Controller: {fileID: 9100000}
659+
m_Controller: {fileID: 0}
660+
- m_Name: EnterTimeline
661+
m_Type: 9
662+
m_DefaultFloat: 0
663+
m_DefaultInt: 0
664+
m_DefaultBool: 0
665+
m_Controller: {fileID: 0}
666+
- m_Name: ExitTimeline
667+
m_Type: 9
668+
m_DefaultFloat: 0
669+
m_DefaultInt: 0
670+
m_DefaultBool: 0
671+
m_Controller: {fileID: 0}
635672
m_AnimatorLayers:
636673
- serializedVersion: 5
637674
m_Name: Base Layer
@@ -930,6 +967,31 @@ AnimatorState:
930967
m_MirrorParameter:
931968
m_CycleOffsetParameter:
932969
m_TimeParameter:
970+
--- !u!1101 &4416550691375841523
971+
AnimatorStateTransition:
972+
m_ObjectHideFlags: 1
973+
m_CorrespondingSourceObject: {fileID: 0}
974+
m_PrefabInstance: {fileID: 0}
975+
m_PrefabAsset: {fileID: 0}
976+
m_Name:
977+
m_Conditions:
978+
- m_ConditionMode: 1
979+
m_ConditionEvent: EnterTimeline
980+
m_EventTreshold: 0
981+
m_DstStateMachine: {fileID: 0}
982+
m_DstState: {fileID: 5509002280715272292}
983+
m_Solo: 0
984+
m_Mute: 0
985+
m_IsExit: 0
986+
serializedVersion: 3
987+
m_TransitionDuration: 0.25
988+
m_TransitionOffset: 0
989+
m_ExitTime: 0.75
990+
m_HasExitTime: 0
991+
m_HasFixedDuration: 1
992+
m_InterruptionSource: 0
993+
m_OrderedInterruption: 1
994+
m_CanTransitionToSelf: 1
933995
--- !u!1101 &5450956186395528051
934996
AnimatorStateTransition:
935997
m_ObjectHideFlags: 1
@@ -955,6 +1017,33 @@ AnimatorStateTransition:
9551017
m_InterruptionSource: 0
9561018
m_OrderedInterruption: 1
9571019
m_CanTransitionToSelf: 1
1020+
--- !u!1102 &5509002280715272292
1021+
AnimatorState:
1022+
serializedVersion: 6
1023+
m_ObjectHideFlags: 1
1024+
m_CorrespondingSourceObject: {fileID: 0}
1025+
m_PrefabInstance: {fileID: 0}
1026+
m_PrefabAsset: {fileID: 0}
1027+
m_Name: InTimeline
1028+
m_Speed: 1
1029+
m_CycleOffset: 0
1030+
m_Transitions:
1031+
- {fileID: -8554734348597689868}
1032+
m_StateMachineBehaviours: []
1033+
m_Position: {x: 50, y: 50, z: 0}
1034+
m_IKOnFeet: 0
1035+
m_WriteDefaultValues: 1
1036+
m_Mirror: 0
1037+
m_SpeedParameterActive: 0
1038+
m_MirrorParameterActive: 0
1039+
m_CycleOffsetParameterActive: 0
1040+
m_TimeParameterActive: 0
1041+
m_Motion: {fileID: 0}
1042+
m_Tag:
1043+
m_SpeedParameter:
1044+
m_MirrorParameter:
1045+
m_CycleOffsetParameter:
1046+
m_TimeParameter:
9581047
--- !u!1101 &6375416532858191911
9591048
AnimatorStateTransition:
9601049
m_ObjectHideFlags: 1
@@ -998,20 +1087,49 @@ AnimatorStateMachine:
9981087
- serializedVersion: 1
9991088
m_State: {fileID: -2751829022450645959}
10001089
m_Position: {x: 950, y: 150, z: 0}
1090+
- serializedVersion: 1
1091+
m_State: {fileID: 5509002280715272292}
1092+
m_Position: {x: 380, y: 40, z: 0}
10011093
m_ChildStateMachines:
10021094
- serializedVersion: 1
10031095
m_StateMachine: {fileID: -8922074601772979250}
10041096
m_Position: {x: 380, y: 140, z: 0}
1005-
m_AnyStateTransitions: []
1097+
m_AnyStateTransitions:
1098+
- {fileID: 4416550691375841523}
10061099
m_EntryTransitions:
10071100
- {fileID: -4394027057195029758}
10081101
m_StateMachineTransitions:
10091102
- first: {fileID: -8922074601772979250}
10101103
second:
10111104
- {fileID: 3618554181139686882}
10121105
m_StateMachineBehaviours: []
1013-
m_AnyStatePosition: {x: 80, y: 50, z: 0}
1106+
m_AnyStatePosition: {x: 90, y: -30, z: 0}
10141107
m_EntryPosition: {x: 80, y: 150, z: 0}
10151108
m_ExitPosition: {x: 80, y: 230, z: 0}
10161109
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
10171110
m_DefaultState: {fileID: 506854443335118827}
1111+
--- !u!1101 &8595320703037287098
1112+
AnimatorStateTransition:
1113+
m_ObjectHideFlags: 1
1114+
m_CorrespondingSourceObject: {fileID: 0}
1115+
m_PrefabInstance: {fileID: 0}
1116+
m_PrefabAsset: {fileID: 0}
1117+
m_Name:
1118+
m_Conditions:
1119+
- m_ConditionMode: 1
1120+
m_ConditionEvent: EnterTimeline
1121+
m_EventTreshold: 0
1122+
m_DstStateMachine: {fileID: 0}
1123+
m_DstState: {fileID: 5509002280715272292}
1124+
m_Solo: 0
1125+
m_Mute: 0
1126+
m_IsExit: 0
1127+
serializedVersion: 3
1128+
m_TransitionDuration: 0.25
1129+
m_TransitionOffset: 0
1130+
m_ExitTime: 0.75
1131+
m_HasExitTime: 0
1132+
m_HasFixedDuration: 1
1133+
m_InterruptionSource: 0
1134+
m_OrderedInterruption: 1
1135+
m_CanTransitionToSelf: 1

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_idle.fbx.meta

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

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_jump_down.fbx.meta

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

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_jump_up.fbx.meta

Lines changed: 6 additions & 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)