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

client_Zxw

2018-09-03 d861858962ac0aaaba2566b8c7b75c5430f2d7f1

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

 Core/NetworkPackage/ServerPack/HAA_SaleActivity/HAA16_tagMCSuperGiftInfo.cs

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



public class HAA16_tagMCSuperGiftInfo : GameNetPackBasic {


    public uint GiftID;    //商品ID


    public byte RemainDay;    //剩余天数

    public string EndtDate;    // 结束日期 y-m-d




    public HAA16_tagMCSuperGiftInfo () {


        _cmd = (ushort)0xAA16;


@@ -13,7 +13,7 @@



    public override void ReadFromBytes (byte[] vBytes) {


        TransBytes (out GiftID, vBytes, NetDataType.DWORD);


        TransBytes (out RemainDay, vBytes, NetDataType.BYTE);

        TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10);

    }





}



 System/DailyQuest/DailyQuestModel.cs

@@ -617,7 +617,14 @@
                                    }

                                    break;

                                case DailyQuestType.FairyGrabBoss:

                                    dailyQuest.redpoint.state = completedTimes >= totalTimes ? RedPointState.Simple : RedPointState.None;

                                    if (dailyQuestState == DailyQuestState.Normal)

                                    {

                                        dailyQuest.redpoint.state = completedTimes >= totalTimes ? RedPointState.None : RedPointState.Simple;

                                    }

                                    else

                                    {

                                        dailyQuest.redpoint.state = RedPointState.None;

                                    }

                                    break;

                                default:

                                    if (dailyQuestState == DailyQuestState.CanBuyTimes || dailyQuestState == DailyQuestState.Normal)


 System/DailyQuest/DailyQuestWin.cs

@@ -538,40 +538,7 @@
                var config = Config.Instance.Get<TreasureConfig>(gotoTreasureId);

                treasureModel.selectedTreasure = gotoTreasureId;

                treasureModel.currentCategory = (TreasureCategory)config.Category;



                switch (gotoTreasureId)

                {

                    case 101:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DhszTs);

                        break;

                    case 102:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.HyqTs);

                        break;

                    case 103:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.GyzTs);

                        break;

                    case 104:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.LqhTs);

                        break;

                    case 105:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.PlyTs);

                        break;

                    case 106:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.XhqTs);

                        break;

                    case 107:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DhzTs);

                        break;

                    case 108:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.ZjhlTs);

                        break;

                    case 109:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.YldTs);

                        break;

                    case 110:

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StfTs);

                        break;

                }

                WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.TreasureCollectSoul);

            }

        }




 System/Dungeon/DungeonTargetBehaviour.cs

@@ -100,7 +100,8 @@
                        m_TargetNums[_index].text=StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp), "/", UIHelper.ReplaceLargeNum((ulong)_targetValue));
                        break;
                    }
                    m_TargetNums[_index].text = UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp);
                    m_TargetNums[_index].text = StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp),
                        model.mission.isFullExp == 1 ? StringUtility.Contact("  ", Language.Get("FullExp")) : string.Empty);
                    break;
                case DungeonTargetType.Score:
                    if (_targetValue > 0) {

 System/OpenServerActivity/OSGiftModel.cs

@@ -77,13 +77,10 @@


        public int timeOverdueGiftId { get; private set; }

        public DateTime overDueTime = DateTime.Now;

        public bool allOverdue { get; private set; }

        public void UpdateTime(HAA16_tagMCSuperGiftInfo package)

        {

            timeOverdueGiftId = (int)package.GiftID;

            var _time = new DateTime(TimeUtility.Year, TimeUtility.Month, TimeUtility.Day, 0, 0, 0);

            overDueTime = _time.AddDays(package.RemainDay);

            allOverdue = package.RemainDay == 0;

            overDueTime = ParseOverdueTime(package.EndtDate);

            bool _activate = CheckActivate();

            if (activate != _activate)

            {

@@ -98,6 +95,16 @@
                timeLimitUpdate();

            }

            UpdateRedpoint();

        }



        DateTime ParseOverdueTime(string _date)

        {

            var array = _date.Split('-');

            var year = int.Parse(array[0]);

            var month = int.Parse(array[1]);

            var day = int.Parse(array[2]);

            var time = new DateTime(year, month, day, 0, 0, 0);

            return time.AddDays(1);

        }



        private void FirstChargeRewardEvent()

@@ -121,10 +128,6 @@
            {

                return false;

            }

            if (allOverdue)

            {

                return false;

            }

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift,out _list);

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

@@ -144,15 +147,11 @@


        public bool IsGiftOverdue(int _id)

        {

            if (allOverdue || _id < timeOverdueGiftId)

            {

                return true;

            }

            if (_id == timeOverdueGiftId)

            {

                return TimeUtility.ServerNow >= overDueTime;

            }

            return false;

            return true;

        }



        public bool IsGiftBuy(int _id)

@@ -182,7 +181,6 @@


        public void OnBeforePlayerDataInitialize()

        {

            allOverdue = false;

            timeOverdueGiftId = 0;

        }




 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -117,7 +117,7 @@
        void DisplayTimer()

        {

            var seconds = (int)(giftModel.overDueTime - TimeUtility.ServerNow).TotalSeconds;

            if (giftModel.allOverdue || giftModel.IsGiftOverdue(currentSelectId) || seconds <= 0)

            if (giftModel.IsGiftOverdue(currentSelectId) || seconds <= 0)

            {

                m_ContainerTime.gameObject.SetActive(false);

                m_Overdue.gameObject.SetActive(true);


 System/WindowJump/WindowJumpMgr.cs

@@ -589,6 +589,9 @@
            case JumpUIType.TreasureSoul:

                SetJumpLogic<TreasureSoulWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.TreasureCollectSoul:

                SetJumpLogic<TreasureLevelUpWin>(0);

                break;

            case JumpUIType.VipRechargeFunc3:

            case JumpUIType.OSTimeLimitGift:

            case JumpUIType.FlashSale:

@@ -1153,6 +1156,7 @@
    OpenServerGift1 = 223, //超值礼包1

    OpenServerGift2 = 224, //超值礼包2

    OpenServerGift3 = 225, //超值礼包3

    TreasureCollectSoul = 226,//法宝集魂

    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

    GyzTs = 1003,//鬼牙刃功法提升界面


 Utility/ExceptionCatcher.cs

@@ -8,12 +8,16 @@
    public static void Init()

    {

#if !UNITY_EDITOR

            BuglyAgent.ConfigDebugMode(false);

            BuglyAgent.ConfigAutoReportLogLevel(LogSeverity.LogException);

            BuglyAgent.ConfigDefault(VersionConfig.Get().appId, VersionConfig.Get().version, SystemInfo.deviceName, 0);

            
        BuglyAgent.ConfigDebugMode(false);

        BuglyAgent.ConfigAutoReportLogLevel(LogSeverity.LogException);



        var channel = VersionConfig.Get().appId;

        var versionInfo = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", VersionConfig.Get().buildTime);

        var deviceName = SystemInfo.deviceName;

        BuglyAgent.ConfigDefault(channel, versionInfo, deviceName, 0);



#if UNITY_ANDROID

            BuglyAgent.InitWithAppId("bff7374864");

        BuglyAgent.InitWithAppId("bff7374864");

#elif UNITY_IPHONE || UNITY_IOS

            BuglyAgent.InitWithAppId("553c67c376");

#endif