Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 UI/Common/UI3DShowHero.cs

@@ -198,7 +198,7 @@


            if (clothesAnimator == null)

            {

                DesignDebug.LogErrorFormat("角色资源: {0} 没有动画控制器", resID);

                DebugEx.LogErrorFormat("角色资源: {0} 没有动画控制器", resID);

            }



            // 动画状态机修改

@@ -378,7 +378,7 @@
                wingsAnimator = wingsModel.GetComponent<Animator>();

                if (wingsAnimator == null)

                {

                    DesignDebug.LogErrorFormat("翅膀资源{0}没有动画控制器", itemID);

                    DebugEx.LogErrorFormat("翅膀资源{0}没有动画控制器", itemID);

                }

                wingsAnimator.enabled = true;

                wingsAnimator.Play("UI_Idle", 0);