From b01151f932f8faa041a8facfb03059147170f40c Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 09 Dec 2020 10:16:24 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Animations/Endless/Boss/1/Boss_1.controller |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/Animations/Endless/Boss/1/Boss_1.controller b/Assets/Animations/Endless/Boss/1/Boss_1.controller
index f815bd2..a8924f5 100644
--- a/Assets/Animations/Endless/Boss/1/Boss_1.controller
+++ b/Assets/Animations/Endless/Boss/1/Boss_1.controller
@@ -8,7 +8,7 @@
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Boss_Standing
-  m_Speed: 1
+  m_Speed: 1.3
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -669865258378693477}
@@ -142,7 +142,7 @@
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

--
Gitblit v1.9.1