Merge branch 'yujie' of http://10.108.64.190:3000/gfg/Client into yujie

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1264" opaque="false">
+<component size="962,1310" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1264">
+    <component id="n21_si5z" name="comBg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,1" size="962,1307">
       <relation target="n17_ohbx" sidePair="height-height,middle-middle"/>
     </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,-27" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,643" size="962,596" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="0,-27" size="962,1267" advanced="true" layout="vt" excludeInvisibles="true">
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="0,1" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="0,715" size="962,596" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="0,1" size="962,1310" advanced="true" layout="vt" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>
   </displayList>
-  <relation target="n17_ohbx" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,520">
+<component size="962,714">
   <displayList>
     <text id="n1_s2cc" name="txtName" xy="65,50" size="186,61" group="n24_u2u3" fontSize="46" color="#8a7253" autoClearText="true" text="物品名字"/>
     <text id="n3_s2cc" name="txtOwned" xy="752,72" pivot="1,0" size="129,41" group="n24_u2u3" fontSize="30" color="#90877f" vars="true" text="已拥有:{count=20}"/>
@@ -9,25 +9,25 @@
     <image id="n20_r9ri" name="n20" src="r9ritjl" fileName="imgnew/tc_kuangk.png" xy="354,162" group="n24_u2u3"/>
     <text id="n9_si5z" name="txtDesc" xy="375,181" size="506,166" group="n24_u2u3" fontSize="30" color="#998a79" ubb="true" autoSize="none" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
     <group id="n24_u2u3" name="n24" xy="56,50" size="850,320" group="n25_u2u3" advanced="true"/>
-    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,390" size="50,50" group="n19_si5z"/>
-    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_2.png" xy="300,390" size="50,50" group="n19_si5z"/>
-    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_3.png" xy="525,390" size="50,50" group="n19_si5z"/>
-    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,390" size="50,50" group="n19_si5z"/>
-    <text id="n15_si5z" name="txtGong" xy="135,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n16_si5z" name="txtShang" xy="360,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n17_si5z" name="txtJue" xy="585,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <text id="n18_si5z" name="txtZhi" xy="810,394" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
-    <group id="n19_si5z" name="grpScore" xy="75,390" size="807,50" group="n25_u2u3" advanced="true"/>
-    <list id="n21_u2u3" name="listTag" xy="71,460" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+    <image id="n11_si5z" name="n11" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="75,400" size="50,50" group="n19_si5z"/>
+    <image id="n12_si5z" name="n12" src="842s6i" fileName="imagesNew/kp_sx_2.png" xy="300,400" size="50,50" group="n19_si5z"/>
+    <image id="n13_si5z" name="n13" src="842s6j" fileName="imagesNew/kp_sx_3.png" xy="525,400" size="50,50" group="n19_si5z"/>
+    <image id="n14_si5z" name="n14" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="750,400" size="50,50" group="n19_si5z"/>
+    <text id="n15_si5z" name="txtGong" xy="135,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n16_si5z" name="txtShang" xy="360,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n17_si5z" name="txtJue" xy="585,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n18_si5z" name="txtZhi" xy="810,404" size="61,41" group="n19_si5z" fontSize="30" color="#aa865f" autoClearText="true" text="5000"/>
+    <group id="n19_si5z" name="grpScore" xy="75,400" size="807,50" group="n25_u2u3" advanced="true"/>
+    <list id="n21_u2u3" name="listTag" xy="71,480" size="377,41" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
       <item/>
       <item/>
     </list>
-    <list id="n26_l500" name="listItem" xy="196,521" pivot="0.5,0" size="569,131" group="n25_u2u3" visible="false" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
+    <list id="n26_l500" name="listItem" xy="196,551" pivot="0.5,0" size="569,131" group="n25_u2u3" layout="row" colGap="20" defaultItem="ui://eg2y0ldp9jv6tls" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n25_u2u3" name="n25" xy="56,50" size="850,451" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true"/>
+    <group id="n25_u2u3" name="n25" xy="56,50" size="850,632" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
   </displayList>
   <relation target="n25_u2u3" sidePair="height-height"/>
 </component>

