Merge remote-tracking branch 'origin/master' into ios

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -66,10 +66,13 @@ namespace GFGGame
             base.OnShown();
             UpdateCardList();
 
-            // 以下代码只在从图鉴进入时才执行
-            ResetSelectedItem();
-            _ui.m_listCard.scrollPane.ScrollTop();
-            _ui.m_In.Play();
+            if (backRefresh)
+            {
+                ResetSelectedItem();
+                _ui.m_listCard.scrollPane.ScrollTop();
+                _ui.m_In.Play();
+            }
+
         }
 
         protected override void OnHide()
@@ -132,7 +135,7 @@ namespace GFGGame
             {
                 CardData cardData = CardDataManager.GetCardDataById(_cardList[index]);
                 cardData.fromUIType = typeof(CardGuideView).FullName;
-                ViewManager.Show<CardFosterView>(cardData);
+                ViewManager.Show<CardFosterView>(cardData, false, false);
             }   
         }
 

GameClient/Assets/Game/HotUpdate/Views/Login/RegisterView.cs

@@ -8,7 +8,7 @@ namespace GFGGame
     {
         private UI_RegisterUI _ui;
 
-        private const string CODE = "1818168";
+        private const string CODE = "";
 
         public override void Dispose()
         {