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

client_Zxw

2019-01-11 4748d44f3be160db080b6496c7e72289b41f5adb

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -34,7 +34,8 @@
    public PlayerRankData rank { get { return m_Rank; } }



    StoreModel m_StoreModel;

    StoreModel StoreModel {

    StoreModel StoreModel

    {

        get { return m_StoreModel ?? (m_StoreModel = ModelCenter.Instance.GetModel<StoreModel>()); }

    }



@@ -513,6 +514,36 @@
                break;

            case PlayerDataRefresh.EquipShowSwitch:

                baseData.equipShowSwitch = value;

                if (hero != null)

                {

                    int _level = baseData.godWeaponLV_4;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(value, 4, out _level))

                    {

                        hero.SwitchGodWeapon(4, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(4, 0);

                    }

                    _level = baseData.godWeaponLV_1;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(value, 1, out _level))

                    {

                        hero.SwitchGodWeapon(1, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(1, 0);

                    }

                    _level = baseData.godWeaponLV_2;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(value, 2, out _level))

                    {

                        hero.SwitchGodWeapon(2, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(2, 0);

                    }

                }

                break;

            case PlayerDataRefresh.LuckValue:

                break;

@@ -799,28 +830,60 @@
                baseData.godWeaponLV_1 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(1, baseData.godWeaponLV_1);

                    int _level = (int)value;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(baseData.equipShowSwitch, 1, out _level))

                    {

                        hero.SwitchGodWeapon(1, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(1, 0);

                    }

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_2:

                baseData.godWeaponLV_2 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(2, baseData.godWeaponLV_2);

                    int _level = (int)value;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(baseData.equipShowSwitch, 2, out _level))

                    {

                        hero.SwitchGodWeapon(2, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(2, 0);

                    }

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_3:

                baseData.godWeaponLV_3 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(3, baseData.godWeaponLV_3);

                    int _level = (int)value;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(baseData.equipShowSwitch, 3, out _level))

                    {

                        hero.SwitchGodWeapon(3, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(3, 0);

                    }

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_4:

                baseData.godWeaponLV_4 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(4, baseData.godWeaponLV_4);

                    int _level = (int)value;

                    if (EquipShowSwitch.IsGodWeaponEffectOn(baseData.equipShowSwitch, 4, out _level))

                    {

                        hero.SwitchGodWeapon(4, _level);

                    }

                    else

                    {

                        hero.SwitchGodWeapon(4, 0);

                    }

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_SoulDust:


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs

@@ -100,6 +100,8 @@
                return;
            }

            _player.UpdateData(vNetData);

            switch ((PlayerDataRefresh)vNetData.RefreshType)
            {
                case PlayerDataRefresh.SpeedValue:
@@ -119,18 +121,6 @@
                    break;
                case PlayerDataRefresh.OfficialRank:
                    _player.ActorInfo.realm = vNetData.Value;
                    break;
                case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_1:
                    _player.SwitchGodWeapon(1, (int)vNetData.Value);
                    break;
                case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_2:
                    _player.SwitchGodWeapon(2, (int)vNetData.Value);
                    break;
                case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_3:
                    _player.SwitchGodWeapon(3, (int)vNetData.Value);
                    break;
                case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_4:
                    _player.SwitchGodWeapon(4, (int)vNetData.Value);
                    break;
            }


 Fight/GameActor/GA_Hero.cs

@@ -482,7 +482,15 @@


        Behaviour.StopKillUntilDieAI();



        SwitchGodWeapon(4, PlayerDatas.Instance.baseData.godWeaponLV_4);

        int _level = PlayerDatas.Instance.baseData.godWeaponLV_4;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 4, out _level))

        {

            SwitchGodWeapon(4, _level);

        }

        else

        {

            SwitchGodWeapon(4, 0);

        }

    }



    protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)

@@ -495,7 +503,16 @@
            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, true);

        }

        GameObjectPoolManager.Instance.AddDontDestroyGoInstID(secondary.GetInstanceID());

        SwitchGodWeapon(1, PlayerDatas.Instance.baseData.godWeaponLV_1);



        int _level = PlayerDatas.Instance.baseData.godWeaponLV_1;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 1, out _level))

        {

            SwitchGodWeapon(1, _level);

        }

        else

        {

            SwitchGodWeapon(1, 0);

        }

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)