FGUIProject/assets/Store/components/Button3.xml

@@ -15,8 +15,12 @@
     <text id="n4_fqor" name="txt1" xy="31,89" pivot="0.5,0" size="36,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#be8c52" align="center" text="值">
       <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
     </text>
+    <text id="n5_l500" name="txt2" xy="9,22" pivot="0.5,0" size="10,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#be8c52" align="center" text="">
+      <gearColor controller="button" pages="0" values="#be8c52,#000000" default="#985e2a,#000000"/>
+    </text>
   </displayList>
   <Button mode="Radio"/>
   <customProperty target="txt0" propertyId="0"/>
   <customProperty target="txt1" propertyId="0"/>
+  <customProperty target="txt2" propertyId="0"/>
 </component>

FGUIProject/assets/Store/components/ComTab.xml

@@ -3,7 +3,7 @@
   <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <displayList>
     <component id="n9_fqor" name="n9" src="fqortb1" fileName="components/Button3.xml" xy="0,0" group="n14_fqor">
-      <Button checked="true" icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
+      <Button icon="ui://p9mtgheofqortao" selectedIcon="ui://p9mtgheofqortan" controller="c1" page="1"/>
     </component>
     <component id="n10_fqor" name="n10" src="fqortb1" fileName="components/Button3.xml" xy="193,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortak" selectedIcon="ui://p9mtgheofqortaj" controller="c1" page="2"/>
@@ -22,8 +22,9 @@
     </component>
     <component id="n13_fqor" name="n13" src="fqortb1" fileName="components/Button3.xml" xy="772,0" group="n14_fqor">
       <Button icon="ui://p9mtgheofqortam" selectedIcon="ui://p9mtgheofqortal" controller="c1" page="5"/>
-      <property target="txt0" propertyId="0" value="竞"/>
-      <property target="txt1" propertyId="0" value="技"/>
+      <property target="txt0" propertyId="0" value="花"/>
+      <property target="txt1" propertyId="0" value="令"/>
+      <property target="txt2" propertyId="0" value="飞"/>
     </component>
     <group id="n14_fqor" name="n14" xy="0,0" size="900,128" advanced="true" layout="hz" colGap="65" excludeInvisibles="true"/>
   </displayList>

FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -19,13 +19,13 @@
     </group>
     <group id="n26_10not" name="grpDiscount" xy="0,-1" size="100,96" advanced="true"/>
     <loader id="n23_10not" name="icon" xy="61,55" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="340,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
+    <text id="n27_10not" name="txtName" xy="328,26" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <text id="n29_10not" name="txtEndTime" xy="81,220" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" text="1天后下架"/>
-    <text id="n32_10not" name="txtLimit" xy="241,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
-    <text id="n31_10not" name="txtLock" xy="339,120" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+    <text id="n32_10not" name="txtLimit" xy="229,76" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
+    <text id="n31_10not" name="txtLock" xy="330,111" pivot="0.5,0" anchor="true" size="239,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位07解锁">
       <gearDisplay controller="c2" pages="0"/>
     </text>
-    <text id="n44_iftf" name="n44" xy="280,120" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
+    <text id="n44_iftf" name="n44" xy="299,120" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>

FGUIProject/assets/Store/components/ListShopItem.xml

@@ -22,10 +22,10 @@
     <text id="n27_10not" name="txtName" xy="145,72" pivot="0.5,0" anchor="true" size="74,49" fontSize="36" color="#5a3e16" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
     <text id="n29_10not" name="txtEndTime" xy="89,340" pivot="0.5,0" size="111,36" fontSize="26" color="#ac4100" align="center" leading="-5" letterSpacing="-2" vars="true" text="{value=1天}后下架"/>
     <text id="n56_l500" name="txtLimit" xy="45,121" pivot="0.5,0" size="199,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购（10/10）"/>
