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

client_Zxw

2019-01-31 766c83d3f52159f3012e4862a693a5b463db7046

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

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -697,7 +697,7 @@
                extersion.luckHitVal = (int)value;

                break;

            case PlayerDataRefresh.ExpPoint:

                baseData.ExpPoint = (ushort)value;

                baseData.ExpPoint = value;

                break;

            case PlayerDataRefresh.Rune:

                ModelCenter.Instance.GetModel<RuneModel>().SetRuneChip((int)value);


 System/Achievement/AchievementModel.cs

@@ -211,6 +211,7 @@
                        break;

                    case 5:

                    case 29:

                    case 139:

                        if (!FuncOpen.Instance.IsFuncOpen(34))

                        {

                            var functionConfig = Config.Instance.Get<FuncOpenLVConfig>(34);


 System/Chat/ChatBubblePreviewWin.cs

@@ -76,6 +76,10 @@
            if (config != null)

            {

                CloseImmediately();

                if (WindowCenter.Instance.IsOpen<ChatExtentWin>())

                {

                    WindowCenter.Instance.CloseImmediately<ChatExtentWin>();

                }

                WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.Jump);

            }

        }


 System/JadeDynastyKnapSack/JadeDynastyGemModel.cs

@@ -173,13 +173,16 @@
        public bool IsHightestLevelGem(int _id)

        {

            var _itemCfg = Config.Instance.Get<ItemConfig>(_id);

            var _nextCfg = Config.Instance.Get<ItemConfig>(_id + 1);

            if (_itemCfg != null && _nextCfg != null && _itemCfg.Type == _nextCfg.Type

                && _itemCfg.EffectValueA1 == _nextCfg.EffectValueA1)

            if (_itemCfg == null)

            {

                return false;

                return true;

            }

            return true;

            var type = _itemCfg.EffectValueA1;

            if (_itemCfg.EffectValueB1 >= gemModel.gemHighestLevelDict[type])

            {

                return true;

            }

            return false;

        }



        public void OnReceivePackage(HA3BC_tagMCStoneInfo package)

@@ -405,7 +408,7 @@
                return false;

            }

            m_GemLevelCountDict.Clear();

            for (int i = _itemCfg.EffectValueB1; i <= 9; i++)

            for (int i = _itemCfg.EffectValueB1; i <= gemModel.gemHighestLevelDict[_type]; i++)

            {

                m_GemLevelCountDict.Add(i, GemCountByLevel(_type, i));

            }


 System/JadeDynastyKnapSack/JadeDynastySelectGemWin.cs

@@ -94,6 +94,13 @@
                _cellInfo.infoInt1 = itemId;

                m_SrollerControl.AddCell(ScrollerDataType.Header, 0, OnGemItemClick, _cellInfo);

            }

            if (itemId != 0 && model.IsHightestLevelGem(itemId))

            {

                CellInfo _cellInfo = CellInfo.Default;

                _cellInfo.infoInt1 = (int)itemId;

                _cellInfo.infoInt2 = bind;

                m_SrollerControl.AddCell(ScrollerDataType.Extra2, 0, _cellInfo);

            }

            for (int i = 0; i < gemItems.Count; i++)

            {

                ItemModel _item = gemItems[i];

@@ -183,9 +190,7 @@
                return;

            }

            int id = (int)equipData.items[equipHole];

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

            ItemConfig _nextCfg = ItemConfig.GetGemDataByLevelAndType(_itemCfg.EffectValueB1 + 1, _itemCfg.EffectValueA1);

            if (_nextCfg == null)

            if (model.IsHightestLevelGem(id))

            {

                SysNotifyMgr.Instance.ShowTip("GemFullLevelError");

                return;

@@ -268,7 +273,7 @@
                        }

                        _levelUpCell.nameText.text = string.Empty;

                        PlayerPropertyConfig _propertyCfg = null;

                        for (int i = _itemCfg.EffectValueB1 + 1; i <= 9; i++)

                        for (int i = _itemCfg.EffectValueB1 + 1; i <= gemModel.gemHighestLevelDict[_itemCfg.EffectValueA1]; i++)

                        {

                            _nextCfg = ItemConfig.GetGemDataByLevelAndType(i, _itemCfg.EffectValueA1);

                            if (_nextCfg == null)

@@ -320,7 +325,8 @@
                                _gemEquipCell.bind.gameObject.SetActive(cell.info.Value.infoInt3 == 1);

                                _gemEquipCell.redpoint.gameObject.SetActive(IsBestGem(cfg.ID, gemItems)

                                    && model.GetHoleRedpoint(equipPlace, equipHole)

                                    && model.CheckEquipHole(equipPlace, equipHole, cfg.ID));

                                    && model.CheckEquipHole(equipPlace, equipHole, cfg.ID)

                                    && cell.index == 0);

                            }

                        }

                    }

