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

client_linchunjie

2018-11-24 a048742c6ec5d496d0a6581e3106650295a7722e

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

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

@@ -1,7 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;



public class PlayerExtersionData

{



@@ -58,4 +58,8 @@
    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

@@ -743,6 +743,34 @@
            case PlayerDataRefresh.CDBPlayerRefresh_TalentPoint:

                extersion.talentPoint = (int)value;

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_1:

                extersion.godWeaponLV_1 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(1, extersion.godWeaponLV_1);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_2:

                extersion.godWeaponLV_2 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(2, extersion.godWeaponLV_2);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_3:

                extersion.godWeaponLV_3 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(3, extersion.godWeaponLV_3);

                }

                break;

            case PlayerDataRefresh.CDBPlayerRefresh_GodWeaponLV_4:

                extersion.godWeaponLV_4 = (int)value;

                if (hero != null)

                {

                    hero.SwitchGodWeapon(4, extersion.godWeaponLV_4);

                }

                break;

        }

    }




 Fight/GameActor/GA_Hero.cs

@@ -884,7 +884,7 @@
    private IEnumerator Wait()

    {

        yield return WaitingForSecondConst.WaitMS1500;

        if (WindowCenter.Instance.Open<VipExperienceWin>())

        if (WindowCenter.Instance.IsOpen("VipExperienceWin"))

        {

            yield break;

        }


 Fight/GameActor/GActorPlayerBase.cs

@@ -327,6 +327,12 @@
            }

        }



        foreach (var _effect in m_GodWeaponEffectDict.Values)

        {

            SFXPlayUtility.Instance.Release(_effect);

        }

        m_GodWeaponEffectDict.Clear();



        UnloadSuitSFX();

        ReleaseLifeBar();

        ReleaseName();

@@ -2477,4 +2483,75 @@
            }

        }

    }



    private Dictionary<int, SFXController> m_GodWeaponEffectDict = new Dictionary<int, SFXController>();



    public void SwitchGodWeapon(int type, int level)

    {

        bool _showOrHide = true;

        GodWeaponEffectConfig _config = null;

        if (level <= 0)

        {

            _showOrHide = false;

        }

        else

        {

            _config = GodWeaponEffectConfig.Get(type, level);

            if (_config == null)

            {

                _showOrHide = false;

            }

        }



        SFXController _effect = null;



        if (m_GodWeaponEffectDict.TryGetValue(type, out _effect))

        {

            if (_effect)

            {

                SFXPlayUtility.Instance.Release(_effect);

                m_GodWeaponEffectDict.Remove(type);

            }

        }



        if (_showOrHide)

        {

            Transform _bindBone = null;

            switch (type)

            {

                case 1:

                    if (m_ClothesModel)

                    {

                        _bindBone = m_ClothesModel.transform.GetChildTransformDeeply("Bip001 Spine");

                    }

                    break;

                case 2:

                    if (m_WeaponModel != null)

                    {

                        _bindBone = m_WeaponModel.transform;

                    }

                    break;

                case 3:

                    if (m_SecondaryModel != null)

                    {

                        _bindBone = m_SecondaryModel.transform;

                    }

                    break;

                case 4:

                    if (m_ClothesModel != null)

                    {

                        _bindBone = m_ClothesModel.transform.GetChildTransformDeeply("Bip001 Neck");

                    }

                    break;

            }



            if (_bindBone)

            {

                var _effectJson = LitJson.JsonMapper.ToObject(_config.effect);

                var _effectID = int.Parse(_effectJson[JobSetup.Job.ToString()].ToString());

                _effect = SFXPlayUtility.Instance.PlayBattleEffect(_effectID, _bindBone);

                m_GodWeaponEffectDict[type] = _effect;

            }

        }

    }

}


 System/Dungeon/DungeonDefeatedWin.cs

@@ -41,14 +41,26 @@


        protected override void OnAfterOpen()

        {

            if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)

            {

                var iceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>();

                iceCrystalVeinModel.IsIceCrystalVein_Copy = true;

            }

        }



        protected override void OnPreClose()

        {

           
        }



        protected override void OnAfterClose()

        {

            var iceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>();       
            if (iceCrystalVeinModel.IsIceCrystalVein_Copy)

            {

                iceCrystalVeinModel.IsIceCrystalVein_Copy = false;

                iceCrystalVeinModel.IsIceCrystalVeinCopy = true;

            }

        }



        protected override void OnActived()


 System/Dungeon/DungeonFightWin.cs

@@ -128,6 +128,11 @@
                    }

                    break;

            }

            if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)

            {

                var iceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>();

                iceCrystalVeinModel.IsIceCrystalVein_Copy = true;

            }

        }



        protected override void OnPreClose()

