Skip to content

Commit dd96d4c

Browse files
authored
Merge pull request #437 from Ador-N/dev
interface final update
2 parents a164818 + 6758da2 commit dd96d4c

File tree

98 files changed

+10050
-1909
lines changed

Some content is hidden

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

98 files changed

+10050
-1909
lines changed

interface/Unity/interface-live/Assets/Animations/FX.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.
Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
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: Bajiaoshan
10+
serializedVersion: 7
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves:
17+
- curve:
18+
serializedVersion: 2
19+
m_Curve:
20+
- serializedVersion: 3
21+
time: 0
22+
value: {x: 0, y: 0, z: 0}
23+
inSlope: {x: 0, y: 0, z: 0}
24+
outSlope: {x: 0, y: 0, z: 0}
25+
tangentMode: 0
26+
weightedMode: 0
27+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
28+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
29+
- serializedVersion: 3
30+
time: 0.33333334
31+
value: {x: 0, y: 0, z: 19.2}
32+
inSlope: {x: 0, y: 0, z: 0}
33+
outSlope: {x: 0, y: 0, z: 0}
34+
tangentMode: 0
35+
weightedMode: 0
36+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
37+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
38+
- serializedVersion: 3
39+
time: 0.6333333
40+
value: {x: 0, y: 0, z: -75.45}
41+
inSlope: {x: 0, y: 0, z: -315.5}
42+
outSlope: {x: 0, y: 0, z: 0}
43+
tangentMode: 0
44+
weightedMode: 0
45+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
46+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
47+
m_PreInfinity: 2
48+
m_PostInfinity: 2
49+
m_RotationOrder: 4
50+
path:
51+
m_PositionCurves: []
52+
m_ScaleCurves: []
53+
m_FloatCurves:
54+
- serializedVersion: 2
55+
curve:
56+
serializedVersion: 2
57+
m_Curve:
58+
- serializedVersion: 3
59+
time: 0
60+
value: 0
61+
inSlope: 0
62+
outSlope: 0
63+
tangentMode: 136
64+
weightedMode: 0
65+
inWeight: 0.33333334
66+
outWeight: 0.33333334
67+
- serializedVersion: 3
68+
time: 0.33333334
69+
value: 1
70+
inSlope: 0
71+
outSlope: 0
72+
tangentMode: 136
73+
weightedMode: 0
74+
inWeight: 0.33333334
75+
outWeight: 0.33333334
76+
- serializedVersion: 3
77+
time: 0.6333333
78+
value: 1
79+
inSlope: 0
80+
outSlope: 0
81+
tangentMode: 136
82+
weightedMode: 0
83+
inWeight: 0.33333334
84+
outWeight: 0.33333334
85+
- serializedVersion: 3
86+
time: 0.93333334
87+
value: 0
88+
inSlope: 0
89+
outSlope: 0
90+
tangentMode: 136
91+
weightedMode: 0
92+
inWeight: 0.33333334
93+
outWeight: 0.33333334
94+
m_PreInfinity: 2
95+
m_PostInfinity: 2
96+
m_RotationOrder: 4
97+
attribute: m_Color.a
98+
path:
99+
classID: 212
100+
script: {fileID: 0}
101+
flags: 0
102+
m_PPtrCurves: []
103+
m_SampleRate: 60
104+
m_WrapMode: 0
105+
m_Bounds:
106+
m_Center: {x: 0, y: 0, z: 0}
107+
m_Extent: {x: 0, y: 0, z: 0}
108+
m_ClipBindingConstant:
109+
genericBindings:
110+
- serializedVersion: 2
111+
path: 0
112+
attribute: 4
113+
script: {fileID: 0}
114+
typeID: 4
115+
customType: 4
116+
isPPtrCurve: 0
117+
isIntCurve: 0
118+
isSerializeReferenceCurve: 0
119+
- serializedVersion: 2
120+
path: 0
121+
attribute: 304273561
122+
script: {fileID: 0}
123+
typeID: 212
124+
customType: 0
125+
isPPtrCurve: 0
126+
isIntCurve: 0
127+
isSerializeReferenceCurve: 0
128+
pptrCurveMapping: []
129+
m_AnimationClipSettings:
130+
serializedVersion: 2
131+
m_AdditiveReferencePoseClip: {fileID: 0}
132+
m_AdditiveReferencePoseTime: 0
133+
m_StartTime: 0
134+
m_StopTime: 0.93333334
135+
m_OrientationOffsetY: 0
136+
m_Level: 0
137+
m_CycleOffset: 0
138+
m_HasAdditiveReferencePose: 0
139+
m_LoopTime: 0
140+
m_LoopBlend: 0
141+
m_LoopBlendOrientation: 0
142+
m_LoopBlendPositionY: 0
143+
m_LoopBlendPositionXZ: 0
144+
m_KeepOriginalOrientation: 0
145+
m_KeepOriginalPositionY: 1
146+
m_KeepOriginalPositionXZ: 0
147+
m_HeightFromFeet: 0
148+
m_Mirror: 0
149+
m_EditorCurves:
150+
- serializedVersion: 2
151+
curve:
152+
serializedVersion: 2
153+
m_Curve:
154+
- serializedVersion: 3
155+
time: 0
156+
value: 0
157+
inSlope: 0
158+
outSlope: 0
159+
tangentMode: 136
160+
weightedMode: 0
161+
inWeight: 0.33333334
162+
outWeight: 0.33333334
163+
- serializedVersion: 3
164+
time: 0.33333334
165+
value: 1
166+
inSlope: 0
167+
outSlope: 0
168+
tangentMode: 136
169+
weightedMode: 0
170+
inWeight: 0.33333334
171+
outWeight: 0.33333334
172+
- serializedVersion: 3
173+
time: 0.6333333
174+
value: 1
175+
inSlope: 0
176+
outSlope: 0
177+
tangentMode: 136
178+
weightedMode: 0
179+
inWeight: 0.33333334
180+
outWeight: 0.33333334
181+
- serializedVersion: 3
182+
time: 0.93333334
183+
value: 0
184+
inSlope: 0
185+
outSlope: 0
186+
tangentMode: 136
187+
weightedMode: 0
188+
inWeight: 0.33333334
189+
outWeight: 0.33333334
190+
m_PreInfinity: 2
191+
m_PostInfinity: 2
192+
m_RotationOrder: 4
193+
attribute: m_Color.a
194+
path:
195+
classID: 212
196+
script: {fileID: 0}
197+
flags: 0
198+
- serializedVersion: 2
199+
curve:
200+
serializedVersion: 2
201+
m_Curve:
202+
- serializedVersion: 3
203+
time: 0
204+
value: 0
205+
inSlope: 0
206+
outSlope: 0
207+
tangentMode: 136
208+
weightedMode: 0
209+
inWeight: 0.33333334
210+
outWeight: 0.33333334
211+
- serializedVersion: 3
212+
time: 0.33333334
213+
value: 19.2
214+
inSlope: 0
215+
outSlope: 0
216+
tangentMode: 136
217+
weightedMode: 0
218+
inWeight: 0.33333334
219+
outWeight: 0.33333334
220+
- serializedVersion: 3
221+
time: 0.6333333
222+
value: -75.45
223+
inSlope: -315.5
224+
outSlope: 0
225+
tangentMode: 5
226+
weightedMode: 0
227+
inWeight: 0.33333334
228+
outWeight: 0.33333334
229+
m_PreInfinity: 2
230+
m_PostInfinity: 2
231+
m_RotationOrder: 4
232+
attribute: localEulerAnglesRaw.z
233+
path:
234+
classID: 4
235+
script: {fileID: 0}
236+
flags: 0
237+
m_EulerEditorCurves: []
238+
m_HasGenericRootTransform: 1
239+
m_HasMotionFloatCurves: 0
240+
m_Events: []