@@ -353,6 +359,15 @@
                        }

                    }

                    break;

                case ScrollerDataType.Extra2:

                    {

                        if (cell.info.HasValue)

                        {

                            var _gemFlauntCell = cell as GemFlauntCell;

                            _gemFlauntCell.Display(cell.info.Value.infoInt1, cell.info.Value.infoInt2 == 1);

                        }

                    }

                    break;

            }

        }




 System/JadeDynastyKnapSack/JadeDynastyStoneSuitAttrBeh.cs

@@ -138,7 +138,15 @@
                            equipsName = StringUtility.Contact(equipsName, " ", equipName);

                        }

                    }

                    string activeGemNum = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green, activeStoneNum.ToString()),"/",equipModel.gemResonanceNum);

                    string activeGemNum = string.Empty;

                    if(activeStoneNum > 0)

                    {

                        activeGemNum = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green, activeStoneNum.ToString()), "/", equipModel.gemResonanceNum);

                    }

                    else

                    {

                        activeGemNum = StringUtility.Contact(activeStoneNum, "/", equipModel.gemResonanceNum);

                    }

                    string conditionSB = Language.Get("JadeDynastyEquip7", equipsName,equipModel.gemResonanceNum,suitAttrData.suitLv,activeGemNum);

                    activeText.text = conditionSB;

                }


 System/KnapSack/Logic/GemElementObj.cs

@@ -100,14 +100,25 @@
                {
                    SetGemObjUI(true, false, true, true);
                }
                if (itemTipsModel.gemType1s.Contains(this.equipPlace))
                {
                    gemIcon.SetSprite("Member_Online");

                var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);
                switch(packType)

                {

                    case PackType.rptJadeDynastyItem:

                        gemIcon.SetSprite(StringUtility.Contact("GemTypeMini_", itemConfig.EffectValueA1));

                        break;

                    default:

                        if (itemTipsModel.gemType1s.Contains(this.equipPlace))

                        {

                            gemIcon.SetSprite("Member_Online");

                        }

                        else if (itemTipsModel.gemType2s.Contains(this.equipPlace))

                        {

                            gemIcon.SetSprite("Member_Offline");

                        }

                        break;

                }
                else if (itemTipsModel.gemType2s.Contains(this.equipPlace))
                {
                    gemIcon.SetSprite("Member_Offline");
                }
                

                InlaidPanel.ShowGemInfo(gemAttrDes,stoneId, false);
            }

 System/OpenServerActivity/FestivalRedpackBehaviour.cs

