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

* '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/ItemDataManager.cs

@@ -60,7 +60,7 @@ namespace GFGGame
                     FunctionOpenDataManager.Instance.CheckHasSpecialFunOpen();
                 }
             }
-            if ((itemCfg.itemType == ConstItemType.ITEM || itemCfg.itemType == ConstItemType.GIFT_BAG) &&
+            if ((itemCfg.itemType == ConstItemType.ITEM || itemCfg.itemType == ConstItemType.USEABLE) &&
                 itemData.num > 0)
             {
                 BagDataManager.Instance.Add(itemData);
@@ -100,7 +100,7 @@ namespace GFGGame
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG)
+                    if (itemCfg.itemType == ConstItemType.USEABLE)
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }

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

@@ -1,11 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using ET;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
-using UI.DressUp;
 
 namespace GFGGame
 {

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

@@ -311,10 +311,10 @@ namespace GFGGame
             for (int i = 1; i < vipCfgs.Length; i++)
             {
                 bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfgs[i].id);
-                bool isWeekGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus), vipCfgs[i].id);
-                if ((!isGet || isWeekGet) && RoleDataManager.vipLv >= vipCfgs[i].id) return true;
+                if (!isGet && RoleDataManager.vipLv >= vipCfgs[i].id) return true;
             }
-            return false;
+
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv > 0;
         }
     }
 }

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/ServerProxy/ShopSProxy.cs

@@ -39,9 +39,8 @@ namespace GFGGame
                     }
 
                     List<ItemData> itemDatas;
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                        (itemCfg.subType == ConstItemSubType.GIFT_BAG_AUTO ||
-                         itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT))
+                    if (itemCfg.itemType == ConstItemType.USEABLE &&
+                        (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
                     {
                         itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
                     }

GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -81,7 +81,7 @@ namespace GFGGame
             _ui.m_txtExchangeCount.visible = false;
             _ui.m_comCost.target.visible = false;
             _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
-            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.GIFT_BAG && itemCfg.subType != ConstItemSubType.GIFT_BAG_AUTO;
+            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE && itemCfg.subType != ConstItemSubType.USEABLE_AUTO;
         }
 
         private void UpdateUseView()

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -509,8 +509,8 @@ namespace GFGGame
             ShopCfg shopCfg = context.data as ShopCfg;
             var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
-            if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
+            if (itemCfg.itemType == ConstItemType.USEABLE &&
+                itemCfg.funType == ConstItemFuncType.CONTINUOUS_REWARD_GIFT)
             {
                 int dayNum = EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id);
                 int totalDayNum = dayNum + itemCfg.param2Arr[0];

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/StoreChargeAddUpView.cs

@@ -147,16 +147,16 @@ namespace GFGGame
             }
             item.m_btnGetGiftBag.data = vipCfg.id;
             bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfg.id);
-            item.m_btnGetGiftBag.enabled = !isGet;
+            item.m_btnGetGiftBag.grayed = isGet || vipCfg.id > RoleDataManager.vipLv;
             RedDotController.Instance.SetComRedDot(item.m_btnGetGiftBag, !isGet && RoleDataManager.vipLv >= vipCfg.id);
             if (item.m_btnGetWeekGiftBag.data == null)
             {
                 item.m_btnGetWeekGiftBag.onClick.Add(OnBtnGetWeekGiftBagClick);
             }
             item.m_btnGetWeekGiftBag.data = vipCfg.id;
-            bool isWeekGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus), vipCfg.id);
-            item.m_btnGetWeekGiftBag.enabled = !isWeekGet;
-            RedDotController.Instance.SetComRedDot(item.m_btnGetWeekGiftBag, !isWeekGet && RoleDataManager.vipLv >= vipCfg.id);
+            bool canGet = GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 0 && RoleDataManager.vipLv == vipCfg.id;
+            item.m_btnGetWeekGiftBag.grayed = !canGet;
+            RedDotController.Instance.SetComRedDot(item.m_btnGetWeekGiftBag, canGet);
             UI_ListVipItem.ProxyEnd();
         }
 
