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

client_linchunjie

2018-09-17 adbf429e73369236029c0c3626a6d1e7521cc196

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

 System/DailyQuest/DailyQuestData.cs

@@ -327,9 +327,7 @@


    public bool ContainTimeNode(int week, int timeNode)

    {

        var isSpecialDay = TimeUtility.OpenWeekCnt <= 1;

        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;

        var dayIndex = TimeUtility.OpenDay + 1;



        List<HourMinute> hourMinutes = null;

        var dayDelta = (week == 0 ? 7 : week) - openDayWeek;

@@ -356,6 +354,20 @@
        return false;

    }



    private bool ContainWeek(int week)

    {

        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;

        var dayDelta = (week == 0 ? 7 : week) - openDayWeek;

        if (TimeUtility.OpenWeekCnt < 1 && dayDelta < 0)

        {

            return openTimes.ContainsKey(week);

        }

        else

        {

            return GetHourMinuteByWeek(week) != null;

        }

    }



    public string ToOpenTimeString()

    {

        if (always || openTimes.Count >= 7)

@@ -364,39 +376,40 @@
        }

        else

        {

            var timeStringArray = new string[openTimes.Count];

            var index = 0;

            foreach (var key in openTimes.Keys)

            var timeStringList = new List<string>();

            for (var i = 1; i <= 7; i++)

            {

                switch (key)

                var week = i % 7;

                if (ContainWeek(week))

                {

                    case 0:

                        timeStringArray[index] = Language.Get("Weekday7");

                        break;

                    case 1:

                        timeStringArray[index] = Language.Get("Weekday1");

                        break;

                    case 2:

                        timeStringArray[index] = Language.Get("Weekday2");

                        break;

                    case 3:

                        timeStringArray[index] = Language.Get("Weekday3");

                        break;

                    case 4:

                        timeStringArray[index] = Language.Get("Weekday4");

                        break;

                    case 5:

                        timeStringArray[index] = Language.Get("Weekday5");

                        break;

                    case 6:

                        timeStringArray[index] = Language.Get("Weekday6");

                        break;

                    switch (week)

                    {

                        case 0:

                            timeStringList.Add(Language.Get("Weekday7"));

                            break;

                        case 1:

                            timeStringList.Add(Language.Get("Weekday1"));

                            break;

                        case 2:

                            timeStringList.Add(Language.Get("Weekday2"));

                            break;

                        case 3:

                            timeStringList.Add(Language.Get("Weekday3"));

                            break;

                        case 4:

                            timeStringList.Add(Language.Get("Weekday4"));

                            break;

                        case 5:

                            timeStringList.Add(Language.Get("Weekday5"));

                            break;

                        case 6:

                            timeStringList.Add(Language.Get("Weekday6"));

                            break;

                    }

                }



                index++;

            }



            return string.Join("、", timeStringArray);

            return string.Join("、", timeStringList.ToArray());

        }



    }


 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -1025,7 +1025,14 @@
                    }

                    else

                    {

                        SetSellItemPrompt(attrData, "KnapS146", attrData.itemConfig.ItemName);

                        if (attrData.itemConfig.SellTip == 0)

                        {

                            SetSellItemPrompt(attrData, "KnapS146", attrData.itemConfig.ItemName);

                        }

                        else if (attrData.itemConfig.SellTip == 1)

                        {

                            SetSellItemPrompt(attrData, "KnapS128", attrData.itemConfig.ItemName);

                        }

                    }

                }

            }


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -458,6 +458,16 @@
                        WindowCenter.Instance.Open<FairyJadeInvestmentWin>();

                    }

                    break;

                case 11:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<VipInvestWin>();

                    }

                    else

                    {

                        WindowCenter.Instance.Open<VipInvestWin>();

                    }

                    break;



            }

        }

@@ -491,6 +501,7 @@
            WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>();

            WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();

            WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            WindowCenter.Instance.CloseImmediately<VipInvestWin>();

        }



        private int Compare(int x, int y)


 System/Vip/VipInvest/VipInvestModel.cs

@@ -5,7 +5,7 @@


namespace Snxxz.UI

{

    public class VipInvestModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    public class VipInvestModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity

    {

        private Dictionary<string, Dictionary<string, List<InvestReward>>> vipInvestDict = new Dictionary<string, Dictionary<string, List<InvestReward>>>();

        private Dictionary<int, List<InvestConfig>> investCycleDict = new Dictionary<int, List<InvestConfig>>(); //每周期数据

@@ -13,6 +13,39 @@
        private Dictionary<int, int[]> investGoldDict = new Dictionary<int, int[]>();

        private Dictionary<int, int> investMaxDayDict = new Dictionary<int, int>();

        public int NeedVipLv { get; private set; }



        public bool IsOpen

        {

            get

            {

               return  FuncOpen.Instance.IsFuncOpen(120);

            }

        }



        public bool priorityOpen

        {

            get

            {

                if (redPointStre1.state == RedPointState.None)

                {

                    return false;

                }

                else

                {

                    return true;

                }

            }



        }



        public bool IsAdvance

        {

            get

            {

                return false;

            }

        }



        private bool IsOkBool = false;

        public bool IsRedpoint = false;



@@ -26,6 +59,7 @@
            vipInvestLvlimitDict.Clear();

            investGoldDict.Clear();

            investMaxDayDict.Clear();

            OpenServerActivityCenter.Instance.Register(11, this);

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

            DisplayLevel = int.Parse(InvestRedPoint.Numerical1);

            DisplayDays = int.Parse(InvestRedPoint.Numerical3);

@@ -205,6 +239,7 @@
        #region 处理服务端的数据

