Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

GameClient/Assets/Game/HotUpdate/ServerProxy/BattlePassTaskSProxy.cs

@@ -138,6 +138,7 @@ namespace GFGGame
                 }
             }
             EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
+            EventAgent.DispatchEvent(ConstMessage.STORE_BROCADE_WEAV_RECEIVE);
             BonusController.TryShowBonusList(bonusList, onSuccess);
             return true;
         }

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

@@ -41,6 +41,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             _ui.m_loaBg.onTouchBegin.Add(OnClickBg);
+            _ui.m_probar.max = 0;
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_topEffect, "ui_LuckyBox", "SJJD_CradUp");
             _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_probarEffect, "ui_LuckyBox", "SJJD_CradUP_once");
@@ -66,8 +67,9 @@ namespace GFGGame
                 _ui.m_icon.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
             }
             _ui.m_probar.max = totalCount;
-            _ui.m_probar.value = count;
+            _ui.m_probar.value = count - 1;
             _ui.m_t_open.Play();
+            _ui.m_probar.TweenValue(count, 0.7f);
 
         }
         private void OnClickBg()
@@ -85,7 +87,8 @@ namespace GFGGame
 
         protected override void OnHide()
         {
-            
+            _ui.m_probar.max = 0;
+            _ui.m_probar.value = 0;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1089,8 +1089,21 @@ namespace GFGGame
 
         private void ServerTimeUpdate(object param = null)
         {
+            long timestamp = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds;
+            if (Math.Abs(TimeHelper.ServerNow() - timestamp) >= 50000)
+            {
                 dateTime = unixStartTime.AddMilliseconds(TimeHelper.ServerNow());
-                _ui.m_serverTime.text = string.Format("服务器时间：{0}", dateTime);
+                _ui.m_serverTime.text = dateTime.ToString();
+                if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+                {
+                    _ui.m_serverTime.visible = true;
+                }
+            }
+            else
+            {
+                _ui.m_serverTime.visible = false;
+            }
+
         }
 
     }