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

* 'master' of http://10.108.64.190:3000/gfg/Client:
  月卡弹窗
  月卡奖励弹窗
  抽奖时间显示错误
  抽奖报错
  分解材料展示
  月卡奖励

FGUIProject/assets/ClothingDecompose/ClothingDecomposeRuleUI.xml

@@ -5,7 +5,8 @@
     <image id="n3_qyr6" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="57,120"/>
     <text id="n1_qyr6" name="txtTitle" xy="335,44" size="292,64" fontSize="48" color="#9b7853" text="服装分解规则"/>
     <text id="n2_qyr6" name="txtRule" xy="71,158" size="804,46" fontSize="34" color="#aa865f" autoSize="height" text="分解多余的衣服可获得金币和分解材料1.2."/>
-    <list id="n4_qyr6" name="listReward" xy="-93,315" pivot="0.5,0.5" size="1149,264" scale="0.78,0.78" layout="row" colGap="40" defaultItem="ui://h9mv1l71wlc24" align="center">
+    <list id="n4_qyr6" name="listReward" xy="-52,315" pivot="0.5,0.5" size="1066,264" scale="0.78,0.78" layout="row" overflow="scroll" scroll="horizontal" colGap="40" defaultItem="ui://h9mv1l71wlc24" align="center">
+      <item/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" fill="scaleMatchWidth">
+    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391i" fill="scaleMatchWidth">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
@@ -74,7 +74,7 @@
     <component id="n53_e050" name="comStar1_2_9" src="l5nzq" fileName="components/ComStar.xml" xy="626,867" group="n30_iakb"/>
     <group id="n30_iakb" name="grpComStar2" xy="196,223" size="688,1531" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
-      <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
+      <gearDisplay2 controller="ctrlRewardsType" pages="2,6" condition="0"/>
       <relation target="" sidePair="center-center,top-top"/>
     </group>
     <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">

FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -3,5 +3,6 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n8_t6j1" name="comLine" src="duufteb" fileName="components/ComponentLine.xml" xy="5,5" pivot="0,0.5" anchor="true" size="850,24"/>
+    <graph id="n9_jx6z" name="n9" xy="-41,-45" size="100,100" type="rect"/>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/Controller/BonusController.cs

@@ -12,6 +12,7 @@ namespace GFGGame
             {
                 List<ItemData> bonusList = ItemUtil.CreateItemDataList(bonusInfos);
                 CheckUpdateAutoUseItem(bonusList);
+                if (bonusList.Count == 0) return;
                 ViewManager.Show<RewardView>(new object[] { bonusList, onSuccess });
             }
         }
@@ -20,6 +21,7 @@ namespace GFGGame
             if (bonusList != null && bonusList.Count > 0)
             {
                 CheckUpdateAutoUseItem(bonusList);
+                if (bonusList.Count == 0) return;
                 ViewManager.Show<RewardView>(new object[] { bonusList, onSuccess });
             }
         }
@@ -35,11 +37,8 @@ namespace GFGGame
                 if (itemCfg != null && itemCfg.itemType == ConstItemType.USEABLE &&
                     (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
                 {
-                    if(itemCfg.itemsArr != null && itemCfg.itemsArr.Length > 0)
-                    {
-                        itemDatasFromAutoUsedItem.AddRange(ItemUtil.CreateItemDataList(itemCfg.itemsArr, t.num));
-                        bonusList.RemoveAt(i);
-                    }
+                    itemDatasFromAutoUsedItem.AddRange(ItemUtil.CreateItemDataList(itemCfg.itemsArr, t.num));
+                    bonusList.RemoveAt(i);
                 }
             }
             bonusList.AddRange(itemDatasFromAutoUsedItem);

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

@@ -24,7 +24,7 @@ namespace GFGGame
 
 
         public int times = 0;
-        public int luckyBoxId;
+        public int luckyBoxIndex;
         public List<ItemData> RewardList
         {
             get { return _rewardsList; }

GameClient/Assets/Game/HotUpdate/ServerProxy/LuckyBoxSProxy.cs

@@ -20,7 +20,7 @@ namespace GFGGame
                         ActivityDataManager.Instance.allPlayTimes += response.Times;
                     }
                     LuckyBoxDataManager.Instance.times = response.Times;
-                    LuckyBoxDataManager.Instance.luckyBoxId = response.LuckyBoxId;
+                    // LuckyBoxDataManager.Instance.luckyBoxIndex = response.LuckyBoxId;
                     LuckyBoxDataManager.Instance.RewardList = ItemUtil.CreateItemDataList(response.bonusList);
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/ServerProxy/ShopSProxy.cs

@@ -12,6 +12,25 @@ namespace ET
             ShopSProxy.OnBuySuccess(message.BuyId, message.Times, message.TotalTimes, dTime <= 5000);
         }
     }
+    public class NoticeMonthCardOpen : AMHandler<S2C_NoticeMonthCardOpen>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeMonthCardOpen message)
+        {
+            MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege1);
+            int[][] itemData = null;
+
+            if (message.MonthCardType == MonthCardType.Gold)
+            {
+                itemData = new int[][] { new int[] { privilegeCfg.paramsArr[0], privilegeCfg.value1Arr[0] } };
+            }
+            else if (message.MonthCardType == MonthCardType.BlackGold)
+            {
+                itemData = new int[][] { new int[] { privilegeCfg.paramsArr[0], privilegeCfg.value2Arr[0] } };
+            }
+            BonusController.TryShowBonusList(itemData);
+            await ETTask.CompletedTask;
+        }
+    }
 }
 
 namespace GFGGame
@@ -67,7 +86,7 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
             EventAgent.DispatchEvent(ConstMessage.CONTINUOUS_REBATE_GIFT_SHOP_BUY, shopCfg);
