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
2026-07-27 20:09:59 +09:00
parent 5235999588 3558b85ce3
commit 87f5eb6ed5
270 changed files with 61705 additions and 968 deletions
--- a/Dinosaurs/Carnotaurus/carn_Chapter4.controller
+++ b/Dinosaurs/Carnotaurus/carn_Chapter4.controller
@@ -1,5 +1,54 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-2944761435178376677
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Carn|Walk
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -484299869792730782}
+  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: 7400050, guid: 3a76ebca0d7213f44b4079b9bb53b121, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-484299869792730782
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 8112752976601807942}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.87288135
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
  m_ObjectHideFlags: 0
@@ -23,6 +72,32 @@ AnimatorController:
    m_SyncedLayerAffectsTiming: 0
    m_Controller: {fileID: 9100000}
  m_EvaluateTransitionsOnStart: 1
+--- !u!1102 &8112752976601807942
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Carn|Die2
+  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: 7400004, guid: 3a76ebca0d7213f44b4079b9bb53b121, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &8238045318014309158
 AnimatorStateMachine:
  serializedVersion: 7
@@ -31,7 +106,13 @@ AnimatorStateMachine:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Base Layer
-  m_ChildStates: []
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2944761435178376677}
+    m_Position: {x: 370, y: 80, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8112752976601807942}
+    m_Position: {x: 451, y: 202, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@@ -41,4 +122,4 @@ 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: -2944761435178376677}