@@ -92,7 +92,7 @@
            RedEnvelopeModel.RedEnvelope envelope;

            if (envelopeModel.TryGetEnvelope(redpackServerId, out envelope))

            {

                var overdue = model.IsSystemRedpackOverdue(id);

                var overdue = model.IsSystemRedpackOverdue(redpackId);

                m_ContainerOverdue.gameObject.SetActive(overdue && envelope.state == 1);

                m_ContainerOpen.gameObject.SetActive(envelope.state == 1 && !overdue);

                m_ContainerGot.gameObject.SetActive(envelope.state == 2);


 System/Role/MagicianModel.cs

@@ -80,6 +80,7 @@


        private Dictionary<int, int[]> godWeaponLevelUpCost = new Dictionary<int, int[]>();

        public List<int> godWeaponTypes { get; private set; }

        public Dictionary<int, int> godWeaponBoxDict { get; private set; } //key 神兵石礼包 value 神兵类型

        public List<int> godWeaponEffectTypes { get; private set; }

        public Dictionary<int, string> godWeaponIcons { get; private set; }

        public Dictionary<int, Dictionary<int, int>> godWeaponSkillDict = new Dictionary<int, Dictionary<int, int>>();

@@ -125,6 +126,9 @@
        public int audioLength { get; private set; }

        void ParseConfig()

        {

            var godWeaponBox = Config.Instance.Get<FuncConfigConfig>("GodWeaponBox");

            godWeaponBoxDict = ConfigParse.GetDic<int, int>(godWeaponBox.Numerical1);



            godWeaponTypes = GodWeaponConfig.GetGodWeaponType();

            for (int i = 0; i < godWeaponTypes.Count; i++)

            {

@@ -330,6 +334,12 @@
                    return true;

                }

            }



            if(godWeaponBoxDict.ContainsKey(itemId))

            {

                type = godWeaponBoxDict[itemId];

                return true;

            }

            return false;

        }




 System/Strengthening/GemFlauntCell.cs

@@ -35,11 +35,14 @@
        private void GemFlaunt()

        {

            WindowCenter.Instance.CloseImmediately<EquipReinforceWin>();

            WindowCenter.Instance.CloseImmediately<JadeDynastySelectGemWin>();

            WindowCenter.Instance.CloseImmediately<JadeDynastyKnapSackWin>();

            ChatCtrl.Inst.presentChatType = ChatInfoType.World;

            ChatCtrl.Inst.openFromGem = true;

            ChatCtrl.Inst.flauntGemId = itemId;

            ChatCtrl.Inst.flauntGemBind = bind;

            WindowCenter.Instance.Open<ChatWin>();

            WindowCenter.Instance.Open<MainInterfaceWin>();

        }

    }

}

 System/Strengthening/GemLevelUpWin.cs

@@ -231,9 +231,7 @@
            if(jadeDynastyGemModel.TryGetEquipGems(equipPlace,out equipData))

            {

                int id = (int)equipData.items[equipHole];

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

                ItemConfig next = ItemConfig.GetGemDataByLevelAndType(cfg.EffectValueB1 + 1, cfg.EffectValueA1);

                if (next == null)

                if (jadeDynastyGemModel.IsHightestLevelGem(id))

                {

                    CloseClick();

                }


 System/Strengthening/GemModel.cs

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

        public Dictionary<int, List<int>> equipGemTypeDict = new Dictionary<int, List<int>>();

        public Dictionary<int, List<int>> gemGetWays = new Dictionary<int, List<int>>();

        public Dictionary<int, int> gemHighestLevelDict = new Dictionary<int, int>();

        public Dictionary<int, int> gemShopIds { get; private set; }

        public int[] gemOpenArray { get; private set; }

        public string[] equipPartNames { get; private set; }

@@ -81,6 +82,15 @@
                {

                    gemGetWays.Add(i, new List<int>(ConfigParse.GetMultipleStr<int>(config.Numerical3)));

                }



                var level = 1;

                var gemConfig = ItemConfig.GetGemDataByLevelAndType(level, i);

                while (gemConfig != null && gemConfig.EffectValueA1 == i)

                {

                    gemHighestLevelDict[i] = level;

                    level++;

                    gemConfig = Config.Instance.Get<ItemConfig>(gemConfig.EffectValueC1);

                }

            }



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


 Utility/CalculateSkillGetAttrHurtUtility.cs

@@ -52,7 +52,14 @@
                            case AttrEnum.SkillAddPerE:

                            case AttrEnum.SkillAddPerF:

                            case AttrEnum.SkillAddPerG:

                                legendAttrDict.Add(attrId,attrValue);

                                if(!legendAttrDict.ContainsKey(attrId))

                                {

                                    legendAttrDict.Add(attrId, attrValue);

                                }

                                else

                                {

                                    legendAttrDict[attrId] += attrValue;

                                }

                                break;

                        }

                    }