@@ -193,6 +193,12 @@ namespace GFGGame
         {
             GObject obj = context.sender as GObject;
             int vipLv = (int)obj.data;
+            bool isGet = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipLv);
+            if (isGet)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("会员等级礼包已领取");
+                return;
+            }
             if (RoleDataManager.vipLv < vipLv)
             {
                 PromptController.Instance.ShowFloatTextPrompt("会员等级不足");
@@ -204,6 +210,11 @@ namespace GFGGame
         {
             GObject obj = context.sender as GObject;
             int vipLv = (int)obj.data;
+            if (GameGlobal.myNumericComponent.GetAsInt(NumericType.VipWeekGetStatus) == 1)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("会员每周礼包已领取");
+                return;
+            }
             if (RoleDataManager.vipLv < vipLv)
             {
                 PromptController.Instance.ShowFloatTextPrompt("会员等级不足");

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

@@ -95,7 +95,7 @@ namespace GFGGame
                     iconUrl = "ui://Store/MonthCard_Icon";
                     monthCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.Gold);
                     isFirstBuy = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldFirstBuy) <= 0;
-                    endTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldEndTime);
+                    endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardGoldEndTime);
                     isGot = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardGoldReward) > 0;
                     for (int i = 0; i < MonthlyCardPrivilegeCfgArray.Instance.dataArray.Length; i++)
                     {
@@ -113,7 +113,7 @@ namespace GFGGame
                     iconUrl = "ui://Store/MonthCard_Icon";
                     monthCfg = MonthlyCardCfgArray.Instance.GetCfg(MonthCardType.BlackGold);
                     isFirstBuy = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldFirstBuy) <= 0;
-                    endTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldEndTime);
+                    endTime = GameGlobal.myNumericComponent.GetAsLong(NumericType.MonthCardBlackGoldEndTime);
                     isGot = GameGlobal.myNumericComponent.GetAsInt(NumericType.MonthCardBlackGoldReward) > 0;
                     for (int i = 0; i < MonthlyCardPrivilegeCfgArray.Instance.dataArray.Length; i++)
                     {

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

@@ -40,14 +40,6 @@ namespace GFGGame
             isfullScreen = true;
             this.bringToFontOnClick = false;
 
-            // StoreTabCfg charge = StoreTabCfgArray.Instance.GetCfgByfunctionId(ConstFunctionId.STORE_CHARGE);
-            // Debug.Log("charge[0]" + charge.subTabArr[0][0]);
-            // Debug.Log("charge[0]" + charge.subTabArr[0][1]);
-            // Debug.Log("charge[0]" + charge.subTabArr[0][2]);
-            // Debug.Log("charge[1]" + charge.subTabArr[1][0]);
-            // Debug.Log("charge[1]" + charge.subTabArr[1][1]);
-            // Debug.Log("charge[1]" + charge.subTabArr[1][2]);
-
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
 
@@ -55,12 +47,12 @@ namespace GFGGame
             _ui.m_comTab.m_c1.onChanged.Add(OnTabChange);
             _ui.m_listSubTab.itemRenderer = RenderListSubTabItem;
             _ui.m_listSubTab.onClickItem.Add(OnListSubTabClick);
-            // _ui.m_listSubTab.selectionController.onChanged.Add(OnListSubTabClick);
 
         }
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
         }
         protected override void OnShown()
         {
@@ -85,6 +77,8 @@ namespace GFGGame
                 _ui.m_listSubTab.ScrollToView(_curSubTabIndex);
                 OnListSubTabChange(_curSubTabIndex);
             }
+
+            UpdateRedDot();
         }
 
         protected override void OnHide()
@@ -97,6 +91,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateRedDot);
 
         }
         private void OnClickBtnBack()
@@ -145,6 +140,7 @@ namespace GFGGame
             _ui.m_listSubTab.selectedIndex = 0;
             _curSubTabIndex = 0;
             OnListSubTabChange(_curSubTabIndex);
+            UpdateRedDot();
         }
         private void RenderListSubTabItem(int index, GObject obj)
         {
@@ -162,10 +158,7 @@ namespace GFGGame
                 menu2 = int.Parse(_storeTabCfgs[index][1]);
             }
             item.data = index;
-            if (menu2 == ConstStoreSubId.STORE_CHARGE_ADDUP)
-            {
-                RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, RedDotDataManager.Instance.GetChargeAddUpReward());
-            }
+
         }
         private void OnListSubTabClick(EventContext context)
         {
@@ -207,6 +200,8 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn0.target, 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));
         }
     }
 }