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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Common/UI_AlertUI.cs

@@ -8,7 +8,6 @@ namespace UI.Common
     {
         public GComponent target;
         public GGraph m_graphBg;
-        public GComponent m_bg;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
         public GButton m_btnLeft;
@@ -61,7 +60,6 @@ namespace UI.Common
         private void Init(GComponent comp)
         {
             m_graphBg = (GGraph)comp.GetChild("graphBg");
-            m_bg = (GComponent)comp.GetChild("bg");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
@@ -70,7 +68,6 @@ namespace UI.Common
         public void Dispose(bool disposeTarget = false)
         {
             m_graphBg = null;
-            m_bg = null;
             m_txtContent = null;
             m_txtTips = null;
             m_btnLeft = null;

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/BadgeChooseView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
             base.OnShown();
             selectedID = (viewData == null ? -1 : (int)viewData);
             _ui.m_list.numItems = _badgeList.Count;
-
+            _ui.m_list.scrollPane.ScrollTop();
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/ChangeNameView.cs

@@ -36,6 +36,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnSure.onClick.Add(OnClickBtnSureAsync);
             _ui.m_btnRandom.onClick.Add(RandomRoleName);