Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation
# Conflicts: # Assets/XR/Settings/OpenXR Package Settings.asset
This commit is contained in:
@@ -48,7 +48,7 @@ MonoBehaviour:
|
||||
x: 15
|
||||
y: 227
|
||||
width: 1272
|
||||
height: 576
|
||||
height: 687
|
||||
m_GraphElementMetaData:
|
||||
- m_Guid:
|
||||
m_Value0: 9494015287684329137
|
||||
@@ -181,6 +181,11 @@ MonoBehaviour:
|
||||
- WaitForInput
|
||||
- Affection
|
||||
- Progress
|
||||
- __option_HasHiddenBranch
|
||||
- __option_HiddenGestureKey
|
||||
- __option_HiddenCode
|
||||
- UseFixedAngle
|
||||
- FixedAngleY
|
||||
m_ValueList:
|
||||
- rid: 8016363859357991117
|
||||
- rid: 8016363859357991118
|
||||
@@ -199,6 +204,11 @@ MonoBehaviour:
|
||||
- rid: 8016363859357991131
|
||||
- rid: 8016363859357991132
|
||||
- rid: 8016363859357991133
|
||||
- rid: 8016363904930938940
|
||||
- rid: 8016363904930938941
|
||||
- rid: 8016363904930938942
|
||||
- rid: 8016363904930938943
|
||||
- rid: 8016363904930938944
|
||||
m_InputPortInfos:
|
||||
expandedPortsById:
|
||||
m_KeyList: []
|
||||
@@ -323,6 +333,11 @@ MonoBehaviour:
|
||||
- WaitForInput
|
||||
- Affection
|
||||
- Progress
|
||||
- __option_HasHiddenBranch
|
||||
- __option_HiddenGestureKey
|
||||
- __option_HiddenCode
|
||||
- UseFixedAngle
|
||||
- FixedAngleY
|
||||
m_ValueList:
|
||||
- rid: 8016363859357991154
|
||||
- rid: 8016363859357991155
|
||||
@@ -341,6 +356,11 @@ MonoBehaviour:
|
||||
- rid: 8016363859357991168
|
||||
- rid: 8016363859357991169
|
||||
- rid: 8016363859357991170
|
||||
- rid: 8016363904930938945
|
||||
- rid: 8016363904930938946
|
||||
- rid: 8016363904930938947
|
||||
- rid: 8016363904930938948
|
||||
- rid: 8016363904930938949
|
||||
m_InputPortInfos:
|
||||
expandedPortsById:
|
||||
m_KeyList: []
|
||||
@@ -425,7 +445,7 @@ MonoBehaviour:
|
||||
- rid: 8016363859357991170
|
||||
type: {class: 'Constant`1[[System.Int32, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 1
|
||||
m_Value: 20
|
||||
- rid: 8016363859357991171
|
||||
type: {class: DialogLineNode, ns: DinoLove.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor}
|
||||
data:
|
||||
@@ -493,3 +513,43 @@ MonoBehaviour:
|
||||
m_PortDirection: 1
|
||||
m_PortOrientation: 0
|
||||
m_Title:
|
||||
- rid: 8016363904930938940
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 0
|
||||
- rid: 8016363904930938941
|
||||
type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value:
|
||||
- rid: 8016363904930938942
|
||||
type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value:
|
||||
- rid: 8016363904930938943
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 0
|
||||
- rid: 8016363904930938944
|
||||
type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 0
|
||||
- rid: 8016363904930938945
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 0
|
||||
- rid: 8016363904930938946
|
||||
type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value:
|
||||
- rid: 8016363904930938947
|
||||
type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value:
|
||||
- rid: 8016363904930938948
|
||||
type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 0
|
||||
- rid: 8016363904930938949
|
||||
type: {class: 'Constant`1[[System.Single, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: UnityEditor.GraphToolkitModule}
|
||||
data:
|
||||
m_Value: 0
|
||||
|
||||
Reference in New Issue
Block a user