diff --git a/Assets/Animate/Tree/Tree.controller b/Assets/Animate/Tree/Tree.controller
index 25a90eb..364087e 100644
--- a/Assets/Animate/Tree/Tree.controller
+++ b/Assets/Animate/Tree/Tree.controller
@@ -17,7 +17,7 @@ AnimatorStateMachine:
m_Position: {x: 240, y: 400, z: 0}
- serializedVersion: 1
m_State: {fileID: 8020492566475511360}
- m_Position: {x: 260, y: 630, z: 0}
+ m_Position: {x: 240, y: 620, z: 0}
- serializedVersion: 1
m_State: {fileID: 992017425945827329}
m_Position: {x: 250, y: 710, z: 0}
diff --git a/Assets/Animate/Tree/TreeByFrame.anim b/Assets/Animate/Tree/TreeByFrame.anim
index 1bc7437..cf59e84 100644
--- a/Assets/Animate/Tree/TreeByFrame.anim
+++ b/Assets/Animate/Tree/TreeByFrame.anim
@@ -30,7 +30,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.41666666
+ time: 1.1666666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -39,7 +39,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.9166666
+ time: 1.6666666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -67,7 +67,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.41666666
+ time: 1.1666666
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -76,7 +76,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.9166667
+ time: 1.6666666
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -95,17 +95,17 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 1603219427004495315, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
- - time: 0.083333336
- value: {fileID: 2176395685386334811, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
- - time: 0.16666667
- value: {fileID: 7477653017870307911, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
- - time: 0.25
- value: {fileID: -1184253936194617677, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
- - time: 0.33333334
- value: {fileID: -5322578963431399551, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
- - time: 0.41666666
- value: {fileID: 6767099938827345393, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
- time: 0.8333333
+ value: {fileID: 2176395685386334811, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
+ - time: 0.9166667
+ value: {fileID: 7477653017870307911, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
+ - time: 1
+ value: {fileID: -1184253936194617677, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
+ - time: 1.0833334
+ value: {fileID: -5322578963431399551, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
+ - time: 1.1666666
+ value: {fileID: 6767099938827345393, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
+ - time: 1.5833334
value: {fileID: 6767099938827345393, guid: 6cd178e68784ecd46a2ea165d13e538e, type: 3}
attribute: m_Sprite
path:
@@ -152,7 +152,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.9166667
+ m_StopTime: 1.6666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -181,7 +181,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.41666666
+ time: 1.1666666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -190,7 +190,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.9166666
+ time: 1.6666666
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -218,7 +218,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.41666666
+ time: 1.1666666
value: 1
inSlope: Infinity
outSlope: Infinity
@@ -227,7 +227,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
- time: 0.9166667
+ time: 1.6666666
value: 1
inSlope: Infinity
outSlope: Infinity
diff --git a/Assets/Prefabs/石刀.prefab b/Assets/Prefabs/石刀.prefab
index b5c2f9e..9ffd596 100644
--- a/Assets/Prefabs/石刀.prefab
+++ b/Assets/Prefabs/石刀.prefab
@@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6620016358095660858}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalRotation: {x: -0, y: -0, z: -0.11641215, w: 0.993201}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -13.37}
--- !u!212 &6620016358095660859
SpriteRenderer:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/乐/Sample1.unity b/Assets/Scenes/乐/Sample1.unity
index 2285145..a34da9c 100644
--- a/Assets/Scenes/乐/Sample1.unity
+++ b/Assets/Scenes/乐/Sample1.unity
@@ -153,6 +153,63 @@ Transform:
m_Father: {fileID: 1096570727}
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &21957552
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_RootOrder
+ value: 18
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -4.35
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 6.25
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6620016358095660858, guid: edecf791093330a4b8299512214e3c7b, type: 3}
+ propertyPath: m_Name
+ value: "\u77F3\u5200"
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: edecf791093330a4b8299512214e3c7b, type: 3}
--- !u!1 &28184871
GameObject:
m_ObjectHideFlags: 0
@@ -233,8 +290,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
inputDir: 0
+ bone: {fileID: 1240253825}
groundCheck: {fileID: 38111932}
weapon: {fileID: 873183836}
+ weaponTrans: {fileID: 1719295484}
weaponPos: {x: 1, y: 0, z: 0}
isRight: 1
isGround: 0
@@ -248,7 +307,7 @@ SpriteRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 28184871}
- m_Enabled: 1
+ m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -300,9 +359,10 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 28184871}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.69, y: 0, z: 0}
+ m_LocalPosition: {x: -2.09, y: -1.66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1240253824}
- {fileID: 38111932}
- {fileID: 2001288232}
m_Father: {fileID: 0}
@@ -336,7 +396,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 28184876}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &74015222
GameObject:
@@ -1033,7 +1093,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 72ff3269b294cb0488d44a4bc6fc6939, type: 3}
m_Name:
m_EditorClassIdentifier:
- player: {fileID: 1658378289}
+ player: {fileID: 28184874}
--- !u!1 &568882133
GameObject:
m_ObjectHideFlags: 0
@@ -1373,63 +1433,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
---- !u!1001 &795676345
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_RootOrder
- value: 18
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalPosition.x
- value: -1.3700001
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalPosition.y
- value: 6.049999
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6620016358095660858, guid: edecf791093330a4b8299512214e3c7b, type: 3}
- propertyPath: m_Name
- value: "\u77F3\u5200"
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: edecf791093330a4b8299512214e3c7b, type: 3}
--- !u!1 &799929782
GameObject:
m_ObjectHideFlags: 0
@@ -2618,8 +2621,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
inputDir: 0
+ bone: {fileID: 0}
groundCheck: {fileID: 20909047}
weapon: {fileID: 873183836}
+ weaponTrans: {fileID: 0}
weaponPos: {x: 1, y: 0, z: 0}
isRight: 1
isGround: 0
@@ -2931,6 +2936,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
fireStick: {fileID: 8452581746669843344}
Spark: {fileID: 1979334484}
+ delayTime: 1.5
--- !u!1 &1185727661
GameObject:
m_ObjectHideFlags: 0
@@ -3045,6 +3051,740 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a74564a767dc70240816885b2afad328, type: 3}
+--- !u!1001 &1240253823
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 28184876}
+ m_Modifications:
+ - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.8472028
+ objectReference: {fileID: 0}
+ - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9990805
+ objectReference: {fileID: 0}
+ - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.04287368
+ objectReference: {fileID: 0}
+ - target: {fileID: 544852659734527807, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 544852659734527807, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 1292480115956132516, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.2251129
+ objectReference: {fileID: 0}
+ - target: {fileID: 1292480115956132516, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7046301
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.1775742
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.09949586
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.08266038
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.9965778
+ objectReference: {fileID: 0}
+ - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.571297
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00000006439765
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9862338
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.1653573
+ objectReference: {fileID: 0}
+ - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.08779
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00000001088842
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9999409
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.01087318
+ objectReference: {fileID: 0}
+ - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.1814797
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.1108834
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.0816908
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.9966578
+ objectReference: {fileID: 0}
+ - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.8077052
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000001721674
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9857183
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.168403
+ objectReference: {fileID: 0}
+ - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.276312
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.03781857
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7080904
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7061218
+ objectReference: {fileID: 0}
+ - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9989145
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.04658162
+ objectReference: {fileID: 0}
+ - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.46199042
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.46199042
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.46199042
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.12
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1.21
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.8779536
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.00000003723409
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9992116
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.03970221
+ objectReference: {fileID: 0}
+ - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3139476684695217710, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3139476684695217710, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 3518558182975132334, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3518558182975132334, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.386071
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.1275305
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.3770569
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.9261902
+ objectReference: {fileID: 0}
+ - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000001338032
+ objectReference: {fileID: 0}
+ - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9997447
+ objectReference: {fileID: 0}
+ - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.02259521
+ objectReference: {fileID: 0}
+ - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4258863831937463669, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4258863831937463669, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 5184585291826125097, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 5253916272546461107, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_Name
+ value: cangjie
+ objectReference: {fileID: 0}
+ - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0000001408897
+ objectReference: {fileID: 0}
+ - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9999777
+ objectReference: {fileID: 0}
+ - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.006681608
+ objectReference: {fileID: 0}
+ - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6312314422838805471, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6312314422838805471, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000000559481
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9824338
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.1866114
+ objectReference: {fileID: 0}
+ - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6601027411502806696, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6601027411502806696, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 6717728856294287736, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6717728856294287736, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 6787023872785350082, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6787023872785350082, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 6802631931743417492, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6802631931743417492, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 6895216320908761780, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6895216320908761780, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 7271643883544001200, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7271643883544001200, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 7882857787574193221, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.9999998
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2.269244
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0000002166282
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9998721
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.01599354
+ objectReference: {fileID: 0}
+ - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8046125051025425614, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8046125051025425614, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 8385037936056148123, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8526898341661258944, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8526898341661258944, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 8678235576725192488, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8678235576725192488, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 1.12175
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0000002713931
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.999678
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.02537676
+ objectReference: {fileID: 0}
+ - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -2.002787
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -2.963103
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.8800381
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.47490305
+ objectReference: {fileID: 0}
+ - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 56.706
+ objectReference: {fileID: 0}
+ - target: {fileID: 9097020254388595172, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 9097020254388595172, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ propertyPath: m_SortingLayerID
+ value: 1320200709
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+--- !u!4 &1240253824 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ m_PrefabInstance: {fileID: 1240253823}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1240253825 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5253916272546461107, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ m_PrefabInstance: {fileID: 1240253823}
+ m_PrefabAsset: {fileID: 0}
+--- !u!95 &1240253826
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1240253825}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 1ba7e0ac06fb77d46a4671461667d828, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1346768665
GameObject:
m_ObjectHideFlags: 0
@@ -3755,8 +4495,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
inputDir: 0
+ bone: {fileID: 0}
groundCheck: {fileID: 1374474099}
weapon: {fileID: 873183836}
+ weaponTrans: {fileID: 0}
weaponPos: {x: 1, y: 0, z: 0}
isRight: 1
isGround: 0
@@ -3810,6 +4552,11 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
+--- !u!4 &1719295484 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3}
+ m_PrefabInstance: {fileID: 1240253823}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1979334484
GameObject:
m_ObjectHideFlags: 0
@@ -8642,7 +9389,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 28184876}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2082496741
GameObject:
diff --git a/Assets/Scripts/乐/Fire.cs b/Assets/Scripts/乐/Fire.cs
index 68fa743..1ff2f73 100644
--- a/Assets/Scripts/乐/Fire.cs
+++ b/Assets/Scripts/乐/Fire.cs
@@ -6,6 +6,7 @@ public class Fire : Interacter
{
public FireStick fireStick;
public GameObject Spark;
+ public float delayTime;
override protected void Start()
{
base.Start();
@@ -27,10 +28,11 @@ public class Fire : Interacter
ChangesDuringIntertacting(1f);
if (player.weapon.name == "火把")
{
+ player.FireInteractAnim();//播动画
Debug.Log("牛逼,烧起来了");
//ItemController.Instance.AddItem(fireStick);
//ChangeToLastWeapon();
- ItemController.Instance.ReplaceItem(fireStick);
+ Invoke(nameof(ChangeWeapon),delayTime);//配合动画延迟换武器
Spark.SetActive(true);
}
else
@@ -44,4 +46,7 @@ public class Fire : Interacter
}
}
+ void ChangeWeapon() {
+ ItemController.Instance.ReplaceItem(fireStick);
+ }
}
diff --git a/Assets/Scripts/乐/Player.cs b/Assets/Scripts/乐/Player.cs
index 9ac56aa..7b68b0d 100644
--- a/Assets/Scripts/乐/Player.cs
+++ b/Assets/Scripts/乐/Player.cs
@@ -12,6 +12,11 @@ public class Player : PlayerControl
///
Rigidbody2D m_rigidbody;
+ [Header("骨骼")]
+ [FoldoutGroup("子物体")]
+ public GameObject bone;
+ Animator boneAnim;
+
///
/// 脚底位置子物体
///
@@ -27,7 +32,12 @@ public class Player : PlayerControl
///
/// 武器生成位置(需要绑在骨骼上)
///
- [Header("武器生成位置(需要绑在骨骼上)")][FoldoutGroup("子物体")]
+
+ [Header("武器生成位置(需要绑在骨骼上)")]
+ [FoldoutGroup("子物体")]
+ public Transform weaponTrans;
+ [Header("武器生成位置偏移")]
+ [FoldoutGroup("子物体")]
public Vector3 weaponPos;
///
@@ -72,14 +82,20 @@ public class Player : PlayerControl
{
base.Start();
m_rigidbody = gameObject.GetComponent();
+ boneAnim = bone.gameObject.GetComponent();
WeaponInit();
}
//UPDATE
void Update()
{
- OnInputDetect();
+ //OnInputDetect();
Flip();
+
+ /*
+ if (inputDir!=0 && boneAnim.GetBool("Move")==false)
+ boneAnim.SetBool("Move", true);
+ */
}
void FixedUpdate() {
@@ -109,13 +125,15 @@ public class Player : PlayerControl
}
}
+ /*
///
/// 检测是否停止摇杆输入
///
void OnInputDetect() {
if (inputDir == 0&&isHurting==false)
Freeze();
- }
+ }*/
+
///
/// 强制静止
///
@@ -125,7 +143,16 @@ public class Player : PlayerControl
void Moving() {
if (isHurting == false)
- { m_rigidbody.velocity = new Vector2(inputDir * speed, m_rigidbody.velocity.y); }
+ {
+ switch (inputDir) {
+ case 0:
+ boneAnim.SetBool("Move",false);
+ break;
+ default:
+ boneAnim.SetBool("Move",true);
+ break;
+ }
+ m_rigidbody.velocity = new Vector2(inputDir * speed, m_rigidbody.velocity.y); }
}
@@ -171,7 +198,7 @@ public class Player : PlayerControl
GameObject chosenOne;
chosenOne = GameObject.Find(weapon.name);
if (chosenOne.TryGetComponent- (out Item chosenWeapen))
- chosenWeapen.InPosition(transform,weaponPos);
+ chosenWeapen.InPosition(weaponTrans,weaponPos);
}
public void WeaponReturn()
@@ -192,7 +219,9 @@ public class Player : PlayerControl
//受到攻击
public void GetHurt(int count,float time,float hitter_x) {
isHurting = true;
- StopInput(time);
+ StopInput(time);
+ //播动画
+ HurtInteractAnim();
if ((hitter_x - transform.position.x)*isRight< 0) {
forceFlip = true;
Flip();
@@ -236,4 +265,18 @@ public class Player : PlayerControl
else Debug.Log("Not Ground");
}
}
+
+
+ //-----------------------------------动画控制-----------------------------------
+
+ public void TreeInteractAnim() {
+ boneAnim.SetTrigger("与树交互");
}
+ public void FireInteractAnim()
+ {
+ boneAnim.SetTrigger("与火交互");
+ }
+ public void HurtInteractAnim() {
+ boneAnim.SetTrigger("受伤");
+ }
+}
diff --git a/Assets/Scripts/乐/Shu.cs b/Assets/Scripts/乐/Shu.cs
index e17d793..fa84e90 100644
--- a/Assets/Scripts/乐/Shu.cs
+++ b/Assets/Scripts/乐/Shu.cs
@@ -6,7 +6,7 @@ using UnityEngine;
public class Shu : Interacter
{
Animator anim;
-
+
public float rotateDuration=0.5f;
SpriteRenderer m_spr;
@@ -47,6 +47,7 @@ public class Shu : Interacter
//交互的第二阶段,推倒树木
case 1:
ChangesDuringIntertacting(rotateDuration);
+ player.TreeInteractAnim();
anim.SetTrigger("Fall");
//transform.DORotate(new Vector3(0, 0, -90), rotateDuration);
break;
diff --git a/Assets/动画/cangjie 1.controller b/Assets/动画/cangjie 1.controller
index aaa3d80..31ab47e 100644
--- a/Assets/动画/cangjie 1.controller
+++ b/Assets/动画/cangjie 1.controller
@@ -36,7 +36,8 @@ AnimatorState:
m_Name: "\u4ED3\u9889\u53D7\u51FB"
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 6535429779029639802}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -52,6 +53,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &-7431032689573920472
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: Move
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 0}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 1
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.39
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &-6214624250314763947
AnimatorState:
serializedVersion: 6
@@ -78,6 +104,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &-5953479891427718110
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: "\u4E0E\u6811\u4EA4\u4E92"
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1622693631265719714}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1107 &-5822825996046333095
AnimatorStateMachine:
serializedVersion: 6
@@ -89,39 +140,43 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -6214624250314763947}
- m_Position: {x: 200, y: 0, z: 0}
+ m_Position: {x: 580, y: -10, z: 0}
- serializedVersion: 1
m_State: {fileID: 1168676047122278890}
- m_Position: {x: 235, y: 65, z: 0}
+ m_Position: {x: 370, y: 90, z: 0}
- serializedVersion: 1
m_State: {fileID: 4969039634123799421}
- m_Position: {x: 270, y: 130, z: 0}
+ m_Position: {x: 390, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -7966286138933205966}
- m_Position: {x: 305, y: 195, z: 0}
+ m_Position: {x: 420, y: 210, z: 0}
- serializedVersion: 1
m_State: {fileID: -5411793311571772822}
- m_Position: {x: 340, y: 260, z: 0}
+ m_Position: {x: 460, y: 260, z: 0}
- serializedVersion: 1
m_State: {fileID: 2237875931420563081}
- m_Position: {x: 375, y: 325, z: 0}
+ m_Position: {x: 520, y: 320, z: 0}
- serializedVersion: 1
m_State: {fileID: -1622693631265719714}
- m_Position: {x: 410, y: 390, z: 0}
+ m_Position: {x: 570, y: 380, z: 0}
- serializedVersion: 1
m_State: {fileID: 4288250036458585046}
- m_Position: {x: 445, y: 455, z: 0}
+ m_Position: {x: 620, y: 460, z: 0}
- serializedVersion: 1
m_State: {fileID: -8370624700981571467}
- m_Position: {x: 480, y: 520, z: 0}
+ m_Position: {x: 540, y: 520, z: 0}
m_ChildStateMachines: []
- m_AnyStateTransitions: []
+ m_AnyStateTransitions:
+ - {fileID: 4157471829353929879}
+ - {fileID: -5953479891427718110}
+ - {fileID: 5947422655733057457}
+ - {fileID: 3330679229323852168}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_AnyStatePosition: {x: 20, y: 240, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ExitPosition: {x: 830, y: 170, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -6214624250314763947}
--- !u!1102 &-5411793311571772822
@@ -160,7 +215,8 @@ AnimatorState:
m_Name: "\u4ED3\u9889\u5BF9\u5927\u6811\u64CD\u4F5C"
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 8686585277520832303}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -184,7 +240,31 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: cangjie 1
serializedVersion: 5
- m_AnimatorParameters: []
+ m_AnimatorParameters:
+ - m_Name: "\u4E0E\u6811\u4EA4\u4E92"
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: Move
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: "\u4E0E\u706B\u4EA4\u4E92"
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: "\u53D7\u4F24"
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -208,7 +288,8 @@ AnimatorState:
m_Name: "\u4ED3\u9889\u8D70\u8DEF"
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: -7431032689573920472}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -250,6 +331,78 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &3330679229323852168
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: "\u53D7\u4F24"
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7966286138933205966}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &4157471829353929879
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Move
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 1168676047122278890}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 0
+--- !u!1101 &4265725458291975043
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 0}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 1
+ serializedVersion: 3
+ m_TransitionDuration: 0.49
+ m_TransitionOffset: 0
+ m_ExitTime: 0.875
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &4288250036458585046
AnimatorState:
serializedVersion: 6
@@ -260,7 +413,8 @@ AnimatorState:
m_Name: "\u4ED3\u9889\u62FF\u6728\u68CD\u5BF9\u706B\u64CD\u4F5C"
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: 4265725458291975043}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -302,3 +456,72 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &5947422655733057457
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: "\u4E0E\u706B\u4EA4\u4E92"
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 4288250036458585046}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &6535429779029639802
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 0}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 1
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.625
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &8686585277520832303
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions: []
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 0}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 1
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.12
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
diff --git a/Assets/动画/仓颉对大树操作.anim b/Assets/动画/仓颉对大树操作.anim
index 681ca2d..b4ce1ea 100644
--- a/Assets/动画/仓颉对大树操作.anim
+++ b/Assets/动画/仓颉对大树操作.anim
@@ -1308,7 +1308,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/动画/仓颉拿木棍对火操作.anim b/Assets/动画/仓颉拿木棍对火操作.anim
index 60276f0..96496f6 100644
--- a/Assets/动画/仓颉拿木棍对火操作.anim
+++ b/Assets/动画/仓颉拿木棍对火操作.anim
@@ -1344,7 +1344,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/动画/仓颉走路.anim b/Assets/动画/仓颉走路.anim
index 0f8f6df..0d07054 100644
--- a/Assets/动画/仓颉走路.anim
+++ b/Assets/动画/仓颉走路.anim
@@ -708,67 +708,6 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: bone_1
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: {x: 2.269244, y: -0.00000021662821, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
- outSlope: {x: 0, y: 0, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.5
- value: {x: 2.3293517, y: -1.352563, z: 0}
- inSlope: {x: 0, y: -1.8627727, z: 0}
- outSlope: {x: 0, y: -1.8627727, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 1
- value: {x: 2.2869225, y: -1.862773, z: 0}
- inSlope: {x: 0, y: -1.4697651, z: 0}
- outSlope: {x: 0, y: -1.4697651, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 1.5
- value: {x: 2.3374465, y: -2.822328, z: 0}
- inSlope: {x: 0, y: -1.6273382, z: 0}
- outSlope: {x: 0, y: -1.6273382, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 2
- value: {x: 2.3166335, y: -3.490111, z: 0}
- inSlope: {x: -0.08325195, y: -1.3077021, z: 0}
- outSlope: {x: -0.08325195, y: -1.3077021, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 2.5
- value: {x: 2.2403524, y: -4.13003, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
- outSlope: {x: 0, y: 0, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- path: bone_1/bone_2
- curve:
serializedVersion: 2
m_Curve:
@@ -1597,13 +1536,6 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- - serializedVersion: 2
- path: 3980913656
- attribute: 1
- script: {fileID: 0}
- typeID: 4
- customType: 0
- isPPtrCurve: 0
- serializedVersion: 2
path: 207583962
attribute: 1
@@ -2228,198 +2160,6 @@ AnimationClip:
path: bone_1
classID: 4
script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 2.269244
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5
- value: 2.3293517
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 2.2869225
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1.5
- value: 2.3374465
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2
- value: 2.3166335
- inSlope: -0.08325195
- outSlope: -0.08325195
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2.5
- value: 2.2403524
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.x
- path: bone_1/bone_2
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: -0.00000021662821
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5
- value: -1.352563
- inSlope: -1.8627727
- outSlope: -1.8627727
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: -1.862773
- inSlope: -1.4697651
- outSlope: -1.4697651
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1.5
- value: -2.822328
- inSlope: -1.6273382
- outSlope: -1.6273382
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2
- value: -3.490111
- inSlope: -1.3077021
- outSlope: -1.3077021
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2.5
- value: -4.13003
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.y
- path: bone_1/bone_2
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1.5
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 2.5
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.z
- path: bone_1/bone_2
- classID: 4
- script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 20f05ff..5bd2752 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -27,6 +27,9 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-7:
+ value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
+ flags: 0
+ RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
flags: 0
vcSharedLogLevel: