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

client_Zxw

2019-01-31 8c4b97cceb505be2bfc80ff87d5740165923defb

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

 Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Thursday, January 24, 2019
//    [  Date ]:           Thursday, January 31, 2019
//--------------------------------------------------------

using UnityEngine;
@@ -18,7 +18,8 @@
        public int ZhuXianScore { get ; private set ; }

        public string dropItems { get ; private set; } 

        public string PortraitID { get ; private set; } 

        public int[] conditionSorts;
        public int[] conditionSorts;

        public int AutoAttention { get ; private set ; }

        public override string getKey()
        {
@@ -47,7 +48,9 @@
                for (int i=0;i<conditionSortsStringArray.Length;i++)
                {
                     int.TryParse(conditionSortsStringArray[i],out conditionSorts[i]);
                }
                }

			
                AutoAttention=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0; 
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/JadeDynastyBossConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bc9f70989c6d3344aad5bd0dbda7bc2b
timeCreated: 1548302334
timeCreated: 1548900947
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/JadeDynastyBoss/JadeDynastyBossModel.cs

@@ -97,6 +97,9 @@
        public void OnPlayerLoginOk()

        {

            UpdateRedpoint();



            var bossId = GetLatestUnLockBoss();

            AutoSubscribeLastUnLockBoss(bossId);

        }



        public override void UnInit()

@@ -150,6 +153,39 @@
            {

                var config = Config.Instance.Get<FuncConfigConfig>("ZhuXianBossCntCfg");

                challengeLimitCount = int.Parse(config.Numerical2);

            }

        }



        private void AutoSubscribeLastUnLockBoss(int _bossId)

        {

            if (_bossId == 0)

            {

                return;

            }



            foreach (var boss in jadeDynastyBosses)

            {

                if (findPreciousModel.IsBossAutoSubscribe(boss.bossNpcId) && boss.bossNpcId != _bossId)

                {

                    findPreciousModel.RequestDeSubscribeBoss(boss.bossNpcId);

                }

            }



            if (_bossId != 0 && findPreciousModel.IsBossNeverSubscribe((int)_bossId))

            {

                var condition = 0;

                if (IsBossUnLocked(_bossId, out condition))

                {

                    var config = Config.Instance.Get<JadeDynastyBossConfig>(_bossId);

                    if (config.AutoAttention == 1)

                    {

                        findPreciousModel.RequestSubscribeBoss((int)_bossId, true);

                        if (findPreciousModel.IsBossAlive((int)_bossId))

                        {

                            findPreciousModel.AddOneBossRebornNotify(_bossId);

                        }

                    }

                }

            }

        }



@@ -215,6 +251,10 @@
                    condition = 3;

                    return false;

                }

            }

            else

            {

                return false;

            }

            return true;

        }

@@ -448,6 +488,8 @@
            if (id == FUNCTIONID)

            {

                UpdateRedpoint();

                var bossId = GetLatestUnLockBoss();

                AutoSubscribeLastUnLockBoss(bossId);

            }

        }



@@ -457,6 +499,11 @@
                || refreshType == PlayerDataRefresh.LV)

            {

                UpdateRedpoint();

                if (FuncOpen.Instance.IsFuncOpen(FUNCTIONID))

                {

                    var bossId = GetLatestUnLockBoss();

                    AutoSubscribeLastUnLockBoss(bossId);

                }

            }

        }



