Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Data/LuckyBoxDataManager.cs

@@ -233,7 +233,7 @@ namespace GFGGame
             int costNum = GetCostNum(boxId, times);
             long hasNum = ItemDataManager.GetItemNum(itemCfg.id);
             long freeTime = LuckyBoxDataManager.Instance.GetFreeTime(boxId);
-            if (freeTime > 0 && freeTime < TimeHelper.ClientNow()) {
+            if (freeTime > 0 && freeTime < TimeHelper.ServerNow() && times == LuckyBoxDataManager.ONCE_TIME) {
                 onSuccess();
             }
             else if (hasNum >= costNum)

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -78,8 +78,6 @@ namespace GFGGame
             _ui.m_comList.m_listReward.numItems = 0;
             counTime = 0;
             Timers.inst.Add(0.1f, 3, OnTimerUpdate, 1);
-            //邊框左上角特效
-            //_effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holderTitle, "ui_hd", "GXHD");
         }
 
         private void OnTimerUpdate(object param)

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -144,7 +144,7 @@ namespace GFGGame
             UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
             if (freeTime > 0)
             {
-                long timeDifference = freeTime - TimeHelper.ClientNow();
+                long timeDifference = freeTime - TimeHelper.ServerNow();
                 if (timeDifference> 0)
                 {
                     comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
@@ -335,7 +335,7 @@ namespace GFGGame
             LuckyBoxDataManager.Instance.CheckItemEnough(boxId, LuckyBoxDataManager.ONCE_TIME, async () =>
              {
                  bool result = false;
-                 if (freeTime > 0 && freeTime < TimeHelper.ClientNow())
+                 if (freeTime > 0 && freeTime < TimeHelper.ServerNow())
                     result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, true);
                  else
                     result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME);
@@ -459,7 +459,7 @@ namespace GFGGame
             UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
             if (freeTime > 0)
             {
-                if (freeTime > TimeHelper.ClientNow())
+                if (freeTime > TimeHelper.ServerNow())
                 {
                     comBox.m_comLuckBoxBtn.m_comCostOne.m_c1.selectedIndex = 0;
                     comBox.m_comLuckBoxBtn.m_txtFreeTime.visible = true;

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -82,7 +82,6 @@ namespace GFGGame
             base.OnShown();
             mailDataMgr.CurPage = 0;
             UpdateNormal();
-            _ui.m_openViewAction.Play();
         }
         private void UpdateNormal()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -60,7 +60,6 @@ namespace GFGGame
             _ui.m_listChapter.touchable = false;
             UpdateList();
             Timers.inst.AddUpdate(CheckGuide);
-            _ui.m_openViewAction.Play();
         }
 
         protected override void OnHide()