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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -11,10 +11,10 @@ namespace UI.Main
         public GTextField m_grpLeaguetext;
         public GGroup m_grpLeagueTips;
         public UI_ButtonModle1 m_btnMain;
-        public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
-        public UI_ButtonModle1 m_btnCiPai;
+        public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_ButtonModle1 m_btnCiPai;
         public UI_ButtonModle1 m_btnHaiZhiShi;
         public GGraph m_BottomEffectHolder;
         public UI_ComponentHeadBar m_headBar;
@@ -86,10 +86,10 @@ namespace UI.Main
             m_grpLeaguetext = (GTextField)comp.GetChild("grpLeaguetext");
             m_grpLeagueTips = (GGroup)comp.GetChild("grpLeagueTips");
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
-            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
-            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
+            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
             m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
@@ -118,14 +118,14 @@ namespace UI.Main
             m_grpLeagueTips = null;
             m_btnMain.Dispose();
             m_btnMain = null;
-            m_btnHuanZhuang.Dispose();
-            m_btnHuanZhuang = null;
             m_btnXiuFang.Dispose();
             m_btnXiuFang = null;
-            m_btnCiPai.Dispose();
-            m_btnCiPai = null;
+            m_btnHuanZhuang.Dispose();
+            m_btnHuanZhuang = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
+            m_btnCiPai.Dispose();
+            m_btnCiPai = null;
             m_btnHaiZhiShi.Dispose();
             m_btnHaiZhiShi = null;
             m_BottomEffectHolder = null;

GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs

@@ -89,12 +89,18 @@ namespace GFGGame
             GObject obj = context.sender as GObject;
 
             int month = (int)obj.data;
-            if (month != _month)
+            if (month < _month)
             {
                 PromptController.Instance.ShowFloatTextPrompt("逾期单品不可领取");//奖励不可领
                 return;
             }
 
+            if (month > _month)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("领取时间未到");
+                return;
+            }
+
             if (MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardExclusiveClothesMouth), month))
             {
                 PromptController.Instance.ShowFloatTextPrompt("奖励已领取");