Skip to content

Commit 2318ef3

Browse files
# Conflicts: # Assets/Scenes/Levels/Level0.unity
2 parents b8ee8a1 + 9ef13c0 commit 2318ef3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+671382
-11935
lines changed

Assets/DialogueBox.controller

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1102 &-9059333145843119027
4+
AnimatorState:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 1
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: DialogueBoxClose
11+
m_Speed: 1
12+
m_CycleOffset: 0
13+
m_Transitions:
14+
- {fileID: 5641470875283518640}
15+
m_StateMachineBehaviours: []
16+
m_Position: {x: 50, y: 50, z: 0}
17+
m_IKOnFeet: 0
18+
m_WriteDefaultValues: 1
19+
m_Mirror: 0
20+
m_SpeedParameterActive: 0
21+
m_MirrorParameterActive: 0
22+
m_CycleOffsetParameterActive: 0
23+
m_TimeParameterActive: 0
24+
m_Motion: {fileID: 7400000, guid: 211453e46eb9b413ca1b6c2118f1cd15, type: 2}
25+
m_Tag:
26+
m_SpeedParameter:
27+
m_MirrorParameter:
28+
m_CycleOffsetParameter:
29+
m_TimeParameter:
30+
--- !u!1102 &-7787445019924633837
31+
AnimatorState:
32+
serializedVersion: 6
33+
m_ObjectHideFlags: 1
34+
m_CorrespondingSourceObject: {fileID: 0}
35+
m_PrefabInstance: {fileID: 0}
36+
m_PrefabAsset: {fileID: 0}
37+
m_Name: DialogueBoxOpen
38+
m_Speed: 1
39+
m_CycleOffset: 0
40+
m_Transitions:
41+
- {fileID: 8413969066375197349}
42+
m_StateMachineBehaviours: []
43+
m_Position: {x: 50, y: 50, z: 0}
44+
m_IKOnFeet: 0
45+
m_WriteDefaultValues: 1
46+
m_Mirror: 0
47+
m_SpeedParameterActive: 0
48+
m_MirrorParameterActive: 0
49+
m_CycleOffsetParameterActive: 0
50+
m_TimeParameterActive: 0
51+
m_Motion: {fileID: 7400000, guid: 78f8cdf952bb642988402e058cf72fa6, type: 2}
52+
m_Tag:
53+
m_SpeedParameter:
54+
m_MirrorParameter:
55+
m_CycleOffsetParameter:
56+
m_TimeParameter:
57+
--- !u!91 &9100000
58+
AnimatorController:
59+
m_ObjectHideFlags: 0
60+
m_CorrespondingSourceObject: {fileID: 0}
61+
m_PrefabInstance: {fileID: 0}
62+
m_PrefabAsset: {fileID: 0}
63+
m_Name: DialogueBox
64+
serializedVersion: 5
65+
m_AnimatorParameters:
66+
- m_Name: isOpen
67+
m_Type: 4
68+
m_DefaultFloat: 0
69+
m_DefaultInt: 0
70+
m_DefaultBool: 0
71+
m_Controller: {fileID: 0}
72+
m_AnimatorLayers:
73+
- serializedVersion: 5
74+
m_Name: Base Layer
75+
m_StateMachine: {fileID: 8465829859974027161}
76+
m_Mask: {fileID: 0}
77+
m_Motions: []
78+
m_Behaviours: []
79+
m_BlendingMode: 0
80+
m_SyncedLayerIndex: -1
81+
m_DefaultWeight: 0
82+
m_IKPass: 0
83+
m_SyncedLayerAffectsTiming: 0
84+
m_Controller: {fileID: 9100000}
85+
--- !u!1101 &5641470875283518640
86+
AnimatorStateTransition:
87+
m_ObjectHideFlags: 1
88+
m_CorrespondingSourceObject: {fileID: 0}
89+
m_PrefabInstance: {fileID: 0}
90+
m_PrefabAsset: {fileID: 0}
91+
m_Name:
92+
m_Conditions:
93+
- m_ConditionMode: 1
94+
m_ConditionEvent: isOpen
95+
m_EventTreshold: 0
96+
m_DstStateMachine: {fileID: 0}
97+
m_DstState: {fileID: -7787445019924633837}
98+
m_Solo: 0
99+
m_Mute: 0
100+
m_IsExit: 0
101+
serializedVersion: 3
102+
m_TransitionDuration: 0.25
103+
m_TransitionOffset: 0
104+
m_ExitTime: 0.75
105+
m_HasExitTime: 0
106+
m_HasFixedDuration: 1
107+
m_InterruptionSource: 0
108+
m_OrderedInterruption: 1
109+
m_CanTransitionToSelf: 1
110+
--- !u!1101 &8413969066375197349
111+
AnimatorStateTransition:
112+
m_ObjectHideFlags: 1
113+
m_CorrespondingSourceObject: {fileID: 0}
114+
m_PrefabInstance: {fileID: 0}
115+
m_PrefabAsset: {fileID: 0}
116+
m_Name:
117+
m_Conditions:
118+
- m_ConditionMode: 2
119+
m_ConditionEvent: isOpen
120+
m_EventTreshold: 0
121+
m_DstStateMachine: {fileID: 0}
122+
m_DstState: {fileID: -9059333145843119027}
123+
m_Solo: 0
124+
m_Mute: 0
125+
m_IsExit: 0
126+
serializedVersion: 3
127+
m_TransitionDuration: 0.25
128+
m_TransitionOffset: 0
129+
m_ExitTime: 0.75
130+
m_HasExitTime: 0
131+
m_HasFixedDuration: 1
132+
m_InterruptionSource: 0
133+
m_OrderedInterruption: 1
134+
m_CanTransitionToSelf: 1
135+
--- !u!1107 &8465829859974027161
136+
AnimatorStateMachine:
137+
serializedVersion: 6
138+
m_ObjectHideFlags: 1
139+
m_CorrespondingSourceObject: {fileID: 0}
140+
m_PrefabInstance: {fileID: 0}
141+
m_PrefabAsset: {fileID: 0}
142+
m_Name: Base Layer
143+
m_ChildStates:
144+
- serializedVersion: 1
145+
m_State: {fileID: -7787445019924633837}
146+
m_Position: {x: 200, y: 0, z: 0}
147+
- serializedVersion: 1
148+
m_State: {fileID: -9059333145843119027}
149+
m_Position: {x: 220, y: 110, z: 0}
150+
m_ChildStateMachines: []
151+
m_AnyStateTransitions: []
152+
m_EntryTransitions: []
153+
m_StateMachineTransitions: {}
154+
m_StateMachineBehaviours: []
155+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
156+
m_EntryPosition: {x: 50, y: 120, z: 0}
157+
m_ExitPosition: {x: 800, y: 120, z: 0}
158+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
159+
m_DefaultState: {fileID: -9059333145843119027}

