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

FGUIProject/assets/DailyWelfare/package.xml

@@ -60,6 +60,22 @@
     <image id="idkd1j" name="top_line.png" path="/images/"/>
     <component id="idkd1k" name="ComSignBg.xml" path="/components/"/>
     <component id="idkd1l" name="ComSignTop.xml" path="/components/"/>
+    <image id="vols1m" name="hdbn_wz_mrqd.png" path="/images/"/>
+    <image id="vols1n" name="hdbn_wz_xslc_wylh.png" path="/images/"/>
+    <image id="vols1o" name="hdbn_wz_xslc_xslgt.png" path="/images/"/>
+    <image id="vols1p" name="hdbn_xslc_wylh.png" path="/images/"/>
+    <image id="vols1q" name="hdbn_xslc_xslgt.png" path="/images/"/>
+    <image id="vols1r" name="hdbn_zsx.png" path="/images/"/>
+    <image id="vols1s" name="hdrk_biaotz.png" path="/images/"/>
+    <image id="vols1t" name="hdrk_zz.png" path="/images/"/>
+    <image id="vols1u" name="zjm_guanggao_kuang.png" path="/images/"/>
+    <image id="vols1v" name="hd_sj_dkuang.png" path="/images/"/>
+    <image id="vols1w" name="hdbn_db.png" path="/images/"/>
+    <image id="vols1x" name="hdbn_mrbj.png" path="/images/"/>
+    <image id="vols1y" name="hdbn_mrqd.png" path="/images/"/>
+    <image id="vols1z" name="hdbn_qtdl.png" path="/images/"/>
+    <image id="vols20" name="hdbn_qtdl_kqdnf.png" path="/images/"/>
+    <image id="vols21" name="hdbn_wz_mrbj.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -210,11 +210,11 @@ namespace GFGGame
         {
             if (monthCardType == MonthCardType.Gold)
             {
-                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldEndTime);
+                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
             }
             else if (monthCardType == MonthCardType.BlackGold)
             {
-                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldEndTime);
+                return TimeHelper.ServerNow() < GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
             }
             return true;
         }

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

@@ -98,6 +98,12 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("奖励已领取");
                 return;
             }
+
+            if (GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime) < TimeHelper.ServerNow())
+            {
+                PromptController.Instance.ShowFloatTextPrompt("开通黑金卡可领");
+                return;
+            }
             ShopSProxy.ReqGetMonthCardItem(month).Coroutine();
 
         }

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

@@ -140,6 +140,7 @@ namespace GFGGame
             _ui.m_listSubTab.selectedIndex = 0;
             _curSubTabIndex = 0;
             OnListSubTabChange(_curSubTabIndex);
+            UpdateRedDot();
         }
         private void RenderListSubTabItem(int index, GObject obj)
         {
@@ -199,10 +200,8 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpReward());
-            if (_ui.m_comTab.m_c1.selectedIndex == ConstStoreSubId.STORE_CHARGE + 1)
-            {
-                RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpReward());
-            }
+
+            RedDotController.Instance.SetComRedDot(_ui.m_listSubTab.GetChildAt(ConstStoreSubId.STORE_CHARGE_ADDUP).asCom, RedDotDataManager.Instance.GetChargeAddUpReward() && (_ui.m_comTab.m_c1.selectedIndex == ConstStoreSubId.STORE_CHARGE + 1));
         }
     }
 }