From 292ac52714165c3cc1a76fbf24a2b95ad9578d1b Mon Sep 17 00:00:00 2001
From: atr_ljf <641572213@qq.com>
Date: 星期四, 16 八月 2018 14:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller b/Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller
similarity index 80%
copy from Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
copy to Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller
index ffac706..8cf2b43 100644
--- a/Maps/Model/Map007_Jyzk/Effect/Animation/Jyzd_magma_00_ani_fx.controller
+++ b/Effects/UI/E_fuyinta/Aniamtion/Effect_JingJie_Tai_boss.controller
@@ -5,13 +5,13 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Jyzd_magma_00_ani_fx
+ m_Name: Effect_JingJie_Tai_boss
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
- m_StateMachine: {fileID: 1107667842112774548}
+ m_StateMachine: {fileID: 1107082183762930004}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@@ -21,13 +21,13 @@
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1102 &1102968359950347114
+--- !u!1102 &1102137435293687068
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Jyzd_magma_00_ani_fx
+ m_Name: Effect_JingJie_Tai_boss
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: 89e54d03915cdf4439ba08ce7e4e0ba0, type: 2}
+ m_Motion: {fileID: 7400000, guid: 90f3b30a343165743bdd459f0b7dc17f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
---- !u!1107 &1107667842112774548
+--- !u!1107 &1107082183762930004
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
@@ -53,7 +53,7 @@
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
- m_State: {fileID: 1102968359950347114}
+ m_State: {fileID: 1102137435293687068}
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: 1102968359950347114}
+ m_DefaultState: {fileID: 1102137435293687068}
--
Gitblit v1.8.0