@@ -508,7 +525,16 @@
            MaterialUtility.SwitchXrayShader(m_WeaponMaterial, true);

        }

        GameObjectPoolManager.Instance.AddDontDestroyGoInstID(weapon.GetInstanceID());

        SwitchGodWeapon(2, PlayerDatas.Instance.baseData.godWeaponLV_2);



        int _level = PlayerDatas.Instance.baseData.godWeaponLV_2;

        if (EquipShowSwitch.IsGodWeaponEffectOn(PlayerDatas.Instance.baseData.equipShowSwitch, 2, out _level))

        {

            SwitchGodWeapon(2, _level);

        }

        else

        {

            SwitchGodWeapon(2, 0);

        }

    }



    protected sealed override void OnPutonWing(uint wingItemID, GameObject wing)


 Fight/GameActor/GA_Player.cs

@@ -419,6 +419,93 @@
        base.OnFixedUpdate();

    }



    public void UpdateData(H0418_tagObjInfoRefresh data)

    {

        int _level = 0;

        switch ((PlayerDataRefresh)data.RefreshType)

        {

            case PlayerDataRefresh.EquipShowSwitch:

                m_H0434.EquipShowSwitch = data.Value;

                _level = (int)m_H0434.ExAttr18;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 4, out _level))

                {

                    SwitchGodWeapon(4, _level);

                }

                else

                {

                    SwitchGodWeapon(4, 0);

                }

                _level = (int)m_H0434.ExAttr15;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))

                {

                    SwitchGodWeapon(1, _level);

                }

                else

                {

                    SwitchGodWeapon(1, 0);

                }

                _level = (int)m_H0434.ExAttr16;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))

                {

                    SwitchGodWeapon(2, _level);

                }

                else

                {

                    SwitchGodWeapon(2, 0);

                }

                break;



            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_1:

                _level = (int)data.Value;

                m_H0434.ExAttr15 = data.Value;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))

                {

                    SwitchGodWeapon(1, _level);

                }

                else

                {

                    SwitchGodWeapon(1, 0);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_2:

                _level = (int)data.Value;

                m_H0434.ExAttr16 = data.Value;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))

                {

                    SwitchGodWeapon(2, _level);

                }

                else

                {

                    SwitchGodWeapon(2, 0);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_3:

                _level = (int)data.Value;

                m_H0434.ExAttr17 = data.Value;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 3, out _level))

                {

                    SwitchGodWeapon(3, _level);

                }

                else

                {

                    SwitchGodWeapon(3, 0);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_4:

                _level = (int)data.Value;

                m_H0434.ExAttr18 = data.Value;

                if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 4, out _level))

                {

                    SwitchGodWeapon(4, _level);

                }

                else

                {

                    SwitchGodWeapon(4, 0);

                }

                break;

        }

    }



    protected sealed override void OnPutonClothes(uint clothesItemID, GameObject clothed)

    {

        clothed.layer = LayerUtility.Player;

@@ -427,7 +514,15 @@
        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        MaterialUtility.SwitchXrayShader(m_Material, false);



        SwitchGodWeapon(4, (int)m_H0434.ExAttr18);

        int _level = (int)m_H0434.ExAttr18;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 4, out _level))

        {

            SwitchGodWeapon(4, _level);

        }

        else

        {

            SwitchGodWeapon(4, 0);

        }

    }



    protected sealed override void OnPutonSecondary(uint secondaryItemID, GameObject secondary)

@@ -438,7 +533,16 @@
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, false);

        }

        SwitchGodWeapon(1, (int)m_H0434.ExAttr15);



        int _level = (int)m_H0434.ExAttr15;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 1, out _level))

        {

            SwitchGodWeapon(1, (int)m_H0434.ExAttr15);

        }

        else

        {

            SwitchGodWeapon(1, 0);

        }

    }



    protected sealed override void OnPutonWeapon(uint weaponItemID, GameObject weapon)

@@ -449,7 +553,16 @@
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_WeaponMaterial, false);

        }

        SwitchGodWeapon(2, (int)m_H0434.ExAttr16);



        int _level = (int)m_H0434.ExAttr16;

        if (EquipShowSwitch.IsGodWeaponEffectOn(m_H0434.EquipShowSwitch, 2, out _level))

        {

            SwitchGodWeapon(2, (int)m_H0434.ExAttr16);

        }

        else

        {

            SwitchGodWeapon(2, 0);

        }

    }



    protected sealed override void OnPutonWing(uint wingItemID, GameObject wing)


 Fight/GameActor/GActorPlayerBase.cs