interface/Unity/interface-live/Assets/Animations/FX/Bajiaoshan.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.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1107 &-5802800784996332730
4+
AnimatorStateMachine:
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: Base Layer
11+
m_ChildStates:
12+
- serializedVersion: 1
13+
m_State: {fileID: -3098498851324357197}
14+
m_Position: {x: 200, y: 0, z: 0}
15+
m_ChildStateMachines: []
16+
m_AnyStateTransitions: []
17+
m_EntryTransitions: []
18+
m_StateMachineTransitions: {}
19+
m_StateMachineBehaviours: []
20+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
21+
m_EntryPosition: {x: 50, y: 120, z: 0}
22+
m_ExitPosition: {x: 800, y: 120, z: 0}
23+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
24+
m_DefaultState: {fileID: -3098498851324357197}
25+
--- !u!1102 &-3098498851324357197
26+
AnimatorState:
27+
serializedVersion: 6
28+
m_ObjectHideFlags: 1
29+
m_CorrespondingSourceObject: {fileID: 0}
30+
m_PrefabInstance: {fileID: 0}
31+
m_PrefabAsset: {fileID: 0}
32+
m_Name: Bajiaoshan
33+
m_Speed: 1
34+
m_CycleOffset: 0
35+
m_Transitions: []
36+
m_StateMachineBehaviours: []
37+
m_Position: {x: 50, y: 50, z: 0}
38+
m_IKOnFeet: 0
39+
m_WriteDefaultValues: 1
40+
m_Mirror: 0
41+
m_SpeedParameterActive: 0
42+
m_MirrorParameterActive: 0
43+
m_CycleOffsetParameterActive: 0
44+
m_TimeParameterActive: 0
45+
m_Motion: {fileID: 7400000, guid: b92b17e5e6b6ae6438674f6575fc1fdc, type: 2}
46+
m_Tag:
47+
m_SpeedParameter:
48+
m_MirrorParameter:
49+
m_CycleOffsetParameter:
50+
m_TimeParameter:
51+
--- !u!91 &9100000
52+
AnimatorController:
53+
m_ObjectHideFlags: 0
54+
m_CorrespondingSourceObject: {fileID: 0}
55+
m_PrefabInstance: {fileID: 0}
56+
m_PrefabAsset: {fileID: 0}
57+
m_Name: Bajiaoshan
58+
serializedVersion: 5
59+
m_AnimatorParameters: []
60+
m_AnimatorLayers:
61+
- serializedVersion: 5
62+
m_Name: Base Layer
63+
m_StateMachine: {fileID: -5802800784996332730}
64+
m_Mask: {fileID: 0}
65+
m_Motions: []
66+
m_Behaviours: []
67+
m_BlendingMode: 0
68+
m_SyncedLayerIndex: -1
69+
m_DefaultWeight: 0
70+
m_IKPass: 0
71+
m_SyncedLayerAffectsTiming: 0
72+
m_Controller: {fileID: 9100000}

interface/Unity/interface-live/Assets/Animations/FX/Bajiaoshan.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.

0 commit comments

Comments
 (0)