From c225194393f96e062551b90448ed877f1f230ed9 Mon Sep 17 00:00:00 2001
From: art_wzw <1151373633@qq.com>
Date: 星期二, 18 九月 2018 20:03:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art
---
Effects/Skill/Zs00/Skill14/Animation/hun.controller | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Effects/Skill/Fs/Skill14/Model/A_Fs07.controller b/Effects/Skill/Zs00/Skill14/Animation/hun.controller
similarity index 82%
copy from Effects/Skill/Fs/Skill14/Model/A_Fs07.controller
copy to Effects/Skill/Zs00/Skill14/Animation/hun.controller
index 3d41abd..50b682e 100644
--- a/Effects/Skill/Fs/Skill14/Model/A_Fs07.controller
+++ b/Effects/Skill/Zs00/Skill14/Animation/hun.controller
@@ -5,13 +5,13 @@
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: A_Fs07
+ m_Name: hun
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
- m_StateMachine: {fileID: 1107010377518206414}
+ m_StateMachine: {fileID: 1107787626250927830}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
@@ -21,13 +21,13 @@
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1102 &1102999888304637586
+--- !u!1102 &1102973571837182074
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
- m_Name: Skill10
+ m_Name: Take 001
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: 82199a9117008f44a9e2b7eade2d5414, type: 3}
+ m_Motion: {fileID: 7400000, guid: 69059c857916528419eb5958a618e34b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
---- !u!1107 &1107010377518206414
+--- !u!1107 &1107787626250927830
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
@@ -53,7 +53,7 @@
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
- m_State: {fileID: 1102999888304637586}
+ m_State: {fileID: 1102973571837182074}
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: 1102999888304637586}
+ m_DefaultState: {fileID: 1102973571837182074}
--
Gitblit v1.8.0