From 46d20e3f9bc420dea22a097aa4773a37ae11cf0c Mon Sep 17 00:00:00 2001
From: art_zongting <234234@qq.com>
Date: 星期六, 24 十一月 2018 14:20:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_art

---
 Effects/UI/A_AFaBao/Aniamtion/Effect_FaBao_Xian3.controller |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Effects/UI/A_AFaBao/Aniamtion/Effect_FaBao_Xian3.controller b/Effects/UI/A_AFaBao/Aniamtion/Effect_FaBao_Xian3.controller
index d63e692..8397a2e 100644
--- a/Effects/UI/A_AFaBao/Aniamtion/Effect_FaBao_Xian3.controller
+++ b/Effects/UI/A_AFaBao/Aniamtion/Effect_FaBao_Xian3.controller
@@ -77,10 +77,10 @@
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1102297317468208608}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 396, y: 36, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102871409756175526}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 336, y: 108, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -90,4 +90,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: 1102297317468208608}
+  m_DefaultState: {fileID: 1102871409756175526}

--
Gitblit v1.8.0