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

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/BlindBoxView.cs

@@ -119,7 +119,7 @@ namespace GFGGame
 
         private void OnClickRuleBtn()
         {
-            ViewManager.Show<BlindBoxRuleView>(300036);
+            ViewManager.Show<BlindBoxRuleView>(300037);
         }
 
         private void RenderRewardList(int index, GObject obj)