-    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+    <text id="n31_10not" name="txtLock" xy="145,150" pivot="0.5,0" anchor="true" size="229,36" fontSize="26" color="#8c8580" align="center" leading="-5" letterSpacing="-2" text="飞花令达到段位7解锁">
       <gearDisplay controller="c2" pages="0"/>
     </text>
-    <text id="n57_l500" name="n57" xy="93,157" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
+    <text id="n57_l500" name="n57" xy="104,157" size="81,36" fontSize="26" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="1" condition="0"/>
     </text>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,打开购买,1,关闭购买" selected="0"/>
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
   <displayList>
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
@@ -11,11 +11,13 @@
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n56_itts" name="btnBuyLevel" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="401,943">
+    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="right-right"/>
       <property target="text" propertyId="0" value="购买等级"/>
     </component>
     <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="right-right"/>
     </component>
     <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>

GameClient/Assets/Editor/Excel/Scanner/ShopScanner.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using GFGGame;
+using UnityEngine;
 
 namespace GFGEditor
 {
@@ -24,19 +25,21 @@ namespace GFGEditor
         {
 
             Dictionary<int, string> _typeIndexDic = new Dictionary<int, string>();
+            SQLiteHelper.Instance.OpenConnection();
             try
             {
-                List<ShopCfg> clothingShopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.FU_ZHUANG_DIAN, ConstStoreSubId.FU_ZHUANG_DIAN);
                 string typeIndex = "";
                 int itemId;
                 int id;
-
-                int index = 0;
-                while (index < clothingShopCfgs.Count)
+                var reader = SQLiteHelper.Instance.ReadFullTable("ShopCfgArray");
+                while (reader.Read())
                 {
-                    typeIndex = clothingShopCfgs[index].typeIndex.ToString();// reader["_typeIndex"].ToString();
-                    itemId = clothingShopCfgs[index].itemId;//  int.Parse(reader["_itemId"].ToString());
-                    id = clothingShopCfgs[index].id;// int.Parse(reader["_id"].ToString());
+                    typeIndex = reader["_typeIndex"].ToString();
+                    itemId = int.Parse(reader["_itemId"].ToString());
+                    id = int.Parse(reader["_id"].ToString());
+                    int menu1 = int.Parse(reader["_menu1"].ToString());
+                    int menu2 = int.Parse(reader["_menu2"].ToString());
+                    if (menu1 != ConstStoreTabId.FU_ZHUANG_DIAN || menu2 != ConstStoreSubId.FU_ZHUANG_DIAN) continue;
 
                     int count;
                     if (Array.IndexOf(_shopItemType, typeIndex) >= 0)
@@ -58,7 +61,6 @@ namespace GFGEditor
                         }
                     }
                     _typeIndexDic.Add(id, count.ToString());
-                    index++;
                 }
             }
             catch (Exception e)

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

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
@@ -9,35 +10,42 @@ namespace GFGGame
 
         //是否购买通行证
         private bool IsBuy = false;
-        
-        
+
+
+        private long SeasonEndTime = 0;
+
 
         //已经领奖levelId
         private HashSet<int> NormalRewards = new HashSet<int>();
 
         //已经高级领奖levelId
         private HashSet<int> SuperRewards = new HashSet<int>();
-        
+
         public int GetSeasonId()
         {
             return SeasonId;
         }
-        
+
         public void AddNormalReward(int levelId)
         {
             NormalRewards.Add(levelId);
         }
-        
+
         public void AddSuperReward(int levelId)
         {
             SuperRewards.Add(levelId);
         }
-        
+
         public void SetSeasonId(int seasonId)
         {
             SeasonId = seasonId;
+            //设置赛季结束时间
+            //获取赛季配置
+            var seasonCfg = BattlePassOpenCfgArray.Instance.GetCfg(seasonId);
+            if (seasonCfg == null) return;
+            SeasonEndTime = TimeUtil.GetResetTimeSec(seasonCfg.endTime);
         }
