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

client_linchunjie

2018-11-24 b2936fd450a2da5bd67d7986a440e0cbd205a396

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

 Core/GameEngine/Model/Player/Character/PlayerBaseData.cs

@@ -69,6 +69,10 @@
            return ExAttr8 * (long)100000000 + ExAttr7;

        }

    }

    public int godWeaponLV_1;

    public int godWeaponLV_2;

    public int godWeaponLV_3;

    public int godWeaponLV_4;



    public ulong allSliver { get { return (ulong)Silver + (ulong)ExAttr6 * 100000000; } }



@@ -127,6 +131,10 @@
        HappyPoint = _serverInfo.HappyPoint;

        faction = _serverInfo.Faction;

        coinPointTotal = _serverInfo.ChangeCoinPointTotal;

        godWeaponLV_1 = (int)_serverInfo.ExAttr15;

        godWeaponLV_2 = (int)_serverInfo.ExAttr16;

        godWeaponLV_3 = (int)_serverInfo.ExAttr17;

        godWeaponLV_4 = (int)_serverInfo.ExAttr18;

    }






 Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs

@@ -58,8 +58,4 @@
    public int NpcHurtAddPer;//对怪物伤害加成 188

    public int FunalHurtPer;//对怪物伤害加成 189

    public int talentPoint;//天赋点数 190

    public int godWeaponLV_1;

    public int godWeaponLV_2;

    public int godWeaponLV_3;

    public int godWeaponLV_4;

}


 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -744,31 +744,31 @@
                extersion.talentPoint = (int)value;

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_1:

                extersion.godWeaponLV_1 = (int)value;

                baseData.godWeaponLV_1 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(1, extersion.godWeaponLV_1);

                    hero.SwitchGodWeapon(1, baseData.godWeaponLV_1);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_2:

                extersion.godWeaponLV_2 = (int)value;

                baseData.godWeaponLV_2 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(2, extersion.godWeaponLV_2);

                    hero.SwitchGodWeapon(2, baseData.godWeaponLV_2);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_3:

                extersion.godWeaponLV_3 = (int)value;

                baseData.godWeaponLV_3 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(3, extersion.godWeaponLV_3);

                    hero.SwitchGodWeapon(3, baseData.godWeaponLV_3);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_4:

                extersion.godWeaponLV_4 = (int)value;

                baseData.godWeaponLV_4 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(4, extersion.godWeaponLV_4);

                    hero.SwitchGodWeapon(4, baseData.godWeaponLV_4);

                }

                break;

        }


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

@@ -88,6 +88,18 @@
                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;
            }

            if ((PlayerDataRefresh)vNetData.RefreshType == PlayerDataRefresh.Family

 Fight/GameActor/GA_Hero.cs

@@ -332,6 +332,8 @@


        Behaviour.StopKillUntilDieAI();



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

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

    }



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

@@ -344,6 +346,7 @@
            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, true);

        }

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

        SwitchGodWeapon(3, PlayerDatas.Instance.baseData.godWeaponLV_3);

    }



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

@@ -356,6 +359,7 @@
            MaterialUtility.SwitchXrayShader(m_WeaponMaterial, true);

        }

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

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

    }



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


 Fight/GameActor/GA_Player.cs

@@ -320,6 +320,9 @@
        SkinnedMeshRenderer _renderer = clothed.GetComponentInChildren<SkinnedMeshRenderer>();

        _renderer.gameObject.SetLayer(LayerUtility.Player, false);

        MaterialUtility.SwitchXrayShader(m_Material, false);



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

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

    }



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

@@ -330,6 +333,7 @@
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_SecondaryMaterial, false);

        }

        SwitchGodWeapon(3, (int)m_H0434.ExAttr17);

    }



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

@@ -340,6 +344,7 @@
            _renderer.gameObject.SetLayer(LayerUtility.Player, false);

            MaterialUtility.SwitchXrayShader(m_WeaponMaterial, false);

        }

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

    }



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