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

client_Wu Xijin

2018-09-17 3c3b4e0878ee25a4705af75cdd4b8562be3d477c

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

 System/Dungeon/DungeonModel.cs

@@ -547,19 +547,26 @@
                }

                if (Index > -1)

                {

                    if (Index + 1 > 8)

                    if (Index + 1 >=7)

                    {

                        mainModel._layerNumber = 8;

                        if(7-mainModel.WaHuangHighestFloor>=0)

                        mainModel.LayerNumber = 7 - mainModel.WaHuangHighestFloor;

                    }

                    else

                    {

                        mainModel._layerNumber = Index + 1;

                        if ((Index + 1) - mainModel.WaHuangHighestFloor >= 0)

                        {

                            mainModel.LayerNumber = (Index + 1) - mainModel.WaHuangHighestFloor;

                        }

                        else

                        {

                            mainModel.LayerNumber = 0;

                        }

                    }



                }

                else

                {

                    mainModel._layerNumber = 0;

                    mainModel.LayerNumber = 0;

                }

            }

            SnxxzGame.Instance.StartCoroutine(AwaitTime());


 System/FairyAu/PlayerMethodData.cs

@@ -28,11 +28,20 @@
    public Dictionary<int, int> MethodDataNeedLVDic = new Dictionary<int, int>();//心法下表对应的所需学习等级



    FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

    private int FairyHallMax = 0;

    public override void Init()

    {

        string str = Config.Instance.Get<FuncConfigConfig>("FamilyTechNeedLV").Numerical1;

        MethodDataNeedLVDic = ConfigParse.GetDic<int, int>(str);

        var fairy = Config.Instance.GetAllValues<FamilyConfig>();

        foreach (var value in fairy)

        {

            if (value.familyLV > FairyHallMax)

            {

                FairyHallMax = value.familyLV;

            }



        }



    }



@@ -151,7 +160,7 @@
        {

            return;

        }

        if ((int)PlayerDatas.Instance.fairyData.mine.FamilyLV >= 2)

        if ((int)PlayerDatas.Instance.fairyData.mine.FamilyLV >= 2 && (int)PlayerDatas.Instance.fairyData.mine.FamilyLV < FairyHallMax)

        {

            int _familyLV = (int)PlayerDatas.Instance.fairyData.fairy.FamilyLV;

            if ((int)PlayerDatas.Instance.fairyData.fairy.FamilyMoney >= Config.Instance.Get<FamilyConfig>(_familyLV).needMoney)


 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/FlashSaleCoolDown.cs

@@ -9,6 +9,8 @@
    public class FlashSaleCoolDown : MonoBehaviour

    {

        [SerializeField] TimerBehaviour m_Time;

        [SerializeField] RectTransform m_ContainerAdvance;

        [SerializeField] Text m_AdvanceTime;



        private void OnEnable()

        {

@@ -30,20 +32,43 @@
            if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase))

            {

                var operation = (operationBase as OperationFlashSale);

                var seconds = operation.GetResetSurplusTime();

                if (seconds * TimeSpan.TicksPerSecond >= TimeSpan.TicksPerDay || seconds <= 0)

                bool inAdvance = false;

                var seconds = 0;

                if (operation.InAdvanceTime(TimeUtility.ServerNow))

                {

                    inAdvance = true;

                    seconds = operation.GetSecondsBeforeStart(TimeUtility.ServerNow);

                }

                else

                {

                    seconds = operation.GetResetSurplusTime();

                }



                m_ContainerAdvance.gameObject.SetActive(inAdvance);

                if (inAdvance)

                {

                    if (m_Time.gameObject.activeSelf)

                    {

                        DisplayTime(0);

                    }

                    DisplayAdvance(seconds);

                }

                else

                {

                    m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);

                    if (!m_Time.gameObject.activeSelf)

                    if (seconds * TimeSpan.TicksPerSecond >= TimeSpan.TicksPerDay || seconds <= 0)

                    {

                        DisplayTime(seconds);

                        if (m_Time.gameObject.activeSelf)

                        {

                            DisplayTime(0);

                        }

                    }

                    else

                    {

                        m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);

                        if (!m_Time.gameObject.activeSelf)

                        {

                            DisplayTime(seconds);

                        }

                    }

                }

            }