-        
+
         public void SetIsBuy(bool isBuy)
         {
             IsBuy = isBuy;
@@ -48,11 +56,23 @@ namespace GFGGame
         {
             return NormalRewards.Contains(levelId);
         }
-        
+
         //检查高级领取状态
         public bool CheckSuperLevelRewardGet(int levelId)
         {
             return SuperRewards.Contains(levelId);
         }
+
+        //获取赛季结束时间
+        public long GetSeasonEndTime()
+        {
+            return SeasonEndTime;
+        }
+
+        //获取通行证当前等级
+        public int GetBattlePassLevel()
+        {
+            return GameGlobal.myNumericComponent.GetAsInt(NumericType.PassLevel);
+        }
     }
 }

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

@@ -19,7 +19,7 @@ namespace GFGGame
         {
             get
             {
-                return GameGlobal.myNumericComponent.GetAsInt(NumericType.TakeFriendGiftCount); ;
+                return GameGlobal.myNumericComponent.GetAsInt(NumericType.TakeFriendGiftCount);
             }
         }
 

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

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

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

@@ -332,7 +332,7 @@ namespace GFGGame
             }
             else if (shopCfg.lockType == LockType.AREND_GRADE)
             {
-                return string.Format("飞花令达到{0}段位解锁", shopCfg.lockValue);
+                return string.Format("飞花令达到段位-{0}解锁", shopCfg.lockValue);
             }
             return "";
         }

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

@@ -111,7 +111,7 @@ namespace GFGGame
             UI_ListShopItem.ProxyEnd();
         }
 
-        private async void OnBtnBugItem(EventContext context)
+        private void OnBtnBugItem(EventContext context)
         {
             ShopCfg cfg = (context.sender as GObject).data as ShopCfg;
             bool isSellOut = cfg.maxBuyNum > 0 && cfg.maxBuyNum - ShopDataManager.Instance.GetGoodsBuyNumById(cfg.id) <= 0;
@@ -120,6 +120,12 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
                 return;
             }
+            if (!ShopDataManager.Instance.GetShopGoodsStateById(cfg.id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt(ShopDataManager.Instance.GetShopGoodsStateTips(cfg.id));
+                return;
+            }
+
             if (cfg.costType == CostType.RMB)
             {
                 if (!AntiAddictionController.CheckAntiAddictionRecharge(cfg.price))

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button3.cs

@@ -9,6 +9,7 @@ namespace UI.Store
         public GButton target;
         public GTextField m_txt0;
         public GTextField m_txt1;
+        public GTextField m_txt2;
         public const string URL = "ui://p9mtgheofqortb1";
         public const string PACKAGE_NAME = "Store";
         public const string RES_NAME = "Button3";
@@ -58,11 +59,13 @@ namespace UI.Store
         {
             m_txt0 = (GTextField)comp.GetChild("txt0");
             m_txt1 = (GTextField)comp.GetChild("txt1");
+            m_txt2 = (GTextField)comp.GetChild("txt2");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txt0 = null;
             m_txt1 = null;
+            m_txt2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,23 +1,10 @@
+using System.Collections.Generic;
 using ET;
 
 namespace GFGGame
 {
     public class ShopSProxy
     {
-        // public static async ETTask<bool> ShopBuy(int shopType, int buyId, long buyCount)
-        // {
-        //     M2C_ShopBuy response = null;
-        //     response = (M2C_ShopBuy)await MessageHelper.SendToServer(new C2M_ShopBuy() { ShopType = shopType, BuyId = buyId, BuyCount = (int)buyCount });
-        //     if (response != null)
-        //     {
-        //         if (response.Error == ErrorCode.ERR_Success)
-        //         {
-        //             // EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
-        //             return true;
-        //         }
-        //     }
-        //     return false;
-        // }
         public static async ETTask<bool> ReqShopInfo()
         {
             S2C_RequestShopInfo response = null;
@@ -44,6 +31,24 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     ShopDataManager.Instance.UpdateGiftData(response.BuyId, response.TotalTimes);
+                    ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(response.BuyId);
+                    ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+                    if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL && shopCfg.costType == CostType.RMB)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功");
+                    }
+
+                    List<ItemData> itemDatas;
+                    if (itemCfg.itemType == ConstItemType.GIFT_BAG && itemCfg.subType == ConstItemSubType.GIFT_BAG_AUTO)
+                    {
+                        itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
+                    }
+                    else
+                    {
+                        itemDatas = ItemUtil.CreateItemDataList(itemCfg.id, response.Times * shopCfg.itemNum);
+                    }
+                    BonusController.TryShowBonusList(itemDatas);
+                    EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
                     return true;
                 }
             }

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

@@ -60,7 +60,8 @@ namespace GFGGame
 
         public static void AddDiamondPurple()
         {
-            ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
+            //  ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE });
         }
 
         //红钻（鲛绡）

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

@@ -40,6 +40,7 @@ namespace GFGGame
             _ui.m_btnMax.target.onClick.Add(OnBtnMaxClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnConfirmClick);
             _ui.m_btnCancle.onClick.Add(OnBtnCancleClick);
+            _ui.m_listItem.itemRenderer = ListItemRenderer;
 
         }
         protected override void AddEventListener()
@@ -79,7 +80,8 @@ namespace GFGGame
             _ui.m_loaRarity.visible = itemCfg.itemType == ConstItemType.DRESS_UP;
             _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;
         }
 
         private void UpdateUseView()
