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

client_linchunjie

2018-11-16 f781775e83f2df9735bd5c832e653bbd683df50b

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

 System/BetterItemGet/BetterEquipGetModel.cs

@@ -71,6 +71,7 @@
                bool isCoolEnd = coolData == null || coolData.GetRemainTime() <= 0 ? true : false;

                if(isCoolEnd)

                {

                    DebugEx.Log("UpdateCoolTime:" + _equip.itemId);

                    PackSendQuestMgr.Instance.SendPutOnQuest(ItemWinBtnType.putOn,guid);

                    ReportConfirmBetterEquip(guid);

                }

@@ -167,11 +168,6 @@
                        {

                            showEquipRefreshEvent();

                        }



                        if(CheckIsAutoEquip(betterModel))

                        {

                            KnapsackTimeCDMgr.Instance.Register(betterModel.itemInfo.ItemGUID, betterModel.itemId, autoEquipCoolTime);

                        }

                    }

                }

                else

@@ -211,10 +207,6 @@
                showEquipRefreshEvent();

            }

            var betterModel = playerPack.GetItemModelByGUID(_guid);

            if (CheckIsAutoEquip(betterModel))

            {

                KnapsackTimeCDMgr.Instance.Register(betterModel.itemInfo.ItemGUID, betterModel.itemId, autoEquipCoolTime);

            }

        }



        private void OnPackageRefresh(PackType _packType)

@@ -223,7 +215,6 @@
            {

                return;

            }



            var keys = new List<string>(betterEquipModels.Keys);

            for (int i = keys.Count - 1; i >= 0; i--)

            {

@@ -280,7 +271,11 @@
            }

            else if (_packType == PackType.rptItem)

            {

                OnPackageRefresh(_packType);

                var itemModel = playerPack.GetItemModelByIndex(PackType.rptItem,_index);

                if(itemModel == null)

                {

                    OnPackageRefresh(_packType);

                }

            }

        }




 System/DailyQuest/DailyQuestModel.cs

@@ -690,56 +690,57 @@
            var unLock1 = IsDailyQuestUnLock(_lhs);

            var unLock2 = IsDailyQuestUnLock(_rhs);



            DailyQuestOpenTime openTime1;

            TryGetOpenTime(_lhs, out openTime1);



            DailyQuestOpenTime openTime2;

            TryGetOpenTime(_rhs, out openTime2);



            var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek;

            var isActiveDay1 = openTime1.always || openTime1.GetHourMinuteByWeek(dayOfWeek) != null;

            var isActiveDay2 = openTime2.always || openTime2.GetHourMinuteByWeek(dayOfWeek) != null;



            var inOpenTime1 = openTime1.InOpenTime();

            var inOpenTime2 = openTime2.InOpenTime();



            var serverHour = TimeUtility.ServerNow.Hour;

            var serverMinute = TimeUtility.ServerNow.Minute;

            HourMinute hourMinute1;

            var miss1 = openTime1.TryGetTodayNearestOpenTime(out hourMinute1) && hourMinute1.AfterOpenTime(serverHour, serverMinute);

            HourMinute hourMinute2;

            var miss2 = openTime2.TryGetTodayNearestOpenTime(out hourMinute2) && hourMinute2.AfterOpenTime(serverHour, serverMinute);



            if ((unLock1 && inOpenTime1) && !(unLock2 && inOpenTime2))

            if (unLock1 && !unLock2)

            {

                return -1;

            }

            else if (!(unLock1 && inOpenTime1) && (unLock2 && inOpenTime2))

            else if (!unLock1 && unLock2)

            {

                return 1;

            }

            else

            {

                if ((unLock1 && isActiveDay1 && !miss1) && !(unLock2 && isActiveDay2 && !miss2))

                DailyQuestOpenTime openTime1;

                TryGetOpenTime(_lhs, out openTime1);



                DailyQuestOpenTime openTime2;

                TryGetOpenTime(_rhs, out openTime2);



                var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek;

                var isActiveDay1 = openTime1.always || openTime1.GetHourMinuteByWeek(dayOfWeek) != null;

                var isActiveDay2 = openTime2.always || openTime2.GetHourMinuteByWeek(dayOfWeek) != null;



                if (isActiveDay1 && !isActiveDay2)

                {

                    return -1;

                }

                else if (!(unLock1 && isActiveDay1 && !miss1) && (unLock2 && isActiveDay2 && !miss2))

                else if (!isActiveDay1 && isActiveDay2)

                {

                    return 1;

                }

                else

                {

                    if ((unLock1 && !isActiveDay1) && !(unLock2 && !isActiveDay2))

                    var inOpenTime1 = openTime1.InOpenTime();

                    var inOpenTime2 = openTime2.InOpenTime();



                    if (inOpenTime1 && !inOpenTime2)

                    {

                        return -1;

                    }

                    else if (!(unLock1 && !isActiveDay1) && (unLock2 && !isActiveDay2))

                    else if (!inOpenTime1 && inOpenTime2)

                    {

                        return 1;

                    }

                    else

                    else if (!inOpenTime1 && !inOpenTime2)

                    {

                        var serverHour = TimeUtility.ServerNow.Hour;

                        var serverMinute = TimeUtility.ServerNow.Minute;



                        HourMinute hourMinute1;

                        var miss1 = openTime1.TryGetTodayNearestOpenTime(out hourMinute1) && hourMinute1.AfterOpenTime(serverHour, serverMinute);

                        HourMinute hourMinute2;

                        var miss2 = openTime2.TryGetTodayNearestOpenTime(out hourMinute2) && hourMinute2.AfterOpenTime(serverHour, serverMinute);



                        if (!miss1 && miss2)

                        {

                            return -1;

@@ -750,20 +751,12 @@
                        }

                        else

                        {

                            if (unLock1 && !unLock2)

                            {

                                return -1;

                            }

                            else if (!unLock1 && unLock2)

                            {

                                return 1;

                            }

                            else

                            {

                                return _lhs < _rhs ? -1 : 1;

                            }

                            return HourMinute.Compare(hourMinute1, hourMinute2);

                        }



                    }

                    else

                    {

                        return _lhs < _rhs ? -1 : 1;

                    }

                }

            }


 System/KnapSack/BetterItemGetBehaviour.cs

@@ -75,8 +75,13 @@
                {

                    DrawBetterEquip(betterEquip);

                    m_ContainerBetterEquip.gameObject.SetActive(true);

                }



                    var coolData = KnapsackTimeCDMgr.Instance.GetItemCoolById(model.currentEquipGuid);

                    if (model.CheckIsAutoEquip(betterEquip) && coolData == null)

                    {

                        KnapsackTimeCDMgr.Instance.Register(betterEquip.itemInfo.ItemGUID, betterEquip.itemId, model.autoEquipCoolTime);

                    }

                }

            }

        }