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

client_Hale

2018-10-13 df5f75a8cba9250e7c962370ed47b59a28360e98

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

 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -1113,7 +1113,7 @@
                }

            }



            int offsetGrid = needGridCnt - playerPack.GetReaminGridCount(PackType.rptItem) - 1;

            int offsetGrid = needGridCnt - playerPack.GetReaminGridCount(PackType.rptItem);

            if (offsetGrid > 0)

            {

                SysNotifyMgr.Instance.ShowTip("BagFull102", attrData.itemConfig.ItemName, offsetGrid);


 UI/Common/UI3DModelFactory.cs

@@ -82,9 +82,37 @@
        var animator = model.GetComponent<Animator>();

        if (animator != null)

        {

            var suffix = AnimatorControllerLoader.controllerUISuffix;

            var animatorController = AnimatorControllerLoader.LoadMobController(suffix, config.MODE);

            if (animatorController != null)

            {

                animator.runtimeAnimatorController = animatorController;

            }



            var isDance = false;

            if (config.NPCType == (int)E_NpcType.Func)

            {

                var clipInfos = animator.runtimeAnimatorController.animationClips;

                foreach (var item in clipInfos)

                {

                    if (item.name == "Idle2")

                    {

                        isDance = true;

                        break;

                    }

                }

            }



            animator.enabled = true;

            animator.SetInteger(GAStaticDefine.Param_Action, GAStaticDefine.Act_Idle);

            animator.Play(GAStaticDefine.State_IdleHash);

            if (isDance)

            {

                animator.Play(GAStaticDefine.State_Dance);

            }

            else

            {

                animator.SetInteger(GAStaticDefine.Param_Action, GAStaticDefine.Act_Idle);

                animator.Play(GAStaticDefine.State_IdleHash);

            }

        }



        LayerUtility.SetLayer(model, LayerUtility.Monster, true);