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

client_Zxw

2018-10-13 9c27aa4caaa28ffaf30ce22596ded528e1ea9cf9

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

 Core/ResModule/InstanceResourcesLoader.cs

@@ -26,6 +26,30 @@
        return LoadModelPrefab(raceSuffix, _m.MODE);

    }



    public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Fight()

    {

        return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,

                                                          GeneralConfig.Instance.ModeDefaultConfig[1][1]);

    }



    public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Func()

    {

        return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,

                                                          GeneralConfig.Instance.ModeDefaultConfig[0][1]);

    }



    public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Horse()

    {

        return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,

                                                          GeneralConfig.Instance.ModeDefaultConfig[3][1]);

    }



    public static RuntimeAnimatorController LoadDefaultMobAnimatorController_Pet()

    {

        return AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix,

                                                          GeneralConfig.Instance.ModeDefaultConfig[2][1]);

    }



    public static GameObject LoadDefaultFightNPC()

    {

        return LoadMob(GeneralConfig.Instance.ModeDefaultConfig[1][0],


 Fight/GameActor/GA_NpcCollect.cs

@@ -109,6 +109,17 @@
                m_Animator = m_Model.GetComponent<Animator>();

                if (m_Animator)

                {

                    RuntimeAnimatorController _controller = null;

                    if (m_LoadDefaultRes)

                    {

                        _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Func();

                    }

                    else

                    {

                        _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE);

                    }

                    m_Animator.runtimeAnimatorController = _controller;



                    m_Animator.enabled = true;

                    m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID);

                }


 Fight/GameActor/GActorNpcFight.cs

@@ -31,7 +31,7 @@
    {

        get

        {

            if (!m_Animator)

            if (!m_Animator || !m_Animator.runtimeAnimatorController)

            {

                return -1;

            }

@@ -40,7 +40,7 @@


        set

        {

            if (m_Animator)

            if (m_Animator && m_Animator.runtimeAnimatorController)

            {

                if (m_Animator.parameterCount > 0)

                {

@@ -127,7 +127,27 @@


                if (m_Animator)

                {

                    RuntimeAnimatorController _controller = null;

                    if (m_LoadDefaultRes)

                    {

                        if (this is GA_Pet)

                        {

                            _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Pet();

                        }

                        else

                        {

                            _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Fight();

                        }

                    }

                    else

                    {

                        _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE);



                    }

                    m_Animator.runtimeAnimatorController = _controller;



                    m_Animator.enabled = true;



                    if (m_Animator.parameterCount > 0)

                    {

                        m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID);

@@ -254,6 +274,7 @@


        if (m_Animator)

        {

            m_Animator.runtimeAnimatorController = null;

            NextAction = 0;

            m_Animator.enabled = false;

            m_Animator = null;

@@ -731,6 +752,7 @@
    public sealed override void Polymorph(bool doOrNo, int npcID)

    {

        IsPolyMorph = doOrNo;

        var _npcConfig = Config.Instance.Get<NPCConfig>(npcID);



        if (IsPolyMorph)

        {

@@ -752,6 +774,16 @@
            var _a = m_SheepModel.GetComponent<Animator>();

            if (_a)

            {

                RuntimeAnimatorController _controller = null;

                if (m_SheepIsDefaultNpc)

                {

                    _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Fight();

                }

                else

                {

                    _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _npcConfig.MODE);

                }



                _a.enabled = true;

                _a.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID);

                m_Animator.enabled = false;

@@ -777,6 +809,7 @@
                if (_a)

                {

                    _a.enabled = false;

                    _a.runtimeAnimatorController = null;

                }



                if (m_SheepIsDefaultNpc)


 Fight/GameActor/GActorNpcNoFight.cs

@@ -128,6 +128,7 @@


        if (m_Animator)

        {

            m_Animator.runtimeAnimatorController = null;

            m_Animator.enabled = false;

            m_Animator = null;

        }

@@ -141,7 +142,7 @@
            m_Dig = null;

        }



        if(Root)

        if (Root)

        {

            Root.localScale = Vector3.one;

        }

@@ -190,6 +191,16 @@
                m_Animator = m_Model.GetComponent<Animator>();

                if (m_Animator)

                {

                    RuntimeAnimatorController _controller = null;

                    if (m_LoadDefaultRes)

                    {

                        _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Func();

                    }

                    else

                    {

                        _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE);

                    }

                    m_Animator.runtimeAnimatorController = _controller;

                    m_Animator.enabled = true;

                    m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID);

                }


 Fight/GameActor/GActorPlayerBase.cs

@@ -1135,6 +1135,7 @@
            m_HorseModel = null;

            if (m_HorseAnimator)

            {

                m_HorseAnimator.runtimeAnimatorController = null;

                m_HorseAnimator.enabled = false;

                m_HorseAnimator = null;

            }

@@ -1225,6 +1226,7 @@
                m_HorseModel = null;

                if (m_HorseAnimator)

                {

                    m_HorseAnimator.runtimeAnimatorController = null;

                    m_HorseAnimator.enabled = false;

                    m_HorseAnimator = null;

                }

@@ -1251,6 +1253,18 @@


            m_HorseModel = GameObjectPoolManager.Instance.RequestGameObject(_prefab);

            m_HorseAnimator = m_HorseModel.GetComponent<Animator>();



            RuntimeAnimatorController _controller = null;

            if (m_LoadDefaultHorse)

            {

                _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Horse();

            }

            else

            {

                _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _modelResConfig.ResourcesName);

            }



            m_HorseAnimator.runtimeAnimatorController = _controller;

            m_HorseAnimator.enabled = true;



            // 先设置根节点


 Fight/PreFightMission.cs

@@ -951,11 +951,17 @@


        yield return WaitingForSecondConst.WaitMS500;



        string _path = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1000";

        if(!WindowCenter.Instance.uiRoot.transform.Find(_path))

        {

            _path = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001";

        }



        // 打开引导界面

        NewGuideModel _model2 = ModelCenter.Instance.GetModel<NewGuideModel>();

        _model2.showMask = true;

        _model2.content = "点击开始<color=#00ff00>试炼</color>";

        _model2.componentPath = "BaseCanvas/MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001";

        _model2.componentPath = _path;

        _model2.size = new Vector2(276, 72);

        _model2.direction = 3;

        _model2.clickClosed = true;

@@ -964,7 +970,7 @@
        {

            GA_Hero.s_MapSwitching = false;



            _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/TaskAndTeamTip/TaskListTip/Parent/TaskScroll View/Content/Main_1001");

            _temp = WindowCenter.Instance.uiRoot.transform.Find(_path);

            var _btn = _temp.GetComponent<UnityEngine.UI.Button>();

            if (_btn)

            {


 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);