diff --git a/Assets/01_Scenes/Hischool_Chapter3.unity b/Assets/01_Scenes/Hischool_Chapter3.unity index 08e700d4..622dc425 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:0e642fb58748846491bb4ef0e53cb36932f68cf1c0b251bf4fbe8ee0380b791f -size 41019222 +oid sha256:19cc689d17c7ab827a0d3dd9fe2fb74af5a7b979f483b2ed5dbca698984d0394 +size 41039751 diff --git a/Assets/01_Scenes/Hischool_Chapter4.unity b/Assets/01_Scenes/Hischool_Chapter4.unity index 53d7ffa3..f2ea586d 100644 --- a/Assets/01_Scenes/Hischool_Chapter4.unity +++ b/Assets/01_Scenes/Hischool_Chapter4.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c441ec8031e5e3d17488303e7db4cc8e087288549e854e80e58f430de4e14175 -size 578239 +oid sha256:500ae03755d86270bb88ab2ac907825287630e7076e723452248410579836635 +size 593615 diff --git a/Assets/02_Scripts/Story/ch3.meta b/Assets/02_Scripts/Story/ch3.meta new file mode 100644 index 00000000..b610dbed --- /dev/null +++ b/Assets/02_Scripts/Story/ch3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c69e37265e7e163459b3894cea6d0c59 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Story/KimchiHitZone.cs b/Assets/02_Scripts/Story/ch3/KimchiHitZone.cs similarity index 100% rename from Assets/02_Scripts/Story/KimchiHitZone.cs rename to Assets/02_Scripts/Story/ch3/KimchiHitZone.cs diff --git a/Assets/02_Scripts/Story/KimchiHitZone.cs.meta b/Assets/02_Scripts/Story/ch3/KimchiHitZone.cs.meta similarity index 100% rename from Assets/02_Scripts/Story/KimchiHitZone.cs.meta rename to Assets/02_Scripts/Story/ch3/KimchiHitZone.cs.meta diff --git a/Assets/02_Scripts/Story/ch3/ResetChildLocalRotation.cs b/Assets/02_Scripts/Story/ch3/ResetChildLocalRotation.cs new file mode 100644 index 00000000..a0330401 --- /dev/null +++ b/Assets/02_Scripts/Story/ch3/ResetChildLocalRotation.cs @@ -0,0 +1,22 @@ +using UnityEngine; + +public class ResetChildLocalRotation : MonoBehaviour +{ + [SerializeField] private Transform target; + + private Quaternion initialLocalRotation; + + private void Awake() + { + if (target != null) + initialLocalRotation = target.localRotation; + } + + public void ResetRotation() + { + if (target == null) + return; + + target.localRotation = initialLocalRotation; + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Story/ch3/ResetChildLocalRotation.cs.meta b/Assets/02_Scripts/Story/ch3/ResetChildLocalRotation.cs.meta new file mode 100644 index 00000000..620ac518 --- /dev/null +++ b/Assets/02_Scripts/Story/ch3/ResetChildLocalRotation.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 8f701eb628e084b4f87b750c2716f6f5 \ No newline at end of file diff --git a/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra ch4.controller b/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra ch4.controller index 1b2b6377..5b971d20 100644 --- a/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra ch4.controller +++ b/Assets/04_Models/Characters/Real Dinosaurs/Styracosaurus/styra ch4.controller @@ -1,5 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8668345173763766825 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: attck + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1711312539946826225} + 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: 7400076, guid: e47f08bd492f9ba42a19291dd4ac79df, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-7855678076689992006 AnimatorState: serializedVersion: 6 @@ -26,6 +53,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1711312539946826225 +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: -7855678076689992006} + 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!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -60,10 +109,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -7855678076689992006} - m_Position: {x: 338.76227, y: 120.388596, z: 0} + m_Position: {x: 340, y: 120, z: 0} - serializedVersion: 1 - m_State: {fileID: 7730523720058225641} - m_Position: {x: 312.97266, y: 257.5893, z: 0} + m_State: {fileID: -8668345173763766825} + m_Position: {x: 320, y: 230, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -74,29 +123,3 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 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: diff --git a/Assets/06_Materials/quad.mat b/Assets/06_Materials/quad.mat new file mode 100644 index 00000000..5ca35857 --- /dev/null +++ b/Assets/06_Materials/quad.mat @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2358220440005280976 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: quad + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/06_Materials/quad.mat.meta b/Assets/06_Materials/quad.mat.meta new file mode 100644 index 00000000..e6d80619 --- /dev/null +++ b/Assets/06_Materials/quad.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 584cd955586f9244e8fdb24c2a47ce2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg index 414ce4c4..391f7a52 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus1.dlg @@ -36,14 +36,14 @@ MonoBehaviour: - rid: 8016363832598855986 - rid: 8016363832598856006 - rid: 8016363832598856028 - - rid: 8016363859357991071 + - rid: 8016363991059661300 m_GraphWireModels: - rid: 4848514453388656905 - rid: 8016363832598855967 - rid: 8016363832598855987 - rid: 8016363832598856007 - - rid: 8016363859357991090 - - rid: 8016363859357991091 + - rid: 8016363991059661316 + - rid: 8016363991059661349 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -55,8 +55,8 @@ MonoBehaviour: serializedVersion: 2 x: 139 y: -396 - width: 1842 - height: 2092 + width: 2161 + height: 1947 m_GraphElementMetaData: - m_Guid: m_Value0: 3953896658662454792 @@ -139,27 +139,27 @@ MonoBehaviour: m_Category: 0 m_Index: 5 - m_Guid: - m_Value0: 10631063388383459606 - m_Value1: 17234266995034658784 + m_Value0: 13206778569495212790 + m_Value1: 346177435666346051 m_HashGuid: serializedVersion: 2 - Hash: 16b94171d31f8993e097475b856a2cef + Hash: f6f200ee22e747b743f0252a8bdecd04 m_Category: 0 m_Index: 6 - m_Guid: - m_Value0: 9074144992986941744 - m_Value1: 8733446768982110984 + m_Value0: 3386892130829455576 + m_Value1: 7270740494665345895 m_HashGuid: serializedVersion: 2 - Hash: 30496053cbd6ed7d0833f689906f3379 + Hash: d8d0a7ce72a8002f676b9336f5dbe664 m_Category: 2 m_Index: 4 - m_Guid: - m_Value0: 3913379793284169339 - m_Value1: 14474813680133126711 + m_Value0: 18000587279870388647 + m_Value1: 17186941054868826891 m_HashGuid: serializedVersion: 2 - Hash: 7bfee421301e4f3637ba4cea59dee0c8 + Hash: a7e91685c2eecef90bab083fd44784ee m_Category: 2 m_Index: 5 m_EntryPoint: @@ -597,7 +597,7 @@ MonoBehaviour: - rid: 8016363832598855980 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598855981 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -734,7 +734,7 @@ MonoBehaviour: - rid: 8016363832598855989 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: next2 - rid: 8016363832598855990 type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -807,7 +807,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 487273cf8b1147bf2a8d7fbfa5e3d518 m_Version: 2 - m_Position: {x: 1154, y: 324.49457} + m_Position: {x: 1888.5826, y: 261.53033} m_Title: m_Tooltip: m_NodePreviewModel: @@ -914,7 +914,7 @@ MonoBehaviour: - rid: 8016363832598856009 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: next - rid: 8016363832598856010 type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -956,7 +956,7 @@ MonoBehaviour: - rid: 8016363832598856020 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598856021 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -996,7 +996,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 804729724dfad30400eb347b1479240b m_Version: 2 - m_Position: {x: 1365.0491, y: 1032.6245} + m_Position: {x: 1243.8905, y: 487.35516} m_Title: m_Tooltip: m_NodePreviewModel: @@ -1134,217 +1134,6 @@ MonoBehaviour: - rid: 8016363832598856047 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: - - rid: 8016363859357991071 - type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 10631063388383459606 - m_Value1: 17234266995034658784 - m_HashGuid: - serializedVersion: 2 - Hash: 16b94171d31f8993e097475b856a2cef - m_Version: 2 - m_Position: {x: 851.6865, y: 1003.8502} - m_Title: - m_Tooltip: - m_NodePreviewModel: - rid: -2 - m_State: 0 - m_InputConstantsById: - m_KeyList: - - __option_ChoiceCount - - __option_EventKey - - Speaker - - SpeakerNameOverride - - HudAnchor - - TalkText - - Gesture - - Expression - - Bgm - - Vfx - - LineDuration - - LookAtPlayer - - ForcePlayerLook - - WaitForInput - - Affection - - Progress - - __option_HasHiddenBranch - - __option_HiddenGestureKey - - __option_HiddenCode - - UseFixedAngle - - FixedAngleY - - Voice - m_ValueList: - - rid: 8016363859357991072 - - rid: 8016363859357991073 - - rid: 8016363859357991074 - - rid: 8016363859357991075 - - rid: 8016363859357991076 - - rid: 8016363859357991077 - - rid: 8016363859357991078 - - rid: 8016363859357991079 - - rid: 8016363859357991081 - - rid: 8016363859357991082 - - rid: 8016363859357991083 - - rid: 8016363859357991084 - - rid: 8016363859357991085 - - rid: 8016363859357991086 - - rid: 8016363859357991087 - - rid: 8016363859357991088 - - rid: 8016363865578406446 - - rid: 8016363865578406447 - - rid: 8016363865578406448 - - rid: 8016363865578406489 - - rid: 8016363865578406490 - - rid: 8016363991059660843 - 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: 8016363859357991089 - - rid: 8016363859357991072 - type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363859357991073 - type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: CARN_MOVE_DOOR - - rid: 8016363859357991074 - type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - - rid: 8016363859357991075 - type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: - Value: - - rid: 8016363859357991076 - type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - - rid: 8016363859357991077 - type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: - Value: - - rid: 8016363859357991078 - type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - - rid: 8016363859357991079 - type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - - rid: 8016363859357991081 - type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - - rid: 8016363859357991082 - type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: {fileID: 0} - - rid: 8016363859357991083 - type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 5 - - rid: 8016363859357991084 - type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363859357991085 - type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363859357991086 - type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363859357991087 - type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363859357991088 - type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363859357991089 - type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} - data: - - rid: 8016363859357991090 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 9074144992986941744 - m_Value1: 8733446768982110984 - m_HashGuid: - serializedVersion: 2 - Hash: 30496053cbd6ed7d0833f689906f3379 - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 1570429254835387755 - m_Value1: 6686057499624100012 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 6b3d58371649cb15ac50ee24dfa5c95c - m_UniqueId: Choice2Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: "Choice 3 \u2192" - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 10631063388383459606 - m_Value1: 17234266995034658784 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 16b94171d31f8993e097475b856a2cef - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - - rid: 8016363859357991091 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 3913379793284169339 - m_Value1: 14474813680133126711 - m_HashGuid: - serializedVersion: 2 - Hash: 7bfee421301e4f3637ba4cea59dee0c8 - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 10631063388383459606 - m_Value1: 17234266995034658784 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 16b94171d31f8993e097475b856a2cef - m_UniqueId: Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 347896806772393856 - m_Value1: 802899762452163328 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 804729724dfad30400eb347b1479240b - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - rid: 8016363865578406431 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1405,18 +1194,6 @@ MonoBehaviour: type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - - rid: 8016363865578406446 - type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363865578406447 - type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: - - rid: 8016363865578406448 - type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: - rid: 8016363865578406479 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1440,7 +1217,7 @@ MonoBehaviour: - rid: 8016363865578406484 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 97.877 - rid: 8016363865578406485 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1457,14 +1234,6 @@ MonoBehaviour: type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: 0 - - rid: 8016363865578406489 - type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - - rid: 8016363865578406490 - type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Value: 0 - rid: 8016363991059660838 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1485,7 +1254,182 @@ MonoBehaviour: type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} - - rid: 8016363991059660843 + - rid: 8016363991059661300 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 13206778569495212790 + m_Value1: 346177435666346051 + m_HashGuid: + serializedVersion: 2 + Hash: f6f200ee22e747b743f0252a8bdecd04 + m_Version: 2 + m_Position: {x: 729.85693, y: 538.17896} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_EventKey + - Speaker + - Gesture + - Expression + - Bgm + - Vfx + - Duration + - LookAtPlayer + - ForcePlayerLook + - UseFixedAngle + - FixedAngleY + - Affection + - Progress + m_ValueList: + - rid: 8016363991059661301 + - rid: 8016363991059661302 + - rid: 8016363991059661303 + - rid: 8016363991059661304 + - rid: 8016363991059661305 + - rid: 8016363991059661306 + - rid: 8016363991059661307 + - rid: 8016363991059661308 + - rid: 8016363991059661309 + - rid: 8016363991059661310 + - rid: 8016363991059661311 + - rid: 8016363991059661312 + - rid: 8016363991059661313 + 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: 8016363991059661314 + - rid: 8016363991059661301 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: CARN_MOVE_DOOR + - rid: 8016363991059661302 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 8016363991059661303 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661304 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661305 type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} + - rid: 8016363991059661306 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661307 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 7 + - rid: 8016363991059661308 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661309 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661310 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661311 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661312 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661313 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661314 + type: {class: DialogStagingNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8016363991059661316 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 3386892130829455576 + m_Value1: 7270740494665345895 + m_HashGuid: + serializedVersion: 2 + Hash: d8d0a7ce72a8002f676b9336f5dbe664 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 13206778569495212790 + m_Value1: 346177435666346051 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: f6f200ee22e747b743f0252a8bdecd04 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 347896806772393856 + m_Value1: 802899762452163328 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 804729724dfad30400eb347b1479240b + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8016363991059661349 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 18000587279870388647 + m_Value1: 17186941054868826891 + m_HashGuid: + serializedVersion: 2 + Hash: a7e91685c2eecef90bab083fd44784ee + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 1570429254835387755 + m_Value1: 6686057499624100012 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 6b3d58371649cb15ac50ee24dfa5c95c + m_UniqueId: Choice2Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: "Choice 3 \u2192" + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 13206778569495212790 + m_Value1: 346177435666346051 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: f6f200ee22e747b743f0252a8bdecd04 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg index dffee988..01937608 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_Carnotaurus2.dlg @@ -274,7 +274,7 @@ MonoBehaviour: - rid: 8016363859357991129 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363859357991130 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -379,7 +379,7 @@ MonoBehaviour: - rid: 8016363859357991155 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: next2 - rid: 8016363859357991156 type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: diff --git a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg index 9b68f6b5..dbac5b64 100644 --- a/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg +++ b/Assets/07_Data/DialogGraph/Chapter3/Chapter3_group.dlg @@ -1005,7 +1005,7 @@ MonoBehaviour: - rid: 8016363832598856167 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598856168 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1184,7 +1184,7 @@ MonoBehaviour: - rid: 8016363832598856187 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598856188 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1339,7 +1339,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uC5ED\uC2DC \uB108\uBC16\uC5D0 \uC5C6\uB2E4." + Value: "\uC5ED\uC2DC \uB108\uBC16\uC5D0 \uC5C6\uB2E4. \n\uB2E4 \uC800\uB9AC\uAC00\uC694!" - rid: 8016363832598856201 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1510,7 +1510,7 @@ MonoBehaviour: - rid: 8016363832598856227 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598856228 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1689,7 +1689,7 @@ MonoBehaviour: - rid: 8016363832598856249 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598856250 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1719,7 +1719,7 @@ MonoBehaviour: serializedVersion: 2 Hash: b58f773c40f11024b49061495666e93e m_Version: 2 - m_Position: {x: 2820, y: 1034.3696} + m_Position: {x: 2821.1501, y: 1034.3696} m_Title: m_Tooltip: m_NodePreviewModel: @@ -1868,7 +1868,7 @@ MonoBehaviour: - rid: 8016363832598856269 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363832598856270 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2147,11 +2147,11 @@ MonoBehaviour: - rid: 8016363904930938953 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363904930938954 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: -156.158 - rid: 8016363904930938955 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -2167,11 +2167,11 @@ MonoBehaviour: - rid: 8016363904930938958 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363904930938959 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: -144.567 - rid: 8016363904930938960 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: diff --git a/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg b/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg index 04350e47..b63ca1ab 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter4/Carnotaurus ch4.dlg @@ -38,6 +38,7 @@ MonoBehaviour: - rid: 8016363972690968838 - rid: 8016363972690968863 - rid: 8016363972690968888 + - rid: 8016363991059661145 m_GraphWireModels: - rid: 8016363908462280798 - rid: 8016363972690968759 @@ -45,7 +46,8 @@ MonoBehaviour: - rid: 8016363972690968814 - rid: 8016363972690968839 - rid: 8016363972690968864 - - rid: 8016363972690968889 + - rid: 8016363991059661169 + - rid: 8016363991059661170 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -57,8 +59,8 @@ MonoBehaviour: serializedVersion: 2 x: -61 y: -130 - width: 3010 - height: 1426 + width: 3771 + height: 1451 m_GraphElementMetaData: - m_Guid: m_Value0: 3976124715185390593 @@ -173,13 +175,29 @@ MonoBehaviour: m_Category: 0 m_Index: 7 - m_Guid: - m_Value0: 13242431992686774282 - m_Value1: 2778432571668173188 + m_Value0: 4255627760533504090 + m_Value1: 665603168818528467 m_HashGuid: serializedVersion: 2 - Hash: 0a085d66bc91c6b78411a802b4f98e26 + Hash: 5a00e4a2e6060f3bd380cd368eb23c09 + m_Category: 0 + m_Index: 8 + - m_Guid: + m_Value0: 17157859704244121603 + m_Value1: 14515290285979984666 + m_HashGuid: + serializedVersion: 2 + Hash: 03b075a97ef61cee1ae3831b9cab70c9 m_Category: 2 m_Index: 6 + - m_Guid: + m_Value0: 1874463186015852146 + m_Value1: 16596977997398343481 + m_HashGuid: + serializedVersion: 2 + Hash: 7296051b566e031a39ffe6d78d4f54e6 + m_Category: 2 + m_Index: 7 m_EntryPoint: rid: 8016363908462280795 m_Graph: @@ -1021,7 +1039,7 @@ MonoBehaviour: data: m_Value: Value: "\uC774 \uAD6C\uC900\uD45C\uB8E8\uC2A4\uB2D8\uC774 \uC774 \uC815\uB3C4\uC5D0 - \uB2E4\uCE60 \uAC83 \uAC19\uC544? \uC4F8\uB370\uC5C6\uC774 \uB0B4 \uAC71\uC815\uD558\uC9C0 + \uB2E4\uCE60 \uAC83 \uAC19\uC544? \n\uC4F8\uB370\uC5C6\uC774 \uB0B4 \uAC71\uC815\uD558\uC9C0 \uB9D0\uACE0 \uB108\uB098 \uC798 \uCC59\uACA8." - rid: 8016363972690968824 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} @@ -1221,10 +1239,8 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uBB50? \uB0B4\uAC00 \uB9C9\uC544\uC8FC\uACE0 \uC2F6\uC5B4\uC11C - \uB9C9\uC740 \uC904 \uC54C\uC544? \uB124\uAC00 \uB2E4\uCE58\uBA74 \uCD95\uC81C - \uC900\uBE44\uC5D0 \uCC28\uC9C8\uC774 \uC0DD\uAE30\uB2C8\uAE4C \uADF8\uB7F0 - \uAC70\uC57C." + Value: "\uBB50?\n\uB0B4\uAC00 \uB9C9\uC544\uC8FC\uACE0 \uC2F6\uC5B4\uC11C + \uB9C9\uC740 \uC904\uC54C\uC544? \n" - rid: 8016363972690968849 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1424,7 +1440,7 @@ MonoBehaviour: data: m_Value: Value: "\uB2E4\uC74C\uBD80\uD130\uB294 \uC704\uD5D8\uD55C \uB370 \uD63C\uC790 - \uC11C \uC788\uC9C0 \uB9C8. \uC774\uC81C \uC800\uCABD\uC774\uB098 \uD655\uC778\uD558\uACE0 + \uC11C \uC788\uC9C0 \uB9C8. \n\uC774\uC81C \uC800\uCABD\uC774\uB098 \uD655\uC778\uD558\uACE0 \uC640." - rid: 8016363972690968874 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} @@ -1487,7 +1503,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 9d8300932f4d007d766ffd73b49ebedd m_Version: 2 - m_Position: {x: 2538, y: 592.2749} + m_Position: {x: 3298.8179, y: 571.2868} m_Title: m_Tooltip: m_NodePreviewModel: @@ -1555,38 +1571,6 @@ MonoBehaviour: m_HasUserColor: 0 m_Node: rid: 8016363972690968912 - - rid: 8016363972690968889 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 13242431992686774282 - m_Value1: 2778432571668173188 - m_HashGuid: - serializedVersion: 2 - Hash: 0a085d66bc91c6b78411a802b4f98e26 - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 13451994545990753447 - m_Value1: 17052051817514465430 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: a75c4592c415afba96f8804ac80ea5ec - m_UniqueId: Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 9007284121466078109 - m_Value1: 15978383025834389366 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 9d8300932f4d007d766ffd73b49ebedd - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - rid: 8016363972690968890 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1625,7 +1609,7 @@ MonoBehaviour: data: m_Value: Value: "\uB2E4\uC74C\uBD80\uD130\uB294 \uB0B4 \uC2DC\uC57C \uBC16\uC5D0\uC11C - \uC0AC\uACE0 \uCE58\uC9C0 \uB9C8. \uC774\uC81C \uC800\uCABD\uC774\uB098 + \uC0AC\uACE0 \uCE58\uC9C0 \uB9C8. \n\uC774\uC81C \uC800\uCABD\uC774\uB098 \uD655\uC778\uD558\uACE0 \uC640." - rid: 8016363972690968899 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} @@ -1706,3 +1690,239 @@ MonoBehaviour: type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} + - rid: 8016363991059661145 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 4255627760533504090 + m_Value1: 665603168818528467 + m_HashGuid: + serializedVersion: 2 + Hash: 5a00e4a2e6060f3bd380cd368eb23c09 + m_Version: 2 + m_Position: {x: 2599.023, y: 657.6263} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - UseFixedAngle + - FixedAngleY + - WaitForInput + - Affection + - Progress + - Voice + m_ValueList: + - rid: 8016363991059661146 + - rid: 8016363991059661147 + - rid: 8016363991059661148 + - rid: 8016363991059661149 + - rid: 8016363991059661150 + - rid: 8016363991059661151 + - rid: 8016363991059661152 + - rid: 8016363991059661153 + - rid: 8016363991059661154 + - rid: 8016363991059661155 + - rid: 8016363991059661156 + - rid: 8016363991059661157 + - rid: 8016363991059661158 + - rid: 8016363991059661159 + - rid: 8016363991059661160 + - rid: 8016363991059661161 + - rid: 8016363991059661162 + - rid: 8016363991059661163 + - rid: 8016363991059661164 + - rid: 8016363991059661165 + - rid: 8016363991059661166 + - rid: 8016363991059661167 + 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: 8016363991059661168 + - rid: 8016363991059661146 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661147 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059661148 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661149 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059661150 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059661151 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 8016363991059661152 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 8016363991059661153 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: b7c3c52c4e4e9fc49bf084eae180835b, type: 2} + - rid: 8016363991059661154 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uB108\uAC00 \uB2E4\uCE58\uBA74 \uCD95\uC81C \uC900\uBE44\uC5D0 + \uCC28\uC9C8\uC774 \uC0DD\uAE30\uB2C8\uAE4C \uADF8\uB7F0 \uAC70\uC57C." + - rid: 8016363991059661155 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661156 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661157 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661158 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661159 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 5 + - rid: 8016363991059661160 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661161 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661162 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661163 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661164 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661165 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661166 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661167 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661168 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8016363991059661169 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 17157859704244121603 + m_Value1: 14515290285979984666 + m_HashGuid: + serializedVersion: 2 + Hash: 03b075a97ef61cee1ae3831b9cab70c9 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 13451994545990753447 + m_Value1: 17052051817514465430 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a75c4592c415afba96f8804ac80ea5ec + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 4255627760533504090 + m_Value1: 665603168818528467 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 5a00e4a2e6060f3bd380cd368eb23c09 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8016363991059661170 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 1874463186015852146 + m_Value1: 16596977997398343481 + m_HashGuid: + serializedVersion: 2 + Hash: 7296051b566e031a39ffe6d78d4f54e6 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 4255627760533504090 + m_Value1: 665603168818528467 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 5a00e4a2e6060f3bd380cd368eb23c09 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 9007284121466078109 + m_Value1: 15978383025834389366 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 9d8300932f4d007d766ffd73b49ebedd + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg b/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg index eae07866..a5a9f836 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter4/Styracosaurus ch4.dlg @@ -39,15 +39,17 @@ MonoBehaviour: - rid: 8016363972690968708 - rid: 8016363972690968733 - rid: 8016363991059660893 + - rid: 8016363991059661229 m_GraphWireModels: - - rid: 8016363972690968626 - - rid: 8016363972690968627 - - rid: 8016363972690968629 - rid: 8016363972690968659 - rid: 8016363972690968684 - - rid: 8016363972690968709 - rid: 8016363972690968734 - rid: 8016363991059660917 + - rid: 8016363991059661171 + - rid: 8016363991059661172 + - rid: 8016363991059661173 + - rid: 8016363991059661244 + - rid: 8016363991059661245 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -59,7 +61,7 @@ MonoBehaviour: serializedVersion: 2 x: -44 y: -505 - width: 3374 + width: 4050 height: 1427 m_GraphElementMetaData: - m_Guid: @@ -86,22 +88,6 @@ MonoBehaviour: Hash: b34667c8e3af67f64b1717957a643f2e m_Category: 0 m_Index: 2 - - m_Guid: - m_Value0: 16688509880720962623 - m_Value1: 17557718020706389325 - m_HashGuid: - serializedVersion: 2 - Hash: 3f34f826517f99e74dcdadda838ba9f3 - m_Category: 2 - m_Index: 0 - - m_Guid: - m_Value0: 5640124050414252727 - m_Value1: 8777360875727915955 - m_HashGuid: - serializedVersion: 2 - Hash: b73214f2f0be454eb38b2c473673cf79 - m_Category: 2 - m_Index: 1 - m_Guid: m_Value0: 798117245799573596 m_Value1: 16629664520937002999 @@ -110,14 +96,6 @@ MonoBehaviour: Hash: 5c28ff0c687b130bf7d75d28c66fc8e6 m_Category: 0 m_Index: 3 - - m_Guid: - m_Value0: 13347979323882243450 - m_Value1: 5613887716082385540 - m_HashGuid: - serializedVersion: 2 - Hash: 7a854275798c3db9840205562289e84d - m_Category: 2 - m_Index: 2 - m_Guid: m_Value0: 5787625678279484125 m_Value1: 14753596033021308946 @@ -133,7 +111,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 5e83732b002d5cba574a038887221ef6 m_Category: 2 - m_Index: 3 + m_Index: 0 - m_Guid: m_Value0: 11526180374668453538 m_Value1: 11949655075746306731 @@ -149,7 +127,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 31ce430b24ee28af7a8e2c33c6986811 m_Category: 2 - m_Index: 4 + m_Index: 1 - m_Guid: m_Value0: 12167398343282354810 m_Value1: 12790390316434424180 @@ -158,14 +136,6 @@ MonoBehaviour: Hash: 7a6a05dc5348dba87481abf5399880b1 m_Category: 0 m_Index: 6 - - m_Guid: - m_Value0: 10610486520207376195 - m_Value1: 11880931294928767620 - m_HashGuid: - serializedVersion: 2 - Hash: 43ff07fb45054093840a0d9b108ce1a4 - m_Category: 2 - m_Index: 5 - m_Guid: m_Value0: 13792216450375425245 m_Value1: 18369621763337779133 @@ -181,7 +151,7 @@ MonoBehaviour: serializedVersion: 2 Hash: bc4b78ec44bb9a6eb9af43965358dc01 m_Category: 2 - m_Index: 6 + m_Index: 2 - m_Guid: m_Value0: 18425120084521440740 m_Value1: 12066133965218665309 @@ -197,7 +167,55 @@ MonoBehaviour: serializedVersion: 2 Hash: f09a481bd48d0ca0467d2b6b494b9c34 m_Category: 2 + m_Index: 3 + - m_Guid: + m_Value0: 5132125245913738304 + m_Value1: 18287643893231614412 + m_HashGuid: + serializedVersion: 2 + Hash: 40ac8051b8f83847cc79e9923ac3cafd + m_Category: 2 + m_Index: 4 + - m_Guid: + m_Value0: 7091356627973979961 + m_Value1: 9961059303573125154 + m_HashGuid: + serializedVersion: 2 + Hash: 393f0012488f696222781320a9ca3c8a + m_Category: 2 + m_Index: 5 + - m_Guid: + m_Value0: 10047095083521025553 + m_Value1: 17105299402353059969 + m_HashGuid: + serializedVersion: 2 + Hash: 1126d825bf736e8b81a8f4bd2d3b62ed + m_Category: 2 + m_Index: 6 + - m_Guid: + m_Value0: 6394096135044439283 + m_Value1: 234826118934608080 + m_HashGuid: + serializedVersion: 2 + Hash: f39c05b58e64bc58d0b8146b1c454203 + m_Category: 0 + m_Index: 9 + - m_Guid: + m_Value0: 81382349160216368 + m_Value1: 6405204029084699950 + m_HashGuid: + serializedVersion: 2 + Hash: 3077aebcd02021012e8d7ed320dbe358 + m_Category: 2 m_Index: 7 + - m_Guid: + m_Value0: 14918907858675600970 + m_Value1: 14428021433666458403 + m_HashGuid: + serializedVersion: 2 + Hash: 4a8e2459a79b0acf2353690d0da13ac8 + m_Category: 2 + m_Index: 8 m_EntryPoint: rid: 8016363908462280767 m_Graph: @@ -264,7 +282,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 2f269693e630b705c8c789d8a76a2518 m_Version: 2 - m_Position: {x: 818.84125, y: 15.527824} + m_Position: {x: 211.93616, y: 27.770874} m_Title: m_Tooltip: m_NodePreviewModel: @@ -401,11 +419,11 @@ MonoBehaviour: - rid: 8016363908462280788 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363908462280789 type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: -119.4 - rid: 8016363908462280790 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -431,7 +449,7 @@ MonoBehaviour: serializedVersion: 2 Hash: b34667c8e3af67f64b1717957a643f2e m_Version: 2 - m_Position: {x: 315.83356, y: 11.611277} + m_Position: {x: 778.6469, y: 62.502968} m_Title: m_Tooltip: m_NodePreviewModel: @@ -537,7 +555,7 @@ MonoBehaviour: data: m_Value: Value: "\uC7A0\uAE50 \uB4E4\uC5B4\uAC00\uC11C \uAD6C\uACBD\uB9CC \uD558\uBA74 - \uC548 \uB3FC?" + \uC548 \uB3FC?\n\uAE50\uAE50\uD558\uAC8C \uAD6C\uB124!" - rid: 8016363972690968612 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -589,70 +607,6 @@ MonoBehaviour: - rid: 8016363972690968625 type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: - - rid: 8016363972690968626 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 16688509880720962623 - m_Value1: 17557718020706389325 - m_HashGuid: - serializedVersion: 2 - Hash: 3f34f826517f99e74dcdadda838ba9f3 - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 8626403947206528014 - m_Value1: 17040101622737521664 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 0ecc4572af24b77700ccd3bf249a7aec - m_UniqueId: Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 17755353448786118323 - m_Value1: 3332492726927562571 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: b34667c8e3af67f64b1717957a643f2e - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - - rid: 8016363972690968627 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 5640124050414252727 - m_Value1: 8777360875727915955 - m_HashGuid: - serializedVersion: 2 - Hash: b73214f2f0be454eb38b2c473673cf79 - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 17755353448786118323 - m_Value1: 3332492726927562571 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: b34667c8e3af67f64b1717957a643f2e - m_UniqueId: Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 411851657804391983 - m_Value1: 1739914100173555656 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 2f269693e630b705c8c789d8a76a2518 - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - rid: 8016363972690968628 type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} data: @@ -741,38 +695,6 @@ MonoBehaviour: m_HasUserColor: 0 m_Node: rid: 8016363972690968652 - - rid: 8016363972690968629 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 13347979323882243450 - m_Value1: 5613887716082385540 - m_HashGuid: - serializedVersion: 2 - Hash: 7a854275798c3db9840205562289e84d - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 411851657804391983 - m_Value1: 1739914100173555656 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 2f269693e630b705c8c789d8a76a2518 - m_UniqueId: Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 798117245799573596 - m_Value1: 16629664520937002999 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 5c28ff0c687b130bf7d75d28c66fc8e6 - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - rid: 8016363972690968630 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -872,7 +794,7 @@ MonoBehaviour: data: m_Value: Value: "\uC120\uBC30\uB294 \uC26C\uACE0 \uC788\uC5B4\uC694. \uC81C\uAC00 - \uB300\uC2E0 \uB3CC\uB824\uBCF4\uB0BC\uAC8C\uC694." + \uCC98\uB9AC\uD560\uAC8C\uC694. \uB9C8 \uB4E4\uC628\uB098!" - rid: 8016363972690968655 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1237,7 +1159,7 @@ MonoBehaviour: - rid: 8016363972690968694 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: {fileID: 11400000, guid: a4375c096497ea742a741d57c1c14e34, type: 2} + m_Value: {fileID: 0} - rid: 8016363972690968695 type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1295,7 +1217,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 7a6a05dc5348dba87481abf5399880b1 m_Version: 2 - m_Position: {x: 2427, y: 255} + m_Position: {x: 3087.749, y: 255} m_Title: m_Tooltip: m_NodePreviewModel: @@ -1363,38 +1285,6 @@ MonoBehaviour: m_HasUserColor: 0 m_Node: rid: 8016363972690968732 - - rid: 8016363972690968709 - type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} - data: - m_Guid: - m_Value0: 10610486520207376195 - m_Value1: 11880931294928767620 - m_HashGuid: - serializedVersion: 2 - Hash: 43ff07fb45054093840a0d9b108ce1a4 - m_Version: 2 - m_FromPortReference: - m_NodeModelGuid: - m_Value0: 11526180374668453538 - m_Value1: 11949655075746306731 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: a2263181fb37f59fab5a4dbafab3d5a5 - m_UniqueId: Out - m_PortDirection: 2 - m_PortOrientation: 0 - m_Title: - m_ToPortReference: - m_NodeModelGuid: - m_Value0: 12167398343282354810 - m_Value1: 12790390316434424180 - m_NodeModelHashGuid: - serializedVersion: 2 - Hash: 7a6a05dc5348dba87481abf5399880b1 - m_UniqueId: In - m_PortDirection: 1 - m_PortOrientation: 0 - m_Title: - rid: 8016363972690968710 type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1495,7 +1385,7 @@ MonoBehaviour: serializedVersion: 2 Hash: dd1ced8dc9cb67bfbd7708d6aa01eefe m_Version: 2 - m_Position: {x: 2908, y: 257.05005} + m_Position: {x: 3584.044, y: 247.87299} m_Title: m_Tooltip: m_NodePreviewModel: @@ -1602,7 +1492,7 @@ MonoBehaviour: - rid: 8016363972690968736 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: next - rid: 8016363972690968737 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1657,7 +1547,7 @@ MonoBehaviour: - rid: 8016363972690968750 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: 0 + m_Value: 1 - rid: 8016363972690968751 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1798,7 +1688,7 @@ MonoBehaviour: - rid: 8016363991059660895 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: - m_Value: + m_Value: next sine - rid: 8016363991059660896 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1828,7 +1718,7 @@ MonoBehaviour: type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: - Value: "\uACE0\uB9C8\uC6CC \uC794\uB514\uC57C." + Value: "\uC5B4.. \uACE0\uB9C8\uC6CC \uC794\uB514\uC57C." - rid: 8016363991059660903 type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: @@ -1916,3 +1806,278 @@ MonoBehaviour: m_PortDirection: 1 m_PortOrientation: 0 m_Title: + - rid: 8016363991059661171 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 5132125245913738304 + m_Value1: 18287643893231614412 + m_HashGuid: + serializedVersion: 2 + Hash: 40ac8051b8f83847cc79e9923ac3cafd + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 8626403947206528014 + m_Value1: 17040101622737521664 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 0ecc4572af24b77700ccd3bf249a7aec + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 411851657804391983 + m_Value1: 1739914100173555656 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 2f269693e630b705c8c789d8a76a2518 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8016363991059661172 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 7091356627973979961 + m_Value1: 9961059303573125154 + m_HashGuid: + serializedVersion: 2 + Hash: 393f0012488f696222781320a9ca3c8a + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 411851657804391983 + m_Value1: 1739914100173555656 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 2f269693e630b705c8c789d8a76a2518 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 17755353448786118323 + m_Value1: 3332492726927562571 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: b34667c8e3af67f64b1717957a643f2e + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8016363991059661173 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 10047095083521025553 + m_Value1: 17105299402353059969 + m_HashGuid: + serializedVersion: 2 + Hash: 1126d825bf736e8b81a8f4bd2d3b62ed + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 17755353448786118323 + m_Value1: 3332492726927562571 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: b34667c8e3af67f64b1717957a643f2e + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 798117245799573596 + m_Value1: 16629664520937002999 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 5c28ff0c687b130bf7d75d28c66fc8e6 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8016363991059661229 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 6394096135044439283 + m_Value1: 234826118934608080 + m_HashGuid: + serializedVersion: 2 + Hash: f39c05b58e64bc58d0b8146b1c454203 + m_Version: 2 + m_Position: {x: 2481.7778, y: 343.5309} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_EventKey + - Speaker + - Gesture + - Expression + - Bgm + - Vfx + - Duration + - LookAtPlayer + - ForcePlayerLook + - UseFixedAngle + - FixedAngleY + - Affection + - Progress + m_ValueList: + - rid: 8016363991059661230 + - rid: 8016363991059661231 + - rid: 8016363991059661232 + - rid: 8016363991059661233 + - rid: 8016363991059661234 + - rid: 8016363991059661235 + - rid: 8016363991059661236 + - rid: 8016363991059661237 + - rid: 8016363991059661238 + - rid: 8016363991059661239 + - rid: 8016363991059661240 + - rid: 8016363991059661241 + - rid: 8016363991059661242 + 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: 8016363991059661243 + - rid: 8016363991059661230 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059661231 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661232 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: a4375c096497ea742a741d57c1c14e34, type: 2} + - rid: 8016363991059661233 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661234 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661235 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661236 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 5 + - rid: 8016363991059661237 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661238 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661239 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 1 + - rid: 8016363991059661240 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: -119.4 + - rid: 8016363991059661241 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661242 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661243 + type: {class: DialogStagingNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8016363991059661244 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 81382349160216368 + m_Value1: 6405204029084699950 + m_HashGuid: + serializedVersion: 2 + Hash: 3077aebcd02021012e8d7ed320dbe358 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 11526180374668453538 + m_Value1: 11949655075746306731 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: a2263181fb37f59fab5a4dbafab3d5a5 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 6394096135044439283 + m_Value1: 234826118934608080 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: f39c05b58e64bc58d0b8146b1c454203 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: + - rid: 8016363991059661245 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 14918907858675600970 + m_Value1: 14428021433666458403 + m_HashGuid: + serializedVersion: 2 + Hash: 4a8e2459a79b0acf2353690d0da13ac8 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 6394096135044439283 + m_Value1: 234826118934608080 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: f39c05b58e64bc58d0b8146b1c454203 + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 12167398343282354810 + m_Value1: 12790390316434424180 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 7a6a05dc5348dba87481abf5399880b1 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/07_Data/DialogGraph/Chapter4/attck.asset b/Assets/07_Data/DialogGraph/Chapter4/attck.asset index eb5f75d3..4a9df173 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/attck.asset +++ b/Assets/07_Data/DialogGraph/Chapter4/attck.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32e1f6bea4f158bdad0caef778c7b25c621b9d9808334fd869d36a4f11a12215 -size 505 +oid sha256:8f097eca622ed1e5e76429de33594aa39102a5f934cf1c981ee2f4f144324aa3 +size 565 diff --git a/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg b/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg index 2950266e..86fc21c4 100644 --- a/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg +++ b/Assets/07_Data/DialogGraph/Chapter4/yuna ch4.dlg @@ -35,11 +35,13 @@ MonoBehaviour: - rid: 8016363972690969110 - rid: 8016363972690969158 - rid: 8016363972690969205 + - rid: 8016363991059661269 m_GraphWireModels: - rid: 8016363972690969079 - rid: 8016363972690969111 - rid: 8016363972690969229 - rid: 8016363972690969230 + - rid: 8016363991059661293 m_GraphStickyNoteModels: [] m_GraphPlacematModels: [] m_GraphVariableModels: [] @@ -50,9 +52,9 @@ MonoBehaviour: m_LastKnownBounds: serializedVersion: 2 x: 194 - y: 38 - width: 1637 - height: 1569 + y: 36 + width: 2245 + height: 1755 m_GraphElementMetaData: - m_Guid: m_Value0: 371564409316702366 @@ -126,6 +128,22 @@ MonoBehaviour: Hash: 482416abf82c0e15770a104044fbddf6 m_Category: 2 m_Index: 3 + - m_Guid: + m_Value0: 8434681525171270711 + m_Value1: 64308114336460586 + m_HashGuid: + serializedVersion: 2 + Hash: 3734628528020e752a2f33a7e377e400 + m_Category: 0 + m_Index: 5 + - m_Guid: + m_Value0: 12652895737888090478 + m_Value1: 7272025447029412796 + m_HashGuid: + serializedVersion: 2 + Hash: 6ea9dfbca21d98afbc13ca7f9d6ceb64 + m_Category: 2 + m_Index: 4 m_EntryPoint: rid: 8016363972690969076 m_Graph: @@ -440,7 +458,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 0a4137818c5df2c28ac2062784dcb058 m_Version: 2 - m_Position: {x: 909.2438, y: 37.96077} + m_Position: {x: 2069.7969, y: 35.94941} m_Title: m_Tooltip: m_NodePreviewModel: @@ -640,7 +658,7 @@ MonoBehaviour: serializedVersion: 2 Hash: dac0107f6ab774e4a431200864222ffc m_Version: 2 - m_Position: {x: 953.2084, y: 944.4633} + m_Position: {x: 879.70776, y: 1095.2112} m_Title: m_Tooltip: m_NodePreviewModel: @@ -809,7 +827,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 0891c034e528474d2413675ff5d5d69a m_Version: 2 - m_Position: {x: 1461.7712, y: 570.87573} + m_Position: {x: 1775.543, y: 486.39874} m_Title: m_Tooltip: m_NodePreviewModel: @@ -1047,3 +1065,206 @@ MonoBehaviour: type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} data: m_Value: {fileID: 0} + - rid: 8016363991059661269 + type: {class: UserNodeModelImp, ns: Unity.GraphToolkit.Editor.Implementation, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 8434681525171270711 + m_Value1: 64308114336460586 + m_HashGuid: + serializedVersion: 2 + Hash: 3734628528020e752a2f33a7e377e400 + m_Version: 2 + m_Position: {x: 1353.5502, y: 1128.15} + m_Title: + m_Tooltip: + m_NodePreviewModel: + rid: -2 + m_State: 0 + m_InputConstantsById: + m_KeyList: + - __option_ChoiceCount + - __option_EventKey + - __option_HasHiddenBranch + - __option_HiddenGestureKey + - __option_HiddenCode + - Speaker + - SpeakerNameOverride + - HudAnchor + - TalkText + - Gesture + - Expression + - Bgm + - Vfx + - LineDuration + - LookAtPlayer + - ForcePlayerLook + - UseFixedAngle + - FixedAngleY + - WaitForInput + - Affection + - Progress + - Voice + m_ValueList: + - rid: 8016363991059661270 + - rid: 8016363991059661271 + - rid: 8016363991059661272 + - rid: 8016363991059661273 + - rid: 8016363991059661274 + - rid: 8016363991059661275 + - rid: 8016363991059661276 + - rid: 8016363991059661277 + - rid: 8016363991059661278 + - rid: 8016363991059661279 + - rid: 8016363991059661280 + - rid: 8016363991059661281 + - rid: 8016363991059661282 + - rid: 8016363991059661283 + - rid: 8016363991059661284 + - rid: 8016363991059661285 + - rid: 8016363991059661286 + - rid: 8016363991059661287 + - rid: 8016363991059661288 + - rid: 8016363991059661289 + - rid: 8016363991059661290 + - rid: 8016363991059661291 + 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: 8016363991059661292 + - rid: 8016363991059661270 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661271 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: YunaNextScene + - rid: 8016363991059661272 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661273 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059661274 + type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + - rid: 8016363991059661275 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 8016363991059661276 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogShortText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: + - rid: 8016363991059661277 + type: {class: 'Constant`1[[CharacterData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 11400000, guid: ccaea1cd59b6def4e93764f1965fe26f, type: 2} + - rid: 8016363991059661278 + type: {class: 'Constant`1[[DinoLove.Dialog.GraphTool.Editor.DialogText, Assembly-CSharp-Editor]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: + Value: "\uC18C\uC774\uC815\uB178\uB3C8 \uC624\uBE60\uAC00 \uC544\uAE4C..." + - rid: 8016363991059661279 + type: {class: 'Constant`1[[GestureData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661280 + type: {class: 'Constant`1[[ExpressionData, Assembly-CSharp]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661281 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661282 + type: {class: 'Constant`1[[UnityEngine.GameObject, UnityEngine.CoreModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661283 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 2 + - rid: 8016363991059661284 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661285 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661286 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661287 + type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661288 + type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 0 + - rid: 8016363991059661289 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 35 + - rid: 8016363991059661290 + type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: 20 + - rid: 8016363991059661291 + type: {class: 'Constant`1[[UnityEngine.AudioClip, UnityEngine.AudioModule]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Value: {fileID: 0} + - rid: 8016363991059661292 + type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} + data: + - rid: 8016363991059661293 + type: {class: WireModel, ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule} + data: + m_Guid: + m_Value0: 12652895737888090478 + m_Value1: 7272025447029412796 + m_HashGuid: + serializedVersion: 2 + Hash: 6ea9dfbca21d98afbc13ca7f9d6ceb64 + m_Version: 2 + m_FromPortReference: + m_NodeModelGuid: + m_Value0: 16461984205972226266 + m_Value1: 18171780834491642276 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: dac0107f6ab774e4a431200864222ffc + m_UniqueId: Out + m_PortDirection: 2 + m_PortOrientation: 0 + m_Title: + m_ToPortReference: + m_NodeModelGuid: + m_Value0: 8434681525171270711 + m_Value1: 64308114336460586 + m_NodeModelHashGuid: + serializedVersion: 2 + Hash: 3734628528020e752a2f33a7e377e400 + m_UniqueId: In + m_PortDirection: 1 + m_PortOrientation: 0 + m_Title: diff --git a/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable b/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable index 73870bf4..acccf62e 100644 --- a/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable +++ b/Assets/08_Timeline/Chapter3/ch3CarnotaurusTimeline.playable @@ -112,16 +112,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: {x: 0, y: 84.37, z: 0} - inSlope: {x: 0, y: 154.72565, z: 0} - outSlope: {x: 0, y: 154.72565, z: 0} + inSlope: {x: 0, y: 50.62452, z: 0} + outSlope: {x: 0, y: 50.62452, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: {x: 0, y: 170.242, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -130,7 +130,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.9666667 + time: 6 value: {x: 0, y: -3.782, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -172,16 +172,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: {x: 5.8365045, y: 0, z: -5.574394} - inSlope: {x: 26.747366, y: 0, z: 0} - outSlope: {x: 26.747366, y: 0, z: 0} + inSlope: {x: 8.778624, y: 0, z: 0} + outSlope: {x: 8.778624, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.0666667 + time: 3.25 value: {x: 78.3, y: 0, z: 1.6} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -190,25 +190,25 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: {x: 73.45597, y: 0, z: -4.8469906} - inSlope: {x: 0, y: 0, z: -49.912186} - outSlope: {x: 0, y: 0, z: -49.912186} + inSlope: {x: 0, y: 0, z: -16.287132} + outSlope: {x: 0, y: 0, z: -16.287132} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.5833334 + time: 4.8333335 value: {x: 83.1, y: 0, z: -60.9} - inSlope: {x: 22.588121, y: 0, z: -36.81702} - outSlope: {x: 22.588121, y: 0, z: -36.81702} + inSlope: {x: 7.4240685, y: 0, z: -12.1007} + outSlope: {x: 7.4240685, y: 0, z: -12.1007} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.9666667 + time: 6 value: {x: 91.15, y: 0, z: -68.11} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -266,7 +266,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.9666667 + m_StopTime: 6 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -359,7 +359,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -368,7 +368,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: 0 inSlope: 0 outSlope: 0 @@ -377,7 +377,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 6 value: 0 inSlope: 0 outSlope: 0 @@ -407,16 +407,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: 84.37 - inSlope: 154.72565 - outSlope: 154.72565 + inSlope: 50.62452 + outSlope: 50.62452 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: 170.242 inSlope: 0 outSlope: 0 @@ -425,7 +425,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 6 value: -3.782 inSlope: 0 outSlope: 0 @@ -455,7 +455,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -464,7 +464,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: 0 inSlope: 0 outSlope: 0 @@ -473,7 +473,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 6 value: 0 inSlope: 0 outSlope: 0 @@ -503,16 +503,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: 5.8365045 - inSlope: 26.747366 - outSlope: 26.747366 + inSlope: 8.778624 + outSlope: 8.778624 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 3.25 value: 78.3 inSlope: 0 outSlope: 0 @@ -521,7 +521,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: 73.45597 inSlope: 0 outSlope: 0 @@ -530,16 +530,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5833334 + time: 4.8333335 value: 83.1 - inSlope: 22.588121 - outSlope: 22.588121 + inSlope: 7.4240685 + outSlope: 7.4240685 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 6 value: 91.15 inSlope: 0 outSlope: 0 @@ -569,7 +569,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: 0 inSlope: 0 outSlope: 0 @@ -578,7 +578,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 3.25 value: 0 inSlope: 0 outSlope: 0 @@ -587,7 +587,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: 0 inSlope: 0 outSlope: 0 @@ -596,7 +596,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5833334 + time: 4.8333335 value: 0 inSlope: 0 outSlope: 0 @@ -605,7 +605,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 6 value: 0 inSlope: 0 outSlope: 0 @@ -635,7 +635,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.2 value: -5.574394 inSlope: 0 outSlope: 0 @@ -644,7 +644,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.0666667 + time: 3.25 value: 1.6 inSlope: 0 outSlope: 0 @@ -653,25 +653,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.1833333 + time: 3.6166666 value: -4.8469906 - inSlope: -49.912186 - outSlope: -49.912186 + inSlope: -16.287132 + outSlope: -16.287132 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5833334 + time: 4.8333335 value: -60.9 - inSlope: -36.81702 - outSlope: -36.81702 + inSlope: -12.1007 + outSlope: -12.1007 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9666667 + time: 6 value: -68.11 inSlope: 0 outSlope: 0 @@ -752,7 +752,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -6368963125155568132} - m_Duration: 1.9666666666666666 + m_Duration: 6 m_TimeScale: 1 m_ParentTrack: {fileID: 646888936410151061} m_EaseInDuration: 0 diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index ee619ee1..c333544a 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:16c2245436b0aab5092361362ff1d2aa451b86585afc28af100d1027a7dd8fec -size 287 +oid sha256:b30d0349b7c2109aa9922aaf21625871adaa638a55397ebf0e59aaa5b470dbaa +size 42266