Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

# Conflicts:
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-0_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-10_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-11_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-12_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-13_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-14_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-15_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-16_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-1_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-2_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-3_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-4_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-5_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-6_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-7_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-8_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_dir.png.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_light.exr.meta
#	Assets/01_Scenes/Festival_Chapter5/Lightmap-9_comp_shadowmask.png.meta
#	Assets/01_Scenes/Festival_Chapter5/ReflectionProbe-0.exr.meta
#	Assets/01_Scenes/Hischool_Chapter4/Festival_Test Baking Set.asset.meta

Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra ch4.controller

@@ -1,5 +1,31 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7855678076689992006
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Styra|Idle1C
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400064, guid: e47f08bd492f9ba42a19291dd4ac79df, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -31,7 +57,13 @@ AnimatorStateMachine:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Base Layer
-  m_ChildStates: []
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -7855678076689992006}
+    m_Position: {x: 338.76227, y: 120.388596, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 7730523720058225641}
+    m_Position: {x: 312.97266, y: 257.5893, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -41,4 +73,30 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 0}
+  m_DefaultState: {fileID: -7855678076689992006}
+--- !u!1102 &7730523720058225641
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Styra|RunAtk2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400078, guid: e47f08bd492f9ba42a19291dd4ac79df, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: