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

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

@@ -245,7 +245,7 @@ namespace GFGGame
             else if (hasNum >= costNum)
             {
                 if(LuckyBoxDataManager.Instance.CHECK_TIPS_OPEN == false)
-                    AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); });
+                    AlertUI.Show(string.Format("是否花费{0}个{1}摘星{2}次？", costNum, itemCfg.name, times)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(); }).SetShowCheck(true);
                 else
                     onSuccess();
             }

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

@@ -7,6 +7,7 @@ namespace UI.Common
     public partial class UI_AlertUI
     {
         public GComponent target;
+        public Controller m_checkType;
         public GGraph m_graphBg;
         public GTextField m_txtContent;
         public GTextField m_txtTips;
@@ -60,6 +61,7 @@ namespace UI.Common
 
         private void Init(GComponent comp)
         {
+            m_checkType = comp.GetController("checkType");
             m_graphBg = (GGraph)comp.GetChild("graphBg");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
@@ -69,6 +71,7 @@ namespace UI.Common
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_checkType = null;
             m_graphBg = null;
             m_txtContent = null;
             m_txtTips = null;

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -233,6 +233,16 @@ namespace GFGGame
             return this;
         }
 
+        public IAlert SetShowCheck(bool isShow = false)
+        {
+            if(isShow)
+                this._ui.m_checkType.selectedIndex = 1;
+            else
+                this._ui.m_checkType.selectedIndex = 0;
+
+            return this;
+        }
+
         public IAlert SetData(object data)
         {
             this.m_data = data;

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/IAlert.cs

@@ -9,6 +9,7 @@ namespace GFGGame
         IAlert SetLeftButton(bool isShow, string textLeft = "取消", AlertCallback callback = null);
         IAlert SetRightButton(bool isShow, string textRight = "确认", AlertCallback callback = null);
         IAlert SetData(object data);
+        IAlert SetShowCheck(bool isShow);
         IAlert SetClickBlankToClose(bool value);
     }
 }