@@ -465,6 +512,8 @@
            if (packType == PackType.rptJadeDynastyEquip)

            {

                UpdateRedpoint();

                var bossId = GetLatestUnLockBoss();

                AutoSubscribeLastUnLockBoss(bossId);

                if (jadeDynastyScoreRefresh != null)

                {

                    jadeDynastyScoreRefresh();


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -14,6 +14,7 @@
    {

        JadeDynastyTowerModel towerModel { get { return ModelCenter.Instance.GetModel<JadeDynastyTowerModel>(); } }

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        JadeDynastyGemModel gemModel { get { return ModelCenter.Instance.GetModel<JadeDynastyGemModel>(); } }

        public string LocalSaveEquipUnlock { get; private set; }

        public string LocalSaveActiveSuit { get; private set; }

        public string LocalSaveActiveStoneSuit { get; private set; }

@@ -582,15 +583,20 @@
                    var model = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, key);

                    if (model != null)

                    {

                        List<int> stoneIds = null;

                        JadeDynastyGemModel.GemEquipData equipData;

                        var existGem = gemModel.TryGetEquipGems(key, out equipData);

                        uint[] stoneIds = existGem ? equipData.items : null;

                        if(stoneIds != null)

                        {

                            foreach(var id in stoneIds)

                            {

                                var config = Config.Instance.Get<ItemConfig>(id);

                                if(config.LV >= suitLv)

                                if(id != 0)

                                {

                                    activeStoneNum += 1;

                                    var config = Config.Instance.Get<ItemConfig>((int)id);

                                    if (config.EffectValueB1 >= suitLv)

                                    {

                                        activeStoneNum += 1;

                                    }

                                }

                            }

                        }

@@ -739,20 +745,26 @@
                    var model = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip, key);

                    if (model != null)

                    {

                        List<int> stoneIds = null;

                        JadeDynastyGemModel.GemEquipData equipData;

                        var existGem = gemModel.TryGetEquipGems(key, out equipData);

                        uint[] stoneIds = existGem ? equipData.items : null;

                        if (stoneIds != null)

                        {

                            foreach (var id in stoneIds)

                            {

                                var config = Config.Instance.Get<ItemConfig>(id);

                                if(!stoneDict.ContainsKey(config.LV))

                                if(id != 0)

                                {

                                    stoneDict.Add(config.LV,1);

                                    var config = Config.Instance.Get<ItemConfig>((int)id);

                                    if (!stoneDict.ContainsKey(config.EffectValueB1))

                                    {

                                        stoneDict.Add(config.EffectValueB1, 1);

                                    }

                                    else

                                    {

                                        stoneDict[config.EffectValueB1] += 1;

                                    }

                                }

                                else

                                {

                                    stoneDict[config.LV] += 1;

                                }

                              
                            }

                        }

                    }


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -3141,10 +3141,22 @@
                        {

                            SetWashModel(washModel.OnGetWashType(index), washPro.XLAttrLV, washModel.WashProValues(index));

                        }

                        SetGemModel(PlayerStoneData.Instance.GetStoneInfo(index));

                        SetSuitData(itemId, index);

                    }



                    switch(type)

                    {

                        case PackType.rptEquip:

                            SetGemModel(PlayerStoneData.Instance.GetStoneInfo(index));

                            break;

                        case PackType.rptJadeDynastyEquip:

                            JadeDynastyGemModel.GemEquipData equipData;

                            var model = ModelCenter.Instance.GetModel<JadeDynastyGemModel>();

                            var existGem=model.TryGetEquipGems(index + 121, out equipData);

                            SetGemModel(existGem ? equipData.items : null);

                            break;

                    }



                    SetLegendData(GetUseDataModel(17), GetUseDataModel(19));

                    SetExhaustedData(GetUseDataModel(21), GetUseDataModel(23));

                    SetWingsRefineMat(GetUseDataModel((int)ItemUseDataKey.Def_IudetWingMaterialItemID), GetUseDataModel((int)ItemUseDataKey.Def_IudetWingMaterialItemCount));


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -635,10 +635,19 @@
        /// </summary>

        private void EquipAttrShift(int equipPlace)

        {

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptEquip);

            ItemModel putOnModel = singlePack.GetItemModelByIndex(equipPlace);

            if (putOnModel == null)

                return;

            var packType = GeneralDefine.GetPackTypeByItemType(sendItemModel.chinItemModel.Type);

            ItemModel putOnModel = null;

            switch (packType)

            {

                case PackType.rptJadeDynastyItem:

                      putOnModel = playerPack.GetItemModelByIndex(PackType.rptJadeDynastyEquip,equipPlace);

                    break;

                default:

                    putOnModel = playerPack.GetItemModelByIndex(PackType.rptEquip, equipPlace);

                    break;

            }

     
            if (putOnModel == null) return;



            Dictionary<int, EquipmentInitialization> equipStrengthDic = strengthModel._EqInfo;

            bool isPrompt = strengthModel.TheRatingPrompt(sendItemModel.itemInfo.ItemID);

@@ -656,15 +665,26 @@
                }

            }



            uint[] stones = PlayerStoneData.Instance.GetStoneInfo(equipPlace);

            var packType = GeneralDefine.GetPackTypeByItemType(sendItemModel.chinItemModel.Type);

            uint[] stones = null;

            switch (packType)

            {

                case PackType.rptItem:

                    stones = PlayerStoneData.Instance.GetStoneInfo(equipPlace);

                    break;

                case PackType.rptJadeDynastyItem:

                    JadeDynastyGemModel.GemEquipData equipData;

                    var model = ModelCenter.Instance.GetModel<JadeDynastyGemModel>();

                    var existGem = model.TryGetEquipGems(equipPlace, out equipData);

                    stones = existGem ? equipData.items : null;

                    break;

            }

            int[] gemOpenLvs = packType == PackType.rptJadeDynastyItem ? itemTipsModel.jadeDynastyGemOpenLvs : itemTipsModel.gemOpenLvs;

            if (stones != null)

            {

                int i = 0;

                for (i = 0; i < stones.Length; i++)

                {

                    if (stones[i] != 0 && sendItemConfig.LV >= itemTipsModel.gemOpenLvs[0])

                    if (stones[i] != 0 && sendItemConfig.LV >= gemOpenLvs[0])

                    {

                        SysNotifyMgr.Instance.ShowTip("SwitchEquip_Gem");

                        break;