@@ -60,6 +85,11 @@
            m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);

            m_Time.Begin(DateTime.Now.AddTicks(seconds * TimeSpan.TicksPerSecond));

        }



        void DisplayAdvance(int seconds)

        {

            m_AdvanceTime.text = Language.Get("OperationAdvanceOpen", TimeUtility.SecondsToHMS(seconds));

        }

    }

}


 System/OpenServerActivity/FlashSaleModel.cs

@@ -114,7 +114,8 @@
                OperationFlashSale operation = operationBase as OperationFlashSale;

                if (operation.InAdvanceTime(TimeUtility.ServerNow))

                {

                    SysNotifyMgr.Instance.ShowTip("InOperationTimeError");

                    var seconds = operation.GetSecondsBeforeStart(TimeUtility.ServerNow);

                    SysNotifyMgr.Instance.ShowTip("FlashSaleAdvanceLimit", TimeUtility.SecondsToHMS(seconds));

                    return;

                }

                if (!operation.InTime(TimeUtility.ServerNow))


 System/OpenServerActivity/FlashSaleWin.cs

@@ -147,7 +147,7 @@
            {

                if (inAdvance)

                {

                    m_SurplusTime.text = string.Format("{0}之后开启", TimeUtility.SecondsToDHMSCHS(seconds));

                    m_SurplusTime.text = Language.Get("OperationAdvanceOpen", TimeUtility.SecondsToDHMSCHS(seconds));

                }

                else

                {


 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);

            }

        }



    }

}


 System/Welfare/MultipleExpModel.cs

@@ -152,10 +152,36 @@
            return operation != null && operation.SatisfyOpenCondition() && operation.InDay(TimeUtility.ServerNow);

        }



        bool LastDayOutTime()

        {

            OperationBase operation;

            if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipleExp, out operation))

            {

                if (operation.allDay)

                {

                    return false;

                }

                if (operation.IsLastDay)

                {

                    bool outTime = true;

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

                    {

                        if (operation.times[i].CompareTime(TimeUtility.ServerNow) != 1)

                        {

                            outTime = false;

                            break;

                        }

                    }

                    return outTime;

                }

            }

            return false;

        }



        private void UpdateRedpoint()

        {

            multipleExpRedpoint.state = RedPointState.None;

            if (todayRemind || !Open())

            if (todayRemind || !Open() || LastDayOutTime())

            {

                multipleExpRedpoint.state = RedPointState.None;

                return;


 System/Welfare/OperationBase.cs

@@ -42,6 +42,14 @@
            get { return endDate - startDate; }

        }



        public bool IsLastDay

        {

            get

            {

                return IndexOfDays(TimeUtility.ServerNow) == totalDays;

            }

        }



        public bool InTime(DateTime time)

        {

            if (!InDay(time))


 Utility/LanguageVerify.cs

@@ -150,7 +150,8 @@
    public void VerifyChat(string content, ChatInfoType channelType, Action<bool, string> callback)

    {

        int channel = 0;

        if (!requireVerify || !GetChannel(channelType, out channel) || PlayerDatas.Instance.baseData.VIPLv >= 4)

        if (!requireVerify || !GetChannel(channelType, out channel) || PlayerDatas.Instance.baseData.VIPLv >= 4

            || IsFairyFeast(channelType))

        {

            if (callback != null)

            {

@@ -343,6 +344,17 @@
        }

        return true;

    }

    bool IsFairyFeast(ChatInfoType type)

    {

        var dailyQuestModel = ModelCenter.Instance.GetModel<DailyQuestModel>();

        DailyQuestOpenTime dailyQuestOpenTime;

        if (dailyQuestModel.TryGetOpenTime((int)DailyQuestType.FairyFeast, out dailyQuestOpenTime))

        {

            return type == ChatInfoType.Fairy && dailyQuestOpenTime.InOpenTime();

        }

        return false;

    }


    public class VerifyResponse

    {