From cb35028acd6f16d0c48a10f21d1e51e517f5e55d Mon Sep 17 00:00:00 2001
From: art_yxc <616551813@qq.com>
Date: 星期日, 30 九月 2018 15:32:09 +0800
Subject: [PATCH] 新升级特效上传
---
Effects/UI/A_DengJiTiSheng/Aniamtion/Effect_DengJiTiSheng_ZiTi.controller | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Effects/Common/Dazuo/Animation/Animation.controller b/Effects/UI/A_DengJiTiSheng/Aniamtion/Effect_DengJiTiSheng_ZiTi.controller
similarity index 80%
rename from Effects/Common/Dazuo/Animation/Animation.controller
rename to Effects/UI/A_DengJiTiSheng/Aniamtion/Effect_DengJiTiSheng_ZiTi.controller
index c4bc799..a40b3bd 100644
--- a/Effects/Common/Dazuo/Animation/Animation.controller
+++ b/Effects/UI/A_DengJiTiSheng/Aniamtion/Effect_DengJiTiSheng_ZiTi.controller
@@ -5,13 +5,13 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Animation
+ m_Name: Effect_DengJiTiSheng_ZiTi
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
- m_StateMachine: {fileID: 1107245031432607972}
+ m_StateMachine: {fileID: 1107837373740306662}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@@ -21,13 +21,13 @@
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1102 &1102495671592872850
+--- !u!1102 &1102488433944969496
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Effect_Dazuo_01
+ m_Name: Effect_DengJiTiSheng_ZiTi
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -39,12 +39,12 @@
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 79a75a3ec03d7d943962bd4c791a2ecc, type: 2}
+ m_Motion: {fileID: 7400000, guid: bc9a6ae491584874b8dc79045f57d549, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
---- !u!1107 &1107245031432607972
+--- !u!1107 &1107837373740306662
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
@@ -53,7 +53,7 @@
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
- m_State: {fileID: 1102495671592872850}
+ m_State: {fileID: 1102488433944969496}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
@@ -64,4 +64,4 @@
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: 1102495671592872850}
+ m_DefaultState: {fileID: 1102488433944969496}
--
Gitblit v1.8.0