少年修仙传客户端代码仓库
client_Wu Xijin
2018-10-30 4d7befaf83194690d3874cc50c852e6566a79b04
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
126 ■■■■■ 已修改文件
Core/GameEngine/Model/TelPartialConfig/tagRoleEquipStarsConfig.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PlayerPackModels.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PlayerStarNumWin.cs 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/SkillModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureStageUpTriggerWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI/Common/NumKeyBoard.cs 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/TelPartialConfig/tagRoleEquipStarsConfig.cs
@@ -30,9 +30,38 @@
        public static RoleEquipStarsConfig GetEquipStarsModel(int stars)
        {
            RoleEquipStarsConfig item = null;
            tagEquipStarsModelDict.TryGetValue(stars, out item);
            List<int> starlist = tagEquipStarsModelDict.Keys.ToList();
            if(starlist != null)
            {
                for (int i = starlist.Count - 1; i > -1; i--)
                {
                    if(stars >= starlist[i])
                    {
                        tagEquipStarsModelDict.TryGetValue(starlist[i], out item);
                        break;
                    }
                }
            }
            return item;
        }
        public static int GetActiveStars(int stars)
        {
            int activeStars = 0;
            List<int> starlist = tagEquipStarsModelDict.Keys.ToList();
            if (starlist != null)
            {
                for (int i = starlist.Count - 1; i > -1; i--)
                {
                    if (stars >= starlist[i])
                    {
                        activeStars = starlist[i];
                        break;
                    }
                }
            }
            return activeStars;
        }
        #endregion
    }
System/KnapSack/Logic/PlayerPackModels.cs
@@ -535,6 +535,10 @@
            {
                int type = info.ActiveInfo[i].Type;
                int cnt = (int)info.ActiveInfo[i].Cnt;
                if(type == 1)
                {
                    cnt = RoleEquipStarsConfig.GetActiveStars(cnt);
                }
                if(!equipAttrActiveDict.ContainsKey(type))
                {
                    equipAttrActiveDict.Add(type,cnt);
System/KnapSack/Logic/PlayerStarNumWin.cs
@@ -87,7 +87,6 @@
            curSumStarText.text = Language.Get("KnapS124").Replace("{0}", _curStarsCount.ToString());
            int activeCnt = GetActiveStarsAttr();
            int serverActiveCnt = playerPack.GetActiveCntByType(1);
            StringBuilder attrStr = new StringBuilder();
            if (activeStarsConfig != null)
            {
@@ -131,23 +130,14 @@
                }
                nextAttrText.text = attrStr.ToString();
                nextEffectText.text = Language.Get("BagWin_NextText_1",Language.Get("KnapS144"));
                if (activeCnt < serverActiveCnt)
                if (_curStarsCount >= nextActiveStarsConfig.countNeed)
                {
                    RefreshActiveBtnUI(false);
                    nextEffectText.text = Language.Get("BagWin_NextText_1", Language.Get("KnapS143"));
                    nextActiveCnt = nextActiveStarsConfig.countNeed;
                    RefreshActiveBtnUI(true);
                }
                else
                {
                    if (_curStarsCount >= nextActiveStarsConfig.countNeed)
                    {
                        nextActiveCnt = nextActiveStarsConfig.countNeed;
                        RefreshActiveBtnUI(true);
                    }
                    else
                    {
                        RefreshActiveBtnUI(false);
                    }
                    RefreshActiveBtnUI(false);
                }
            }
            else
@@ -204,30 +194,11 @@
        {
            activeStarsConfig = null;
            nextActiveStarsConfig = null;
            int cnt = playerPack.GetActiveCntByType(1);
            int activeCnt = playerPack.GetActiveCntByType(1);
            List<int> starslist = RoleEquipStarsConfig.GetEquipStarsCntlist();
            int activeCnt = cnt;
            if (starslist == null || starslist.Count < 1) return activeCnt;
            if (cnt > _curStarsCount)
            {
                for (int i = starslist.Count - 1; i > -1; i--)
                {
                    if(i== 0 && starslist[i] > _curStarsCount)
                    {
                        activeCnt = 0;
                        break;
                    }
                    if (starslist[i] <= _curStarsCount)
                    {
                        activeCnt = starslist[i];
                        break;
                    }
                }
            }
            if (activeCnt < starslist[0])
            if (_curStarsCount < starslist[0])
            {
                activeStarsConfig = null;
                nextActiveStarsConfig = RoleEquipStarsConfig.GetEquipStarsModel(starslist[0]);
@@ -237,12 +208,9 @@
                int nextActiveStars = 0;
                for (int i = 0; i < starslist.Count; i++)
                {
                    if(starslist[i] == activeCnt)
                    if(starslist[i] > activeCnt)
                    {
                        if(i < starslist.Count - 1)
                        {
                            nextActiveStars = starslist[i + 1];
                        }
                        nextActiveStars = starslist[i];
                        break;
                    }
                }
System/Skill/SkillModel.cs
@@ -202,7 +202,7 @@
        public event Action OnAutoUseXpEvent;
        public bool AutoUseXp()
        {
            return QuickSetting.Instance.GetQuickSettingBool(QuickSetting.QuickSettingType.AutoUseXp, 0, false);
            return QuickSetting.Instance.GetQuickSettingBool(QuickSetting.QuickSettingType.AutoUseXp, 0, true);
        }
        public void SetAutoUseXp(bool _auto)
System/Treasure/TreasureStageUpTriggerWin.cs
@@ -235,7 +235,7 @@
                    switch (m_Treasure.id)
                    {
                        case 104:
                            SnxxzGame.Instance.StartCoroutine(Co_SkillGuide());
                            //SnxxzGame.Instance.StartCoroutine(Co_SkillGuide());
                            return;
                        case 105:
                            NewBieCenter.Instance.StartNewBieGuide(49);
UI/Common/NumKeyBoard.cs
@@ -150,7 +150,10 @@
        private void OnOkBtn()
        {
            onConfirm.Invoke(true);
            if (deActiveConfirm) gameObject.SetActive(false);
            if (deActiveConfirm)
            {
                gameObject.SetActive(false);
            }
        }
        private void OnClickNum(uint index)
@@ -177,9 +180,20 @@
                        {
                            uint _value = m_RealIntValue * 10 + index;
                            m_RealIntValue = _value;
                            if (max > 0 && _value > max) _value = max;
                            if (min > 0 && _value < min) _value = min;
                            if (_value == m_IntValue) return;
                            if (max > 0 && _value > max)
                            {
                                _value = max;
                            }
                            var maxlength = LengthOf(max);
                            var length = LengthOf(_value);
                            if (min > 0 && _value < min && (!displayOutValue || (max > 0 && length == maxlength)))
                            {
                                _value = min;
                            }
                            if (_value == m_IntValue)
                            {
                                return;
                            }
                            m_IntValue = _value;
                        }
                        m_Value.Length = 0;
@@ -188,7 +202,10 @@
                    }
                    break;
                case NumKeyBoardType.Password:
                    if (limit != 0 && m_Value.Length >= limit) return;
                    if (limit != 0 && m_Value.Length >= limit)
                    {
                        return;
                    }
                    m_Value.Append(index);
                    SetTargetTextValue();
                    break;
@@ -203,6 +220,18 @@
                targetText.text = Value;
            }
        }
        static int LengthOf(uint value)
        {
            for (int i = 0; i <= 10; i++)
            {
                if (value / (ulong)Mathf.Pow(10, i) < 1)
                {
                    return i;
                }
            }
            return 0;
        }
    }
    public enum NumKeyBoardType
    {