Assets/DialogueBox.controller.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/DialogueBoxClose.anim

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: DialogueBoxClose
10+
serializedVersion: 6
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves:
20+
- curve:
21+
serializedVersion: 2
22+
m_Curve:
23+
- serializedVersion: 3
24+
time: 0
25+
value: -700
26+
inSlope: 0
27+
outSlope: 0
28+
tangentMode: 136
29+
weightedMode: 0
30+
inWeight: 0
31+
outWeight: 0
32+
m_PreInfinity: 2
33+
m_PostInfinity: 2
34+
m_RotationOrder: 4
35+
attribute: m_AnchoredPosition.y
36+
path:
37+
classID: 224
38+
script: {fileID: 0}
39+
m_PPtrCurves: []
40+
m_SampleRate: 60
41+
m_WrapMode: 0
42+
m_Bounds:
43+
m_Center: {x: 0, y: 0, z: 0}
44+
m_Extent: {x: 0, y: 0, z: 0}
45+
m_ClipBindingConstant:
46+
genericBindings:
47+
- serializedVersion: 2
48+
path: 0
49+
attribute: 538195251
50+
script: {fileID: 0}
51+
typeID: 224
52+
customType: 28
53+
isPPtrCurve: 0
54+
pptrCurveMapping: []
55+
m_AnimationClipSettings:
56+
serializedVersion: 2
57+
m_AdditiveReferencePoseClip: {fileID: 0}
58+
m_AdditiveReferencePoseTime: 0
59+
m_StartTime: 0
60+
m_StopTime: 0
61+
m_OrientationOffsetY: 0
62+
m_Level: 0
63+
m_CycleOffset: 0
64+
m_HasAdditiveReferencePose: 0
65+
m_LoopTime: 1
66+
m_LoopBlend: 0
67+
m_LoopBlendOrientation: 0
68+
m_LoopBlendPositionY: 0
69+
m_LoopBlendPositionXZ: 0
70+
m_KeepOriginalOrientation: 0
71+
m_KeepOriginalPositionY: 1
72+
m_KeepOriginalPositionXZ: 0
73+
m_HeightFromFeet: 0
74+
m_Mirror: 0
75+
m_EditorCurves:
76+
- curve:
77+
serializedVersion: 2
78+
m_Curve:
79+
- serializedVersion: 3
80+
time: 0
81+
value: -700
82+
inSlope: 0
83+
outSlope: 0
84+
tangentMode: 136
85+
weightedMode: 0
86+
inWeight: 0
87+
outWeight: 0
88+
m_PreInfinity: 2
89+
m_PostInfinity: 2
90+
m_RotationOrder: 4
91+
attribute: m_AnchoredPosition.y
92+
path:
93+
classID: 224
94+
script: {fileID: 0}
95+
m_EulerEditorCurves: []
96+
m_HasGenericRootTransform: 0
97+
m_HasMotionFloatCurves: 0
98+
m_Events: []