@@ -2783,13 +2783,13 @@
                case 1:

                    if (m_SecondaryModel != null)

                    {

                        _bindBone = m_SecondaryModel.transform;

                        _bindBone = m_ClothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[JobSetup.Job - 1]);

                    }

                    break;

                case 2:

                    if (m_WeaponModel != null)

                    {

                        _bindBone = m_WeaponModel.transform;

                        _bindBone = m_ClothesModel.transform.GetChildTransformDeeply(GAStaticDefine.WeaponBindBoneName);

                    }

                    break;

                case 4:


 System/CrossServerBoss/CrossServerBossModel.cs

@@ -253,7 +253,14 @@

            sendInfo.NPCIDList = string.Format("[{0}]", string.Join(",", stringArray));
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendToCrossServer(sendInfo);
            if (CrossServerUtility.IsCrossServerBoss())
            {
                GameNetSystem.Instance.SendToCrossServer(sendInfo);
            }
            else
            {
                GameNetSystem.Instance.SendInfo(sendInfo);
            }
        }

        public void RequestBoxSurplusInfo()
@@ -263,7 +270,14 @@
            sendInfo.LineID = (ushort)PlayerDatas.Instance.baseData.dungeonLineId;
            sendInfo.NPCIDList = string.Format("[{0},{1}]", bigBoxNpcId, smallBoxNpcId);
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendToCrossServer(sendInfo);
            if (CrossServerUtility.IsCrossServerBoss())
            {
                GameNetSystem.Instance.SendToCrossServer(sendInfo);
            }
            else
            {
                GameNetSystem.Instance.SendInfo(sendInfo);
            }
        }

        public void RequestEliteSurplusInfo()
@@ -279,7 +293,15 @@

            sendInfo.NPCIDList = string.Format("[{0}]", string.Join(",", stringArray));
            sendInfo.NPCIDListLen = (byte)sendInfo.NPCIDList.Length;
            GameNetSystem.Instance.SendToCrossServer(sendInfo);

            if (CrossServerUtility.IsCrossServerBoss())
            {
                GameNetSystem.Instance.SendToCrossServer(sendInfo);
            }
            else
            {
                GameNetSystem.Instance.SendInfo(sendInfo);
            }
        }

        public void UpdateMonsterSurplusInfo(HA714_tagMCNPCCntList _npcInfoes)

 System/WindowJump/WindowJumpMgr.cs

@@ -508,6 +508,14 @@
                }

                SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.SevenDaysTour281:

            case JumpUIType.SevenDaysTour282:

                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();

                int jumpIndex = 0;

                int.TryParse(_tagWinSearchModel.SelectActive,out jumpIndex);

                sevenDaysModel.JumpIndex = jumpIndex;

                SetJumpLogic<AchievementActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.TreasureFindHostFunc1:

            case JumpUIType.TreasureFindHostFunc2:

            case JumpUIType.TreasureFindHostFunc3:

@@ -1017,6 +1025,14 @@
            case JumpUIType.CrossServerOneVsOne278:

            case JumpUIType.CrossServerOneVsOne279:

                if(!CrossServerOneVsOnePKSeason.Instance.IsEnterCrossServer(true))

                {

                    return false;

                }

                break;

            case JumpUIType.SevenDaysTour281:

            case JumpUIType.SevenDaysTour282:

                var sevenDaysModel = ModelCenter.Instance.GetModel<OpenServiceAchievementModel>();

                if(!sevenDaysModel.IsJumpOpen())

                {

                    return false;

                }

@@ -1560,6 +1576,8 @@
    CrossServerOneVsOne278 = 278, //跨服赛季赛季奖励界面

    CrossServerOneVsOne279 = 279, //跨服赛季荣誉商店界面

    FashionDress280 = 280, //时装功能界面

    SevenDaysTour281 = 281, //七日巡礼

    SevenDaysTour282 = 282, //七日巡礼

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面


 UI/Common/UI3DShowHero.cs

@@ -587,15 +587,15 @@
                switch (key)

                {

                    case 1:

                        if (secondaryModel != null)

                        if (clothesModel != null)

                        {

                            bone = secondaryModel.transform;

                            bone = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.SecondaryBindBoneName[job - 1]);

                        }

                        break;

                    case 2:

                        if (weaponModel != null)

                        if (clothesModel != null)

                        {

                            bone = weaponModel.transform;

                            bone = clothesModel.transform.GetChildTransformDeeply(GAStaticDefine.WeaponBindBoneName);

                        }

                        break;

                    case 4: