From 94287ee19d1b78b036e1b4a020a6008e6da78f4a Mon Sep 17 00:00:00 2001 From: dldydtn9755-crypto Date: Mon, 20 Jul 2026 18:13:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=BD=EC=BF=B5=20=EC=99=84=EC=84=B1?= =?UTF-8?q?=EB=B3=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Hischool_Chapter3.unity | 4 +- .../CustomAnimations/buck koong.anim | 3 - .../Carnotaurus/CustomAnimations/buck.anim | 3 + .../{buck koong.anim.meta => buck.anim.meta} | 2 +- .../Carnotaurus/carn_Chapter3.controller | 67 ++-- .../Canopy/PP_CH3_Canopy/MI_CanopyFabric.mat | 1 - .../Canopy/PP_CH3_Canopy/MI_CanopyFrame.mat | 6 +- .../Canopy/market-stall/Material__10.mat | 2 +- .../Canopy/market-stall/Material__109.mat | 2 +- .../Canopy/market-stall/Material__11.mat | 2 +- .../Canopy/market-stall/Material__12.mat | 2 +- .../Canopy/market-stall/Material__133.mat | 2 +- .../Canopy/market-stall/Material__15.mat | 2 +- .../Canopy/market-stall/Material__16.mat | 2 +- .../Canopy/market-stall/Material__17.mat | 2 +- .../Canopy/market-stall/Material__18.mat | 2 +- .../Canopy/market-stall/Material__19.mat | 2 +- .../Canopy/market-stall/Material__32.mat | 2 +- .../Canopy/market-stall/Material__33.mat | 2 +- .../Canopy/market-stall/Material__34.mat | 2 +- .../Canopy/market-stall/Material__4.mat | 2 +- .../Canopy/market-stall/Material__5.mat | 2 +- .../Canopy/market-stall/Material__6.mat | 2 +- .../Canopy/market-stall/Material__7.mat | 2 +- .../Canopy/market-stall/Material__8.mat | 2 +- .../Canopy/market-stall/Material__9.mat | 2 +- Assets/07_Data/DialogGraph/Chapter3.meta | 8 + .../Chapter3/Chapter3_Styracosaurus1.dlg | 303 ++++++++++++++++++ .../Chapter3/Chapter3_Styracosaurus1.dlg.meta | 10 + Assets/08_Timeline/Chapter3.meta | 8 + .../Chapter3/ch3CarnotaurusTimeline.playable | 22 ++ .../ch3CarnotaurusTimeline.playable.meta | 8 + .../XR/Settings/OpenXR Package Settings.asset | 4 +- 33 files changed, 436 insertions(+), 51 deletions(-) delete mode 100644 Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim create mode 100644 Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim rename Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/{buck koong.anim.meta => buck.anim.meta} (79%) create mode 100644 Assets/07_Data/DialogGraph/Chapter3.meta create mode 100644 Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg create mode 100644 Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg.meta create mode 100644 Assets/08_Timeline/Chapter3.meta create mode 100644 Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable create mode 100644 Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable.meta diff --git a/Assets/01_Scenes/Hischool_Chapter3.unity b/Assets/01_Scenes/Hischool_Chapter3.unity index 9ce5a2cd..196273ab 100644 --- a/Assets/01_Scenes/Hischool_Chapter3.unity +++ b/Assets/01_Scenes/Hischool_Chapter3.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b04c7d6c1a148dd65153f9a6e755f1145f79078c70dd09ec79a60f5d5c768f3 -size 52844715 +oid sha256:f490e6f7f9bd5a6173f4918f9c43f2f2ac2859d94b1096727b854ff49eb9837b +size 52864187 diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim deleted file mode 100644 index f11664f7..00000000 --- a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:760298361f319a68104cbbce014e5036eccbb193005846521cf6ed555ad1e1bd -size 1387712 diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim new file mode 100644 index 00000000..b3cec376 --- /dev/null +++ b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:999e823e85e7300a3f6dc24a498e7fd03fb45266a2935f4b69a2e3ac4f9cda7e +size 1513249 diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim.meta b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim.meta similarity index 79% rename from Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim.meta rename to Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim.meta index b6b2fdae..4dbad507 100644 --- a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck koong.anim.meta +++ b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/CustomAnimations/buck.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c7fe9379d10009344981a74775984ca1 +guid: b2836baad12cf1442b2d621d7ef5e82f NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter3.controller b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter3.controller index e865ba63..6cfc0a9b 100644 --- a/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter3.controller +++ b/Assets/04_Models/Characters/Real Dinosaurs/Carnotaurus/carn_Chapter3.controller @@ -11,7 +11,7 @@ AnimatorState: m_Speed: 0.3 m_CycleOffset: 0 m_Transitions: - - {fileID: -1940407213388662959} + - {fileID: 1035351197833848775} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -42,6 +42,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1522772649040682112} m_Position: {x: 375.28003, y: -93.47998, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2965342095167288917} + m_Position: {x: 400, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -52,28 +55,32 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -7318602026245386596} ---- !u!1101 &-1940407213388662959 -AnimatorStateTransition: +--- !u!1102 &-2965342095167288917 +AnimatorState: + serializedVersion: 6 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: 1522772649040682112} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.74137926 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_Name: buck + 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: 7400000, guid: b2836baad12cf1442b2d621d7ef5e82f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -97,6 +104,28 @@ AnimatorController: m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} m_EvaluateTransitionsOnStart: 1 +--- !u!1101 &1035351197833848775 +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: -2965342095167288917} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.74137926 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1522772649040682112 AnimatorState: serializedVersion: 6 diff --git a/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFabric.mat b/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFabric.mat index be170b13..8f8ccf02 100644 --- a/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFabric.mat +++ b/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFabric.mat @@ -13,7 +13,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - - _OCCLUSIONMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFrame.mat b/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFrame.mat index 72fe5460..feb807fc 100644 --- a/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFrame.mat +++ b/Assets/04_Models/Festival/Canopy/PP_CH3_Canopy/MI_CanopyFrame.mat @@ -24,9 +24,7 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP - - _OCCLUSIONMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -65,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 4d6de2b4e98d9b74d871b8311588ff97, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__10.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__10.mat index aa12f178..54616753 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__10.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__10.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 2d43fd38f8c36b343b32a23ba8080bef, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__109.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__109.mat index 6669c48e..ddca6943 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__109.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__109.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 405454ce84c43f6439e13022be730c68, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__11.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__11.mat index bec356f6..02919c83 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__11.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__11.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 92eac9006101d3944817ee064d1c3322, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__12.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__12.mat index a628ab30..ff97dc3d 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__12.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__12.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: ccf3e6db06d364a4fafbcb6b22004d5b, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__133.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__133.mat index 57972354..e6cc7e73 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__133.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__133.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 5170d084dcfb8c647897ceca3495819c, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__15.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__15.mat index d7a8eec8..264886bf 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__15.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__15.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 6e231b8557c4653428c9136d9b5b7ecf, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__16.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__16.mat index 905754d3..904a50d7 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__16.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__16.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 41ea2baf7c5d01946aecee208edc0a04, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__17.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__17.mat index 80f8d1fe..9cfb96d7 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__17.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__17.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 1562f5bba26096146a4283e931177836, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__18.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__18.mat index a3a13532..f7b17987 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__18.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__18.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 19a5c601b52bb3d4ab4da0fc22ad7225, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__19.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__19.mat index b7de5048..634565f7 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__19.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__19.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 14be5bc9410bc2d42938541755ae15c5, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__32.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__32.mat index 6f75545f..57d0c2d1 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__32.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__32.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 97aa729635c9d8348a62f3fd69780e1d, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__33.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__33.mat index 5023f6ff..b7f8e7be 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__33.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__33.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 716b3fadb447f084da29c06fb944a538, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__34.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__34.mat index 80b177b3..34b30c86 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__34.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__34.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 8ebb96d24f8ec5449a306f9cb4629ba2, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__4.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__4.mat index 16c24d6f..4a906900 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__4.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__4.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 4ffbb73cc5dbc75428bc91968a1d0b4c, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__5.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__5.mat index 64553f6f..49bd90b0 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__5.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__5.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0a9ace99cc564564a92531050293fdc6, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__6.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__6.mat index 6275f2f1..34ba6558 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__6.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__6.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 22393525dc88a61468388eae63e89559, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__7.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__7.mat index 0de0048e..e263d1e2 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__7.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__7.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0c8081b907bc717489de5935267175e1, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__8.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__8.mat index ec40829d..b2884ed9 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__8.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__8.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 33385397f3cac324ebd70fcc5d08efbc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/04_Models/Festival/Canopy/market-stall/Material__9.mat b/Assets/04_Models/Festival/Canopy/market-stall/Material__9.mat index 397bac79..b35c2fd7 100644 --- a/Assets/04_Models/Festival/Canopy/market-stall/Material__9.mat +++ b/Assets/04_Models/Festival/Canopy/market-stall/Material__9.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d414a002be3d7b34d96fd6285d896ff8, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/07_Data/DialogGraph/Chapter3.meta b/Assets/07_Data/DialogGraph/Chapter3.meta new file mode 100644 index 00000000..d77caebd --- /dev/null +++ b/Assets/07_Data/DialogGraph/Chapter3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26954bf396ebd1241a81140e69bd9d13 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg new file mode 100644 index 00000000..39139625 --- /dev/null +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg @@ -0,0 +1,303 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12501, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Chapter3_Styracosaurus1 + m_EditorClassIdentifier: UnityEditor.dll::Unity.GraphToolkit.Editor.Implementation.GraphObjectImp + m_GraphModel: + rid: 4848514453388656899 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 4848514453388656899 + type: {class: GraphModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 10378577389719029742 + m_Value1: 14990812597565823167 + m_HashGuid: + serializedVersion: 2 + Hash: ee871adc251d0890bf985cfca1100ad0 + m_Name: Chapter3_Styracosaurus1 + m_GraphNodeModels: + - rid: 4848514453388656902 + - rid: 4848514453388656904 + m_GraphWireModels: + - rid: 4848514453388656905 + m_GraphStickyNoteModels: [] + m_GraphPlacematModels: [] + m_GraphVariableModels: [] + m_GraphPortalModels: [] + m_SectionModels: + - rid: 4848514453388656900 + m_LocalSubgraphs: [] + m_LastKnownBounds: + serializedVersion: 2 + x: 173 + y: 87 + width: 655 + height: 552 + m_GraphElementMetaData: + - m_Guid: + m_Value0: 3953896658662454792 + m_Value1: 17132231479142926168 + m_HashGuid: + serializedVersion: 2 + Hash: 08f62dfa0f10df3658471484c2e9c1ed + m_Category: 0 + m_Index: 0 + - m_Guid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_HashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_Category: 0 + m_Index: 1 + - m_Guid: + m_Value0: 6438258882588987619 + m_Value1: 16280232558899195376 + m_HashGuid: + serializedVersion: 2 + Hash: e350b8a4574a5959f06def854101efe1 + m_Category: 2 + m_Index: 0 + m_EntryPoint: + rid: 4848514453388656902 + m_Graph: + rid: 4848514453388656901 + - rid: 4848514453388656900 + type: {class: SectionModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5167448814378227062 + m_Value1: 6149631618382083437 + m_HashGuid: + serializedVersion: 2 + Hash: 761507805177b6476db52cf15fe15755 + m_Version: 2 + m_Items: [] + m_Title: + - rid: 4848514453388656901 + type: {class: DialogGraph, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514453388656902 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 3953896658662454792 + m_Value1: 17132231479142926168 + m_HashGuid: + serializedVersion: 2 + Hash: 08f62dfa0f10df3658471484c2e9c1ed + m_Version: 2 + m_Position: {x: 172.69565, y: 140} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: [] + m_ValueList: [] + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514453388656903 + - rid: 4848514453388656903 + type: {class: DialogStartNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514453388656904 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_HashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_Version: 2 + m_Position: {x: 406, y: 87.17392} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - Speaker + - SpeakerNameOverride + - TalkText + - Gesture + - Expression + - Voice + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - WaitForInput + - HudAnchor + - Affection + - Progress + m_ValueList: + - rid: 4848514453388656906 + - rid: 4848514453388656907 + - rid: 4848514453388656908 + - rid: 4848514453388656909 + - rid: 4848514453388656910 + - rid: 4848514453388656911 + - rid: 4848514453388656912 + - rid: 4848514453388656913 + - rid: 4848514453388656914 + - rid: 4848514453388656915 + - rid: 4848514453388656916 + - rid: 4848514453388656917 + - rid: 4848514453388656918 + - rid: 4848514453388656919 + - rid: 4848514455607443580 + - rid: 8016363810277818485 + - rid: 8016363810277818486 + m_InputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_OutputPortInfos: + expandedPortsById: + m_KeyList: [] + m_ValueList: + m_Collapsed: 0 + m_CurrentModeIndex: 0 + m_ElementColor: + m_Color: {r: 0, g: 0, b: 0, a: 0} + m_HasUserColor: 0 + m_Node: + rid: 4848514453388656920 + - rid: 4848514453388656905 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 6438258882588987619 + m_Value1: 16280232558899195376 + m_HashGuid: + serializedVersion: 2 + Hash: e350b8a4574a5959f06def854101efe1 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 3953896658662454792 + m_Value1: 17132231479142926168 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 08f62dfa0f10df3658471484c2e9c1ed + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 4848514453388656906 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656907 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 4848514453388656908 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 4848514453388656909 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 4848514453388656910 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC751, \uAE08\uC794\uB514. \uBB34\uC2A8 \uC77C\uC774\uC57C?" + - rid: 4848514453388656911 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656912 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656913 + type: {class: 'Constant`1[[VoiceClip, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656914 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656915 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 4848514453388656916 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 3 + - rid: 4848514453388656917 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 1 + - rid: 4848514453388656918 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656919 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 4848514453388656920 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 4848514455607443580 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: c6477f09ddbfaaa43b73a8eb323ba389, type: 2} + - rid: 8016363810277818485 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363810277818486 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg.meta b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg.meta new file mode 100644 index 00000000..98e55314 --- /dev/null +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Styracosaurus1.dlg.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 6413bdb9e64923e4f923135f5d0b44c5 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 2ae5ca89bbed445479d9023586f0c041, type: 3} diff --git a/Assets/08_Timeline/Chapter3.meta b/Assets/08_Timeline/Chapter3.meta new file mode 100644 index 00000000..d42e2820 --- /dev/null +++ b/Assets/08_Timeline/Chapter3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 628bdd45684fb7a4294e0bdb61ccf40a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable b/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable new file mode 100644 index 00000000..59284c4f --- /dev/null +++ b/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: ch3CarnotaurusTimeline + m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.TimelineAsset + m_Version: 0 + m_Tracks: [] + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} diff --git a/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable.meta b/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable.meta new file mode 100644 index 00000000..956a1cdc --- /dev/null +++ b/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87e05049e4b63654a888cf93710ef0a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index e3e06439..825358cc 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:efebcb20a5cebead11ae65030a6d76f7daf24b5f758905bf37fb0db45613b76e -size 288 +oid sha256:2fe21aa9a741bd937bd3d0f42e71bb9af72bf6f22e9c7c2831ebd56226fbdb4d +size 42268