Skip to content

Commit 5722263

Browse files
authored
Merge pull request #19 from MerlinVR/v1-dev
V1
2 parents 311520e + 77c4d36 commit 5722263

File tree

214 files changed

+28489
-10091
lines changed

Some content is hidden

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

214 files changed

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

Assets/USharpVideo/RenderTextures/VideoRT.renderTexture.meta renamed to Assets/USharpVideo/Animations/ReloadButton.controller.meta

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

0 commit comments

Comments
 (0)