diff --git a/Assets/01_Scenes/Hischool_Chapter2.unity b/Assets/01_Scenes/Hischool_Chapter2.unity index bcc8cc63..2439cefb 100644 --- a/Assets/01_Scenes/Hischool_Chapter2.unity +++ b/Assets/01_Scenes/Hischool_Chapter2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5ae0c9e26e84c2061848cf1744837c4377f4f6346743c5fd76ce4e15c0b71a9 -size 4723814 +oid sha256:c7431bbb910faf18c65a08cb9568d9257406e61bd1104742e273788ef460c6f3 +size 4736920 diff --git a/Assets/04_Models/Characters/Real Dinosaurs/D4/Styracosaurus.prefab b/Assets/04_Models/Characters/Real Dinosaurs/D4/Styracosaurus.prefab index 73f44aaf..1c6a0087 100644 --- a/Assets/04_Models/Characters/Real Dinosaurs/D4/Styracosaurus.prefab +++ b/Assets/04_Models/Characters/Real Dinosaurs/D4/Styracosaurus.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b51776487bd66f1330b0b7a8128c338d338ddc510308cf32f983a6f19cc782e -size 78705 +oid sha256:c07178e7e973354fc1c18b2fd0168949a3f57defbb49acbb12dc191ae4cc7a14 +size 78788 diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra_Normal.controller b/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra_Normal.controller new file mode 100644 index 00000000..4e1a6761 --- /dev/null +++ b/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra_Normal.controller @@ -0,0 +1,204 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7330604060282256001 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + 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: -3835214390337429448} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!206 &-3835214390337429448 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400060, guid: e47f08bd492f9ba42a19291dd4ac79df, type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: AnimNo + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400056, guid: e47f08bd492f9ba42a19291dd4ac79df, type: 3} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 5 + m_CycleOffset: 0 + m_DirectBlendParameter: AnimNo + m_Mirror: 0 + m_BlendParameter: Speed + m_BlendParameterY: AnimNo + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: styra_Normal + serializedVersion: 6 + m_AnimatorParameters: + - m_Name: AnimNo + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 110789714} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 0 +--- !u!1101 &110109794 +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: 110248284} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &110156192 +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: 110212918} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &110177960 +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: 110223654} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.5 + m_TransitionOffset: 0 + m_ExitTime: 0.7413793 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &110185940 +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: 110207632} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &110789714 +AnimatorStateMachine: + serializedVersion: 7 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7330604060282256001} + m_Position: {x: 380, y: -90, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -168, y: -144, z: 0} + m_EntryPosition: {x: 732, y: -84, z: 0} + m_ExitPosition: {x: -168, y: -108, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7330604060282256001} diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra_Normal.controller.meta b/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra_Normal.controller.meta new file mode 100644 index 00000000..b59d50ad --- /dev/null +++ b/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra_Normal.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 740fdbf68fd89e441901c46f965af6df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/Characters/Yuna_DragonForm.meta b/Assets/04_Models/Characters/Yuna_DragonForm.meta new file mode 100644 index 00000000..2b7fa68f --- /dev/null +++ b/Assets/04_Models/Characters/Yuna_DragonForm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd827e3dcf0513847acf146008b39d2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Models/VR_Player.prefab b/Assets/04_Models/VR_Player.prefab index 3ef7d250..be554f61 100644 --- a/Assets/04_Models/VR_Player.prefab +++ b/Assets/04_Models/VR_Player.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a266704b6b2fc9087d8a046e6e124d1a3ccfeb44e8eb52c678644f74756b0b4d -size 85772 +oid sha256:0866e216332c621e37c2fcf27af9e81fde20189ac016e22777cc4aa2dfff5355 +size 86246 diff --git a/Assets/04_Models/obj/ScreamMask/Prefabs/MaskV2.prefab b/Assets/04_Models/obj/ScreamMask/Prefabs/MaskV2.prefab index 45c7a4a7..c7533c85 100644 --- a/Assets/04_Models/obj/ScreamMask/Prefabs/MaskV2.prefab +++ b/Assets/04_Models/obj/ScreamMask/Prefabs/MaskV2.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6d7022d6333bbb135e468e0788f98ca1cb68f98c93af7865dfe409a0882f82c -size 17552 +oid sha256:3d383a42e14ea254d2a51bff532b4963bbbeba1c11b1b9d1bb24e9b2514bf936 +size 17717 diff --git a/Assets/07_Data/DialogGraph/Chapter2/Chapter2_Styracosaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter2/Chapter2_Styracosaurus1.dlg index c37ccf7c..b083cb5c 100644 --- a/Assets/07_Data/DialogGraph/Chapter2/Chapter2_Styracosaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter2/Chapter2_Styracosaurus1.dlg @@ -654,7 +654,7 @@ MonoBehaviour: - rid: 4848514521070567597 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: Chapter2_StyracosaurusTimeline1 - rid: 4848514521070567598 type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index bdc4ba99..8c9ed33a 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8fbd07d77937ca0cde6d9ee01174edff3275a8f6016a1b53fb71036048c900f -size 96377 +oid sha256:6eff47c7028673e04fb28ab2d0697a4873278dbcea375f2826f42b94fa786ef3 +size 98816 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b4a06421..7a5d3a2f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94bc60eec7c87dd005f2e4aee6b2deeb1cd9fafe2492a34d6ba4f15f723131ff -size 373 +oid sha256:bb098997106afb79c71f61205140eeac72a2b88ac26c4559d5992211677f1b49 +size 915