-            if(showItems)
+            if (showItems)
             {
                 //判断倍数
                 var multiple = 1;
@@ -75,7 +94,7 @@ namespace GFGGame
                 {
                     multiple = 2;
                 }
-                List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, times * shopCfg.itemNum* multiple);
+                List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, times * shopCfg.itemNum * multiple);
                 BonusController.TryShowBonusList(itemDatas);
             }
             EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
@@ -127,6 +146,19 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    MonthlyCardPrivilegeCfg privilegeCfg = MonthlyCardPrivilegeCfgArray.Instance.GetCfg(MonthCardPrivilegeType.Privilege1);
+                    int[][] itemData = null;
+
+                    if (monthCardType == MonthCardType.Gold)
+                    {
+                        itemData = new int[][] { new int[] { privilegeCfg.paramsArr[0], privilegeCfg.value1Arr[0] } };
+                    }
+                    else if (monthCardType == MonthCardType.BlackGold)
+                    {
+                        itemData = new int[][] { new int[] { privilegeCfg.paramsArr[0], privilegeCfg.value2Arr[0] } };
+                    }
+                    BonusController.TryShowBonusList(itemData);
+
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Utils/TimeUtil.cs

@@ -146,7 +146,7 @@ namespace GFGGame
         /// <param name="timeMsec"></param>
         public static string FormattingTimeTo_HHmmss(long timeMsec)
         {
-            TimeSpan ts = new TimeSpan(0, 0, ((int)timeMsec / 1000));
+            TimeSpan ts = new TimeSpan(0, 0, (int)(timeMsec / 1000));
             string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
             string strM = ts.Minutes.ToString().Length == 1 ? "0" + ts.Minutes : ts.Minutes.ToString();
             string strS = ts.Seconds.ToString().Length == 1 ? "0" + ts.Seconds : ts.Seconds.ToString();
@@ -159,7 +159,7 @@ namespace GFGGame
         /// <param name="timeMsec"></param>
         public static string FormattingTimeTo_DDHHmm(long timeMsec)
         {
-            TimeSpan ts = new TimeSpan(0, 0, ((int)timeMsec / 1000));
+            TimeSpan ts = new TimeSpan(0, 0, (int)(timeMsec / 1000));
             // string strD = ts.Days.ToString().Length == 1 ? "0" + ts.Days : ts.Days.ToString();
             // string strH = ts.Hours.ToString().Length == 1 ? "0" + ts.Hours : ts.Hours.ToString();
             // string strM = ts.Minutes.ToString().Length == 1 ? "0" + ts.Minutes : ts.Minutes.ToString();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -73,6 +73,7 @@ namespace GFGGame
             _valueBarController.UpdateList(new List<int>() { _luckyBoxCfg.costID });
             _luckyBoxCtrl.OnShown(_luckyBoxCfg.id);
             LuckyBoxDataManager.Instance.currentBoxId = _luckyBoxCfg.id;
+            LuckyBoxDataManager.Instance.luckyBoxIndex = 2;
             UpGiftBox();
             Timers.inst.Add(1, 0, UpdateTime);
             UpdateView();

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -99,8 +99,6 @@ namespace GFGGame
                 }
             }
 
-            LuckyBoxDataManager.Instance.luckyBoxId = 0;
-
             UpdateView();
         }
         private void UpdateView()

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
 
             _isLuckyBox = LuckyBoxDataManager.Instance.luckyBoxIds.IndexOf(LuckyBoxDataManager.Instance.currentBoxId) >= 0;
-            _ui.m_ctrlRewardsType.selectedIndex = _isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
+            _ui.m_ctrlRewardsType.selectedIndex = LuckyBoxDataManager.Instance.luckyBoxIndex;// _isLuckyBox ? (LuckyBoxDataManager.Instance.currentBoxId - 1) : 0;
             // string resPath = string.Format("cj_tp_{0}", _isLuckyBox ? LuckyBoxDataManager.Instance.currentBoxId : 1);
             _ui.m_bg.url = ResPathUtil.GetBgImgPath("zx_bg");
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -125,6 +125,8 @@ namespace GFGGame
             _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Count;
             _ui.m_listBg.ScrollToView(_curIndex);
             _ui.m_listBg.scrollPane.decelerationRate = 0.8f;
+            LuckyBoxDataManager.Instance.luckyBoxIndex = _curIndex;
+
 
             OnListBgScroll();
             updateBoxEffect();
@@ -190,7 +192,7 @@ namespace GFGGame
             UpdateListItem();
             _ui.m_btnLeft.grayed = _curIndex <= 0;
             _ui.m_btnRight.grayed = _curIndex >= _ui.m_listBg.numItems - 1;
-
+            LuckyBoxDataManager.Instance.luckyBoxIndex = _curIndex;
         }
 
         private void UpdateListItem()

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

@@ -136,10 +136,10 @@ namespace GFGGame
             _ui.m_txtTime.visible = endTime > TimeHelper.ServerNow();
             _ui.m_loaCard.url = iconUrl;
             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(monthCfg.shopId);
-            if(shopCfg.onceShopId > 0)
+            if (shopCfg.onceShopId > 0)
             {
                 //如果配置了首次购买物品，使用特殊id购买
-                if(ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.onceShopId) <= 0)
+                if (ShopDataManager.Instance.GetGoodsBuyNumById(shopCfg.onceShopId) <= 0)
                 {
                     shopCfg = ShopCfgArray.Instance.GetCfg(shopCfg.onceShopId);
                 }
@@ -165,6 +165,7 @@ namespace GFGGame
             GObject obj = context.sender as GObject;
             int goodsId = (int)obj.data;
             ShopSProxy.ReqShopBuy(goodsId).Coroutine();
+
         }
         private async void OnBtnGetClick(EventContext context)
         {