少年修仙传客户端代码仓库
client_linchunjie
2018-08-23 3b12092e5bf4cb6484d1ccf806616b6511486cc9
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
68 ■■■■■ 已修改文件
System/MainInterfacePanel/FlyingShoesTask.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/FairyJadeInvestmentModel.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Vip/VipInvest/VipInvestModel.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/FlyingShoesTask.cs
@@ -322,11 +322,23 @@
            {
                m_TitleText.text = "<color=#ec4bf6>" + TaskTitle(TaskID) + "</color>";
            }
            int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品
            if (mainModel.TaskId_Skill1.Contains(TaskID))
            {
                if (itemNumber >= mainModel.ItemNumber)
                {
                    m_TitleText.text = "<color=#109d06>" + TaskTitle(TaskID) + "</color>";
                }
                else
                {
                    m_TitleText.text = "<color=#feed28>" + TaskTitle(TaskID) + "</color>";
                }
            }
            string str = taskmodel.allMissionDict[TaskID].InforList;
            var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
            if (mainModel.TaskId_Skill1.Contains(TaskID))//特殊任务
            {
                int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品
                string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
                string Str_B = Language.Get("PassiveSkillTask2");
                if (itemNumber >= mainModel.ItemNumber)
System/Vip/FairyJadeInvestmentModel.cs
@@ -31,8 +31,17 @@
    VipInvestModel VipInvestModel { get { return m_VipInvestModel ?? (m_VipInvestModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } }
    private bool IsOk = false;
    public bool IsRedpoint = false;
    private int DisplayLevel = 0;//显示等级
    private int DisplayDays = 0;//显示天数
                                //----
    private bool IsOneRedPoint = true;
    public override void Init()
    {
        var InvestRedPoint = Config.Instance.Get<FuncConfigConfig>("InvestRedPoint");
        DisplayLevel = int.Parse(InvestRedPoint.Numerical2);
        DisplayDays = int.Parse(InvestRedPoint.Numerical3);
        int[] MultipleIntList = ConfigParse.GetMultipleStr<int>(Config.Instance.Get<FuncConfigConfig>("JadeInvest").Numerical1);
        MultipleList.Clear();
        for (int i = 0; i < MultipleIntList.Length; i++)
@@ -61,10 +70,10 @@
        IsOk = true;
        InvestmentAmount();
        InvestmentRedPoint();
        if (TimeUtility.CreateDays <= 3 && redPointStre1.state == RedPointState.None)
        if (TimeUtility.CreateDays <= DisplayDays && redPointStre1.state == RedPointState.None)
        {
            IsRedpoint = true;
            if (PlayerDatas.Instance.baseData.LV >= 30)
            if (PlayerDatas.Instance.baseData.LV >= DisplayLevel)
            {
                RedPointSate();
            }
@@ -88,7 +97,7 @@
        }
        if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)
        {
            if (TimeUtility.CreateDays <= 3 && redPointStre1.state == RedPointState.None && PlayerDatas.Instance.baseData.LV >= 30)
            if (TimeUtility.CreateDays <= DisplayDays && redPointStre1.state == RedPointState.None && PlayerDatas.Instance.baseData.LV >= DisplayLevel)
            {
                if (IsRedpoint)
                {
@@ -250,9 +259,7 @@
                        }
                    }
                }
            }
        }
        int type1 = -1;
        if (JumpInedx == 0 && InvestmentGrade != 0)
@@ -266,7 +273,6 @@
                    return;
                }
            }
        }
    }
    private void RedPointSate()//月卡投资创角前三天红点
@@ -277,7 +283,11 @@
        }
        if (IsRedpoint)
        {
            redPointStre1.state = RedPointState.Simple;
            if (IsOneRedPoint)
            {
                redPointStre1.state = RedPointState.Simple;
                IsOneRedPoint = false;
            }
        }
        else
        {
System/Vip/VipInvest/VipInvestModel.cs
@@ -15,6 +15,11 @@
        public int NeedVipLv { get; private set;}
        private bool IsOkBool = false;
        public bool IsRedpoint = false;
        private int DisplayLevel = 0;//显示等级
        private int DisplayDays = 0;//显示天数
        //----
        private bool IsOneRedPoint = true;
        public override void Init()
        {
            vipInvestDict.Clear();
@@ -22,7 +27,9 @@
            vipInvestLvlimitDict.Clear();
            investGoldDict.Clear();
            investMaxDayDict.Clear();
            var InvestRedPoint = Config.Instance.Get<FuncConfigConfig>("InvestRedPoint");
            DisplayLevel = int.Parse(InvestRedPoint.Numerical1);
            DisplayDays = int.Parse(InvestRedPoint.Numerical3);
            FuncConfigConfig vipInvestLv = Config.Instance.Get<FuncConfigConfig>("VIPInvest");
            NeedVipLv = int.Parse(vipInvestLv.Numerical2);
            JsonData vipInvestData = JsonMapper.ToObject(vipInvestLv.Numerical1);
@@ -83,10 +90,10 @@
            VipInvestWin.VipInvestRedPointEvent += VipInvestRedPointEvent;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;
            if (TimeUtility.CreateDays <= 3 && redPointStre1.state==RedPointState.None)
            if (TimeUtility.CreateDays <= DisplayDays && redPointStre1.state==RedPointState.None)
            {
                IsRedpoint = true;
                if (PlayerDatas.Instance.baseData.LV >= 30)
                if (PlayerDatas.Instance.baseData.LV >= DisplayLevel)
                {
                    RedPointSate();
                }              
@@ -97,7 +104,7 @@
        {
            if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)
            {
                if (TimeUtility.CreateDays <= 3 && redPointStre1.state == RedPointState.None && PlayerDatas.Instance.baseData.LV >= 30)
                if (TimeUtility.CreateDays <= DisplayDays && redPointStre1.state == RedPointState.None && PlayerDatas.Instance.baseData.LV >= DisplayLevel)
                {
                    if (IsRedpoint)
                    {
@@ -185,7 +192,6 @@
            {
                return investGoldDict[type][index];
            }
            return 0;
        }
@@ -200,7 +206,6 @@
                    return index;
                }
            }
            return "";
        }
@@ -359,7 +364,6 @@
            {
                cycle = day / 7;
            }
            return cycle;
        }
@@ -381,7 +385,6 @@
        {
        }
        ServerInvestInfo InvestInfo;
        int cycle = 0;
        private List<InvestConfig> configlist;
@@ -437,7 +440,6 @@
                            break;
                        default:
                            break;
                    }
                   // redPointStre1.state = RedPointState.Simple;
                    JumpIndex = i;
@@ -456,7 +458,6 @@
                        return;
                    }
                }
            }
        }
@@ -469,16 +470,17 @@
            }
            if (IsRedpoint)
            {
                redPointStre1.state = RedPointState.Simple;
                if (IsOneRedPoint)
                {
                    redPointStre1.state = RedPointState.Simple;
                    IsOneRedPoint = false;
                }
            }
            else
            {
                VipInvestRedPoint();
            }
        }
    }
    public struct InvestReward