@@ -147,8 +152,15 @@
        }



        protected override void OnAfterClose()

        {

        {           
            m_DungenWHYJ.Unit();

            var iceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>();

            if (iceCrystalVeinModel.IsIceCrystalVein_Copy)

            {

                iceCrystalVeinModel.IsIceCrystalVein_Copy = false;

                iceCrystalVeinModel.IsIceCrystalVeinCopy = true;

            }

            
        }



        protected override void LateUpdate()

@@ -221,7 +233,7 @@
                (bool _ok) =>

                {

                    if (_ok)

                    {

                    {                     
                        model.ExitCurrentDungeon();

                    }

                }


 System/Dungeon/DungeonVictoryWin.cs

@@ -97,14 +97,27 @@


        protected override void OnAfterOpen()

        {

            if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)

            {

                var iceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>();

                iceCrystalVeinModel.IsIceCrystalVein_Copy = true;

            }

        }



        protected override void OnPreClose()

        {

           
        }



        protected override void OnAfterClose()

        {

            var iceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>();

           
            if (iceCrystalVeinModel.IsIceCrystalVein_Copy)

            {

                iceCrystalVeinModel.IsIceCrystalVein_Copy = false;

                iceCrystalVeinModel.IsIceCrystalVeinCopy = true;

            }

        }



        protected override void OnActived()


 System/Dungeon/IceCrystalVeinModel.cs

@@ -34,6 +34,8 @@
    public int Cost = 0;//绑玉进入花费

    public int NeedVipLv = 0;//所需VIP等级

    public int SweepingNeedMoney = 0;//扫荡所需价格

    public bool IsIceCrystalVein_Copy = false;

    public bool IsIceCrystalVeinCopy = false;//是否再冰晶矿脉副本

    public event Action UpdateIceLodeInf;

    DungeonModel m_Model;

    DungeonModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); } }

@@ -52,6 +54,8 @@
    }

    public void OnBeforePlayerDataInitialize()

    {

        IsIceCrystalVein_Copy = false;

        IsIceCrystalVeinCopy = false;

        model.dungeonRecordChangeEvent -= dungeonRecordChangeEvent;

    }




 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -144,6 +144,8 @@
        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }

        WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } }

        MysticalPurchaseModel purchaseModel { get { return ModelCenter.Instance.GetModel<MysticalPurchaseModel>(); } }

        IceCrystalVeinModel m_IceCrystalVeinModel;
        IceCrystalVeinModel iceCrystalVeinModel { get { return m_IceCrystalVeinModel ?? (m_IceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>()); } }

        #region Built-in

        protected override void BindController()

        {

@@ -612,6 +614,17 @@
                    }

                }

            }

            if (iceCrystalVeinModel.IsIceCrystalVeinCopy && !IsDungeon())//是否再次打开冰晶矿脉面板

            {

                if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))

                {

                    if (!WindowCenter.Instance.IsOpen("IceCrystalVeinWin"))

                    {

                        WindowCenter.Instance.Open<IceCrystalVeinWin>();

                    }

                    iceCrystalVeinModel.IsIceCrystalVeinCopy = false;

                }          
            }



        }




 Utility/EnumHelper.cs

@@ -567,6 +567,10 @@
    CDBPlayerRefresh_NPCHurtAddPer,//对怪物伤害加成 188

    FunalHurtPer = 189,// 最终伤害加成

    CDBPlayerRefresh_TalentPoint = 190,

    CDBPlayerRefresh_GodWeaponLV_1 = 192,

    CDBPlayerRefresh_GodWeaponLV_2 = 193,

    CDBPlayerRefresh_GodWeaponLV_3 = 194,

    CDBPlayerRefresh_GodWeaponLV_4 = 195,

};



/** 物品加成类型 */


 Utility/RuntimeLogUtility.cs

@@ -178,7 +178,8 @@
public class RuntimeLogUtilityEditor : Editor

{

    private Vector3 _navChkPos;

    private int _npcID;

    private int _param1;

    private int _param2;



    public override void OnInspectorGUI()

    {

@@ -220,12 +221,12 @@
            }

        }



        _npcID = EditorGUILayout.IntField("npcID", _npcID);

        _param1 = EditorGUILayout.IntField("param1", _param1);

        _param2 = EditorGUILayout.IntField("param2", _param2);



        if (GUILayout.Button("酷酷酷"))

        {

            var boss = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightBoss>(60203001, E_ActorGroup.Enemy);

            boss.Pos = PlayerDatas.Instance.hero.Pos;

            PlayerDatas.Instance.hero.SwitchGodWeapon(_param1, _param2);

        }



        if (GUILayout.Button("直接重连"))