        private Dictionary<int, ServerInvestInfo> serverInvestDict = new Dictionary<int, ServerInvestInfo>();

        public event Action<int> RefreshInvestAct;

        public event Action<int> onStateUpate;



        public void SetServerInvestInfo(HA337_tagMCGoldInvestInfo info)

        {

@@ -374,12 +409,12 @@
        ServerInvestInfo InvestInfo;

        int cycle = 0;

        private List<InvestConfig> configlist;

        private const int Redpoint_key1 = 3501;

        public Redpoint redPointStre1 = new Redpoint(MainRedDot.RedPoint_VipDot, Redpoint_key1);//Vip 投资红点

        private const int Redpoint_key1_Week1 = 350101;

        private const int Redpoint_key1_Week2 = 350102;

        private const int Redpoint_key1_Week3 = 350103;

        private const int Redpoint_key1_Week4 = 350104;

        private const int Redpoint_key1 = 20911;

        public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//Vip 投资红点

        private const int Redpoint_key1_Week1 = 2091101;

        private const int Redpoint_key1_Week2 = 2091102;

        private const int Redpoint_key1_Week3 = 2091103;

        private const int Redpoint_key1_Week4 = 2091104;

        public Redpoint redPointStre1_v1 = new Redpoint(Redpoint_key1, Redpoint_key1_Week1);

        public Redpoint redPointStre1_v2 = new Redpoint(Redpoint_key1, Redpoint_key1_Week2);

        public Redpoint redPointStre1_v3 = new Redpoint(Redpoint_key1, Redpoint_key1_Week3);

@@ -413,16 +448,16 @@
                    switch (cycle)

                    {

                        case 1:

                            redPointStre1_v1.state = RedPointState.Simple;

                            redPointStre1_v1.state = RedPointState.GetReward;

                            break;

                        case 2:

                            redPointStre1_v2.state = RedPointState.Simple;

                            redPointStre1_v2.state = RedPointState.GetReward;

                            break;

                        case 3:

                            redPointStre1_v3.state = RedPointState.Simple;

                            redPointStre1_v3.state = RedPointState.GetReward;

                            break;

                        case 4:

                            redPointStre1_v4.state = RedPointState.Simple;

                            redPointStre1_v4.state = RedPointState.GetReward;

                            break;

                        default:

                            break;


 System/Vip/VipRechargeWin.cs

@@ -19,7 +19,6 @@
        [SerializeField] Button closeBtn;

        [SerializeField] FunctionButton vipPayTitleBtn;

        [SerializeField] FunctionButton vipTitleBtn;

        [SerializeField] FunctionButton vipInvestTitleBtn;

        [SerializeField] FunctionButtonGroup buttonGroup;



        private VipModel m_Model;

@@ -49,7 +48,6 @@
            closeBtn.onClick.AddListener(OnClose);

            vipPayTitleBtn.onClick.AddListener(OnVipPay);

            vipTitleBtn.onClick.AddListener(OnVip);

            vipInvestTitleBtn.onClick.AddListener(OnVipInvest);

        }

        public void OnVipPay()

        {

@@ -80,23 +78,6 @@
            presentWinType = VipModel.VipWinType.Vip;

            functionOrder = 1;

        }



        private void OnVipInvest()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<VipInvestWin>();

            }

            else

            {

                ;

                WindowCenter.Instance.Open<VipInvestWin>();

            }

            presentWinType = VipModel.VipWinType.VipInverst;

            functionOrder = 2;

        }



        protected override void OnPreOpen()

        {

            CloseChildWin();

@@ -153,10 +134,6 @@
            {

                WindowCenter.Instance.CloseImmediately<VipWin>();

            }

            if (WindowCenter.Instance.CheckOpen<VipInvestWin>())

            {

                WindowCenter.Instance.CloseImmediately<VipInvestWin>();

            }

            if (WindowCenter.Instance.CheckOpen<RechargeWin>())

            {

                WindowCenter.Instance.CloseImmediately<RechargeWin>();

@@ -178,10 +155,6 @@
                case VipModel.VipWinType.Vip:

                    vipTitleBtn.state = TitleBtnState.Click;

                    OnVip();

                    break;

                case VipModel.VipWinType.VipInverst:

                    vipInvestTitleBtn.state = TitleBtnState.Click;

                    OnVipInvest();

                    break;

            }

        }


 System/Welfare/AwardExchangeWin.cs

@@ -1,4 +1,5 @@
using System;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



@@ -8,7 +9,7 @@
    {

        [SerializeField] InputField input;

        [SerializeField] Button receiveBtn;



        const string exchangeUrl = "http://center.2460web.com:53003/Coupon/CouponCode.php?";

        protected override void BindController()

        {



@@ -35,7 +36,7 @@


        protected override void OnAfterClose()

        {



         
        }



        private void InitUI()

@@ -51,7 +52,16 @@
                SysNotifyMgr.Instance.ShowTip("InputExchangeCode");

                return;

            }

            else

            {

                var tables = new Dictionary<string, string>();

                tables["channel"] = VersionConfig.Get().appId;

                tables["code"] = passward;

                tables["accid"] = SDKUtility.Instance.FreePlatformInfo.account;

                tables["sid"] = ServerListCenter.Instance.currentServer.region_flag.ToString();

                tables["pushurl"] = ServerListCenter.Instance.currentServer.region_domain;

                HttpRequest.Instance.RequestHttpGet(StringUtility.Contact(exchangeUrl, HttpRequest.HashtablaToString(tables)), HttpRequest.defaultHttpContentType, 1, null);

            }

        }



    }

}