少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-17 724617516acd45522708d867f9822024c41de50b
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
56 ■■■■■ 已修改文件
System/EquipGem/EquipStrengthModel.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionIncidentPanel.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/HazyRegion/HazyRegionModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipGem/EquipStrengthModel.cs
@@ -62,6 +62,7 @@
        public int redpointLimitLevel { get; private set; }
        public int redpointLimitMoney { get; private set; }
        public int redpointLimitMoneyLevel { get; private set; }
        private bool isChangeBool = true;
        public bool IsChangeBool {
@@ -126,6 +127,7 @@
            var funcConfig = FuncConfigConfig.Get("StrengthenRedPointLevel");
            redpointLimitLevel = int.Parse(funcConfig.Numerical1);
            redpointLimitMoney = int.Parse(funcConfig.Numerical2);
            redpointLimitMoneyLevel = int.Parse(funcConfig.Numerical3);
            equipPlaces = new List<int>(12);
            for (int i = 1; i <= 12; i++)
@@ -589,11 +591,15 @@
                    return;
                }
            }
            var money = UIHelper.GetMoneyCnt(3);
            if (money < (ulong)redpointLimitMoney)
            if (PlayerDatas.Instance.baseData.LV >= redpointLimitMoneyLevel)
            {
                RefreshRedpoint(Int2.zero, 0);
                return;
                var money = UIHelper.GetMoneyCnt(3);
                if (money < (ulong)redpointLimitMoney)
                {
                    RefreshRedpoint(Int2.zero, 0);
                    return;
                }
            }
            var equipSets = equipModel.GetAllEquipSets();
System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -58,20 +58,31 @@
            if (incidents.Count > 0)
            {
                model.selectIncident = incidents[0];
                var error = 0;
                foreach (var id in incidents)
                var _ids = new List<int>(incidents);
                _ids.Sort((x, y) =>
                {
                    HazyRegionModel.Incident incident;
                    if (model.TryGotoIncident(id, false, out error)
                        && model.TryGetIncident(id, out incident)
                        && incident.state == HazyRegionModel.IncidentState.Processing)
                    HazyRegionModel.Incident lhs_incident;
                    HazyRegionModel.Incident rhs_incident;
                    if (model.TryGetIncident(x, out lhs_incident)
                    && model.TryGetIncident(y, out rhs_incident))
                    {
                        model.selectIncident = id;
                        break;
                        var lhs_index = model.incidentSelectSort.IndexOf(lhs_incident.state);
                        var rhs_index = model.incidentSelectSort.IndexOf(rhs_incident.state);
                        if (lhs_index != rhs_index)
                        {
                            return lhs_index.CompareTo(rhs_index);
                        }
                        lhs_index = incidents.IndexOf(x);
                        rhs_index = incidents.IndexOf(y);
                        if (lhs_index != rhs_index)
                        {
                            return lhs_index.CompareTo(rhs_index);
                        }
                    }
                }
                    return 0;
                });
                model.selectIncident = _ids[0];
            }
            m_CyclicScroll.Init(incidents);
System/HazyRegion/HazyRegionModel.cs
@@ -11,7 +11,7 @@
        Dictionary<int, Incident> m_Incidents = new Dictionary<int, Incident>();
        Dictionary<int, AdventureInfo> m_AdventureInfos = new Dictionary<int, AdventureInfo>();
        public List<HazyRegionIncidentType> incidentTypesSort = new List<HazyRegionIncidentType>()
        public readonly List<HazyRegionIncidentType> incidentTypesSort = new List<HazyRegionIncidentType>()
        {
            HazyRegionIncidentType.Adventure,
            HazyRegionIncidentType.Precious,
@@ -20,6 +20,13 @@
            HazyRegionIncidentType.DemonKing,
        };
        public readonly List<IncidentState> incidentSelectSort = new List<IncidentState>()
        {
            IncidentState.Processing,
            IncidentState.UnStart,
            IncidentState.Complete,
        };
        public int limitPoint { get; private set; }
        public int point { get; private set; }
        public int processingIncidentId { get; private set; }