summaryrefslogtreecommitdiff
path: root/Erika/Assets/Bundle
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2022-06-21 13:05:57 +0800
committerchai <chaifix@163.com>2022-06-21 13:05:57 +0800
commita06a952a5c7a02573abb05153c709a7bc541ba15 (patch)
tree16c12e8841af776d0e6b6c85f69def62bf6da2c4 /Erika/Assets/Bundle
parenta6edbf35030ff5732e99db1dc4b119ba5b841aac (diff)
* unit state
Diffstat (limited to 'Erika/Assets/Bundle')
-rw-r--r--Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity68
-rw-r--r--Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset30
2 files changed, 78 insertions, 20 deletions
diff --git a/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
index 35830ed0..8a59afb6 100644
--- a/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
+++ b/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+ m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -24063,6 +24063,72 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
+--- !u!1 &203878585
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 203878588}
+ - component: {fileID: 203878587}
+ - component: {fileID: 203878586}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &203878586
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 203878585}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!114 &203878587
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 203878585}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
+--- !u!4 &203878588
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 203878585}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 11
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &278122006
GameObject:
m_ObjectHideFlags: 0
diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset
index a19dff45..2f8ff75c 100644
--- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset
+++ b/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Air_Combo03_Z0_2
+ m_Name: Air_Combo03_Z0_2(Clone)
m_EditorClassIdentifier:
animationName: Air_Combo03_Z0_2
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_2.anim
@@ -122,30 +122,21 @@ MonoBehaviour:
m_Curve:
- serializedVersion: 3
time: 0
- value: 1.8
- inSlope: -0.053573478
- outSlope: -0.053573478
- tangentMode: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
- outWeight: 0.1677485
- - serializedVersion: 3
- time: 0.58117175
- value: 1.4372973
- inSlope: -1.3982409
- outSlope: -1.3982409
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.15874855
- outWeight: 0.14750415
+ outWeight: 0
- serializedVersion: 3
time: 1
- value: 0.5
- inSlope: -2.2379038
- outSlope: -2.2379038
+ value: 1
+ inSlope: 0
+ outSlope: 0
tangentMode: 34
weightedMode: 0
- inWeight: 0.33333334
+ inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
@@ -209,6 +200,7 @@ MonoBehaviour:
lifeTime: 0.1
angle: 0
distance: 0
+ hideUnitInMainCamera: 0
--- !u!114 &114311271947421858
MonoBehaviour:
m_ObjectHideFlags: 0