Assets/DialogueBoxClose.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/DialogueBoxOpen.anim

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: DialogueBoxOpen
10+
serializedVersion: 6
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves:
20+
- curve:
21+
serializedVersion: 2
22+
m_Curve:
23+
- serializedVersion: 3
24+
time: 0
25+
value: -450
26+
inSlope: 0
27+
outSlope: 0
28+
tangentMode: 136
29+
weightedMode: 0
30+
inWeight: 0
31+
outWeight: 0
32+
m_PreInfinity: 2
33+
m_PostInfinity: 2
34+
m_RotationOrder: 4
35+
attribute: m_AnchoredPosition.y
36+
path:
37+
classID: 224
38+
script: {fileID: 0}
39+
m_PPtrCurves: []
40+
m_SampleRate: 60
41+
m_WrapMode: 0
42+
m_Bounds:
43+
m_Center: {x: 0, y: 0, z: 0}
44+
m_Extent: {x: 0, y: 0, z: 0}
45+
m_ClipBindingConstant:
46+
genericBindings:
47+
- serializedVersion: 2
48+
path: 0
49+
attribute: 538195251
50+
script: {fileID: 0}
51+
typeID: 224
52+
customType: 28
53+
isPPtrCurve: 0
54+
pptrCurveMapping: []
55+
m_AnimationClipSettings:
56+
serializedVersion: 2
57+
m_AdditiveReferencePoseClip: {fileID: 0}
58+
m_AdditiveReferencePoseTime: 0
59+
m_StartTime: 0
60+
m_StopTime: 0
61+
m_OrientationOffsetY: 0
62+
m_Level: 0
63+
m_CycleOffset: 0
64+
m_HasAdditiveReferencePose: 0
65+
m_LoopTime: 1
66+
m_LoopBlend: 0
67+
m_LoopBlendOrientation: 0
68+
m_LoopBlendPositionY: 0
69+
m_LoopBlendPositionXZ: 0
70+
m_KeepOriginalOrientation: 0
71+
m_KeepOriginalPositionY: 1
72+
m_KeepOriginalPositionXZ: 0
73+
m_HeightFromFeet: 0
74+
m_Mirror: 0
75+
m_EditorCurves:
76+
- curve:
77+
serializedVersion: 2
78+
m_Curve:
79+
- serializedVersion: 3
80+
time: 0
81+
value: -450
82+
inSlope: 0
83+
outSlope: 0
84+
tangentMode: 136
85+
weightedMode: 0
86+
inWeight: 0
87+
outWeight: 0
88+
m_PreInfinity: 2
89+
m_PostInfinity: 2
90+
m_RotationOrder: 4
91+
attribute: m_AnchoredPosition.y
92+
path:
93+
classID: 224
94+
script: {fileID: 0}
95+
m_EulerEditorCurves: []
96+
m_HasGenericRootTransform: 0
97+
m_HasMotionFloatCurves: 0
98+
m_Events: []

Assets/DialogueBoxOpen.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)