@@ -97,7 +99,17 @@ namespace GFGGame
             _ui.m_txtShow.text = "选择使用数量";
             _ui.m_txtTips.text = string.Format("是否使用{0}个{1}？", _count, itemCfg.name);
         }
-
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+            ItemData itemData = ItemUtil.createItemData(itemCfg.itemsArr[index]);
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(itemData);
+            (obj.data as ItemView).ChangeTxtCountStyle();
+        }
         private void OnBtnAddClick()
         {
             _count++;

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -231,7 +231,7 @@ namespace GFGGame
         private void UpdateRole(bool tween)
         {
             _dressUpObjUI.ResetSceneObj(70, false, true, null, false);
-            _dressUpObjUI.dressUpObj.AddOrRemove(_cfgSelected.itemId, true);
+            _dressUpObjUI.dressUpObj.AddOrRemove(_cfgSelected.itemId, true, true);
             _dressUpObjUI.UpdateWrapper(_ui.m_compHolder.m_compMover.m_holder);
             int type = ItemUtilCS.GetItemSubType(_cfgSelected.itemId);
             float duration = DURATION;
@@ -331,6 +331,10 @@ namespace GFGGame
             // item.m_grpSelect.visible = true;
             // item.target.AddChild()
             ShopCfg cfg = listItem.data as ShopCfg;
+            if (_cfgSelected != null)
+            {
+                _dressUpObjUI.dressUpObj.AddOrRemove(_cfgSelected.itemId, true);
+            }
             _cfgSelected = cfg;
             UpdateRole(tween);
             UpdateSelectedItemInfo();

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyConfirmView.cs

@@ -96,7 +96,7 @@ namespace GFGGame
                     AlertUI.Show(costCfg.name + "不足，是否前往购买？").SetLeftButton(true).SetRightButton(true, "确认", (AlertWindow.AlertCallback)((object data) =>
                     {
                         long costNeedCount = coustNum - ItemDataManager.GetItemNum(costId);
-                        BuyItemConteoller.Show(costId, costNeedCount, 0, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
+                        BuyItemConteoller.Show(costId, costNeedCount, ConstBuyType.TYPE_ITEM, null, true, true, GameConst.MAX_COUNT_TO_BUY_DIAMOND_RED);
                     }));
                     OnClickBtnCancel();
                 }

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

@@ -152,8 +152,8 @@ namespace GFGGame
         }
         private async void OnBtnExchangeClick()
         {
-            ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(_goodIds);
-            if (ItemDataManager.GetItemNum(cfg.costId) < cfg.costNum)
+            ShopCfg cfg = ShopCfgArray.Instance.GetCfg(_goodIds);
+            if (ItemDataManager.GetItemNum(cfg.costId) < cfg.price)
             {
                 PromptController.Instance.ShowFloatTextPrompt("道具不足");
                 return;

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

@@ -36,14 +36,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_ARENA, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -53,9 +53,14 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
-
+        private void UpdateView()
+        {
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];

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

@@ -89,7 +89,6 @@ namespace GFGGame
             ShopCfg itemData = _shopCfgs[index];
             if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
             {
-                // RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
                 ShopSProxy.ReqShopBuy(itemData.id, 1).Coroutine();
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
             }

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

@@ -36,14 +36,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -53,9 +53,14 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
-
+        private void UpdateView()
+        {
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];

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

@@ -36,14 +36,14 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
         protected override void OnShown()
         {
             base.OnShown();
             int menu2 = (int)this.viewData;
             _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
-            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
-            _ui.m_list.numItems = _shopCfgs.Count;
+            UpdateView();
         }
 
         protected override void OnHide()
@@ -53,9 +53,14 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
-
+        private void UpdateView()
+        {
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ShopCfg shopCfg = _shopCfgs[index];

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -40,7 +40,7 @@ namespace GFGGame
             _ui.m_btnGetAll.onClick.Add(OnBtnGetAllClick);
             _ui.m_RewardList.itemRenderer = ListBoxRewardItemRender;
         }
-        
+
 
         protected override void OnShown()
         {
@@ -50,8 +50,10 @@ namespace GFGGame
             _rewardCfgs = new List<BattlePassCfg>(BattlePassCfgArray.Instance.GetCfgsByid(seasonId));
             //去掉第一个为0的配置
             _ui.m_RewardList.numItems = _rewardCfgs.Count - 1;
+            SetSeasonLeftTime();
+            SetBattlePassLevel();
         }
-        
+
 
         //开启通行证
         private void OnBtnOpenClick(EventContext context)
@@ -60,7 +62,6 @@ namespace GFGGame
 
         private void OnBtnBuyLevel(EventContext context)
         {
-            
         }
 
         //领取奖励
@@ -178,12 +179,46 @@ namespace GFGGame
 
             item.m_GetRewardBt.data = id;
         }
-        
+
+        //设置赛季剩余时间
+        private void SetSeasonLeftTime()
+        {
+            //获取赛季结束时间
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        //UpdateTime
+        private void UpdateTime(object param)
+        {
+            var seasonEndTime = BattlePassTaskDataManager.Instance.GetSeasonEndTime();
+            var leftTime = seasonEndTime - TimeHelper.ServerNow();
+            if (leftTime <= 0)
+            {
+                Timers.inst.Remove(UpdateTime);
+                return;
+            }
+            _ui.m_LeftTime.text = TimeUtil.FormattingTime(TimeHelper.ServerNow(), seasonEndTime);
+        }
+
+
+        private void SetBattlePassLevel()
+        {
+            //获取玩家当前的通行证等级
+            var dataManager = BattlePassTaskDataManager.Instance;
+            var battlePassLevel = dataManager.GetBattlePassLevel();
+            var uiExpProcess = _ui.m_LevelProcess;
+            uiExpProcess.m_Level.text = battlePassLevel.ToString();
+            //获取当前等级的经验
+            var battlePassCfg =
+                BattlePassCfgArray.Instance.GetCfgByidAndlevel(dataManager.GetSeasonId(),
+                    dataManager.GetBattlePassLevel());
+            uiExpProcess.target.max = battlePassCfg.value;
+            uiExpProcess.target.value = 50;
+        }
+
         //刷新特别大奖展示
         private void FreshSpecialReward()
         {
-            
         }
-        
     }
 }