Skip to content

Commit bb4da7d

Browse files
committed
Alpha Version
1 parent b227c60 commit bb4da7d

File tree

168 files changed

+2361
-22186
lines changed

Some content is hidden

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

168 files changed

+2361
-22186
lines changed
Binary file not shown.
-13.2 KB
Binary file not shown.

Expression Maker/Assets/Debug/Cylinder.fbx.meta

-108
This file was deleted.

Expression Maker/Assets/Debug/New Animator Controller.controller renamed to Expression Maker/Assets/Debug/Debug Animator Controller.controller

+38-67
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1102 &-1768977775166899827
3+
--- !u!1102 &-2436889880016187830
44
AnimatorState:
55
serializedVersion: 6
66
m_ObjectHideFlags: 1
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: 124124124n
10+
m_Name: Facial Expression 2
1111
m_Speed: 1
1212
m_CycleOffset: 0
1313
m_Transitions: []
@@ -20,33 +20,7 @@ AnimatorState:
2020
m_MirrorParameterActive: 0
2121
m_CycleOffsetParameterActive: 0
2222
m_TimeParameterActive: 0
23-
m_Motion: {fileID: 7400000, guid: 2f16c44ba2352a34a9677d9323a533cf, type: 2}
24-
m_Tag:
25-
m_SpeedParameter:
26-
m_MirrorParameter:
27-
m_CycleOffsetParameter:
28-
m_TimeParameter:
29-
--- !u!1102 &-821484384953911704
30-
AnimatorState:
31-
serializedVersion: 6
32-
m_ObjectHideFlags: 1
33-
m_CorrespondingSourceObject: {fileID: 0}
34-
m_PrefabInstance: {fileID: 0}
35-
m_PrefabAsset: {fileID: 0}
36-
m_Name: asdasdasdssion
37-
m_Speed: 1
38-
m_CycleOffset: 0
39-
m_Transitions: []
40-
m_StateMachineBehaviours: []
41-
m_Position: {x: 50, y: 50, z: 0}
42-
m_IKOnFeet: 0
43-
m_WriteDefaultValues: 1
44-
m_Mirror: 0
45-
m_SpeedParameterActive: 0
46-
m_MirrorParameterActive: 0
47-
m_CycleOffsetParameterActive: 0
48-
m_TimeParameterActive: 0
49-
m_Motion: {fileID: 7400000, guid: bceeec5820481d444837a54510c5004e, type: 2}
23+
m_Motion: {fileID: 7400000, guid: 5325b3284c4dd7b4abe1f11f3da0e915, type: 2}
5024
m_Tag:
5125
m_SpeedParameter:
5226
m_MirrorParameter:
@@ -58,7 +32,7 @@ AnimatorController:
5832
m_CorrespondingSourceObject: {fileID: 0}
5933
m_PrefabInstance: {fileID: 0}
6034
m_PrefabAsset: {fileID: 0}
61-
m_Name: New Animator Controller
35+
m_Name: Debug Animator Controller
6236
serializedVersion: 5
6337
m_AnimatorParameters: []
6438
m_AnimatorLayers:
@@ -74,45 +48,14 @@ AnimatorController:
7448
m_IKPass: 0
7549
m_SyncedLayerAffectsTiming: 0
7650
m_Controller: {fileID: 9100000}
77-
--- !u!1107 &3272611278865618170
78-
AnimatorStateMachine:
79-
serializedVersion: 6
80-
m_ObjectHideFlags: 1
81-
m_CorrespondingSourceObject: {fileID: 0}
82-
m_PrefabInstance: {fileID: 0}
83-
m_PrefabAsset: {fileID: 0}
84-
m_Name: Base Layer
85-
m_ChildStates:
86-
- serializedVersion: 1
87-
m_State: {fileID: -1768977775166899827}
88-
m_Position: {x: 412, y: 62, z: 0}
89-
- serializedVersion: 1
90-
m_State: {fileID: 6738509957225798597}
91-
m_Position: {x: 404, y: 124, z: 0}
92-
- serializedVersion: 1
93-
m_State: {fileID: -821484384953911704}
94-
m_Position: {x: 304, y: 109, z: 0}
95-
- serializedVersion: 1
96-
m_State: {fileID: 8083063889120902322}
97-
m_Position: {x: 351, y: 49, z: 0}
98-
m_ChildStateMachines: []
99-
m_AnyStateTransitions: []
100-
m_EntryTransitions: []
101-
m_StateMachineTransitions: {}
102-
m_StateMachineBehaviours: []
103-
m_AnyStatePosition: {x: 50, y: 20, z: 0}
104-
m_EntryPosition: {x: 50, y: 120, z: 0}
105-
m_ExitPosition: {x: 800, y: 120, z: 0}
106-
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
107-
m_DefaultState: {fileID: -1768977775166899827}
108-
--- !u!1102 &6738509957225798597
51+
--- !u!1102 &884294962620974715
10952
AnimatorState:
11053
serializedVersion: 6
11154
m_ObjectHideFlags: 1
11255
m_CorrespondingSourceObject: {fileID: 0}
11356
m_PrefabInstance: {fileID: 0}
11457
m_PrefabAsset: {fileID: 0}
115-
m_Name: asdasdasdasdn
58+
m_Name: Facial Expression 1
11659
m_Speed: 1
11760
m_CycleOffset: 0
11861
m_Transitions: []
@@ -125,20 +68,48 @@ AnimatorState:
12568
m_MirrorParameterActive: 0
12669
m_CycleOffsetParameterActive: 0
12770
m_TimeParameterActive: 0
128-
m_Motion: {fileID: 7400000, guid: a3d4ac5d961b980439966477d6008c8f, type: 2}
71+
m_Motion: {fileID: 7400000, guid: 92229d4b5cc31c24083268fe68e66ad9, type: 2}
12972
m_Tag:
13073
m_SpeedParameter:
13174
m_MirrorParameter:
13275
m_CycleOffsetParameter:
13376
m_TimeParameter:
134-
--- !u!1102 &8083063889120902322
77+
--- !u!1107 &3272611278865618170
78+
AnimatorStateMachine:
79+
serializedVersion: 6
80+
m_ObjectHideFlags: 1
81+
m_CorrespondingSourceObject: {fileID: 0}
82+
m_PrefabInstance: {fileID: 0}
83+
m_PrefabAsset: {fileID: 0}
84+
m_Name: Base Layer
85+
m_ChildStates:
86+
- serializedVersion: 1
87+
m_State: {fileID: 884294962620974715}
88+
m_Position: {x: 449, y: 130, z: 0}
89+
- serializedVersion: 1
90+
m_State: {fileID: -2436889880016187830}
91+
m_Position: {x: 512, y: 216, z: 0}
92+
- serializedVersion: 1
93+
m_State: {fileID: 5022402580979896972}
94+
m_Position: {x: 450, y: 219, z: 0}
95+
m_ChildStateMachines: []
96+
m_AnyStateTransitions: []
97+
m_EntryTransitions: []
98+
m_StateMachineTransitions: {}
99+
m_StateMachineBehaviours: []
100+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
101+
m_EntryPosition: {x: 50, y: 120, z: 0}
102+
m_ExitPosition: {x: 800, y: 120, z: 0}
103+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
104+
m_DefaultState: {fileID: 884294962620974715}
105+
--- !u!1102 &5022402580979896972
135106
AnimatorState:
136107
serializedVersion: 6
137108
m_ObjectHideFlags: 1
138109
m_CorrespondingSourceObject: {fileID: 0}
139110
m_PrefabInstance: {fileID: 0}
140111
m_PrefabAsset: {fileID: 0}
141-
m_Name: asdasd
112+
m_Name: Facial Expression 3
142113
m_Speed: 1
143114
m_CycleOffset: 0
144115
m_Transitions: []
@@ -151,7 +122,7 @@ AnimatorState:
151122
m_MirrorParameterActive: 0
152123
m_CycleOffsetParameterActive: 0
153124
m_TimeParameterActive: 0
154-
m_Motion: {fileID: 7400000, guid: 03f79592055bd2d4d9dff826f8da522b, type: 2}
125+
m_Motion: {fileID: 7400000, guid: 114bceb6ba7ad1b408a76743e15c4031, type: 2}
155126
m_Tag:
156127
m_SpeedParameter:
157128
m_MirrorParameter:

Expression Maker/Assets/Debug/asdasd.anim

-95
This file was deleted.

Expression Maker/Assets/Debug/asdasd.anim.meta

-8
This file was deleted.

0 commit comments

Comments
 (0)