zhaoyang 2 年之前
父節點
當前提交
794cc12200
共有 37 個文件被更改,包括 537 次插入494 次删除
  1. 二進制
      FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_1.png
  2. 二進制
      FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_2.png
  3. 二進制
      FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_3.png
  4. 二進制
      FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_4.png
  5. 二進制
      FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_5.png
  6. 二進制
      FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_6.png
  7. 0 0
      FGUIProject/assets/Store/ChargeUI.xml
  8. 2 2
      FGUIProject/assets/Store/package.xml
  9. 1 1
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  10. 3 3
      GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs
  11. 3 10
      GameClient/Assets/Game/HotUpdate/Data/StoreDataManager.cs
  12. 1 1
      GameClient/Assets/Game/HotUpdate/Data/StoreDataManager.cs.meta
  13. 15 23
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs.meta
  15. 84 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs
  16. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs.meta
  17. 24 27
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs
  18. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs.meta
  19. 0 119
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs
  20. 16 16
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ProgressBar1.cs
  21. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ProgressBar1.cs.meta
  22. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs.meta
  23. 6 6
      GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs
  24. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs
  25. 85 0
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs
  26. 11 0
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs.meta
  27. 5 5
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs
  28. 1 1
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs
  29. 264 264
      GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs
  30. 二進制
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  31. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0.png
  32. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_1.png
  33. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_2.png
  34. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png
  35. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png
  36. 1 1
      GameClient/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png.meta
  37. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_fui.bytes

二進制
FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_1.png


二進制
FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_2.png


二進制
FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_3.png


二進制
FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_4.png


二進制
FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_5.png


二進制
FGUIProject/assets/RechargeStore/imagesExport/sc_zizhuan_6.png


+ 0 - 0
FGUIProject/assets/Store/RechargeStoreUI.xml → FGUIProject/assets/Store/ChargeUI.xml


+ 2 - 2
FGUIProject/assets/Store/package.xml

@@ -65,7 +65,6 @@
     <image id="fqortb8" name="sc_yeqian_zhedang.png" path="/imagesNew/"/>
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
     <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
-    <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
     <component id="fqor7x" name="StoreUI.xml" path="/" exported="true"/>
     <component id="hhx90" name="ComZhuangShi.xml" path="/components/"/>
     <image id="hhx91" name="VipLevel_baseboard.png" path="/imagesNew/"/>
@@ -129,8 +128,9 @@
     <image id="hhx91n" name="sc_zizhuan_5.png" path="/imagesExport/" exported="true"/>
     <image id="hhx91o" name="sc_zizhuan_6.png" path="/imagesExport/" exported="true"/>
     <component id="hhx91p" name="ProgressBar1.xml" path="/components/"/>
-    <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/"/>
+    <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/" atlas="alone_npot"/>
     <component id="hhx91r" name="ComVipLv.xml" path="/"/>
+    <component id="l500tb9" name="ChargeUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -162,7 +162,7 @@ namespace GFGGame
             SuitFosterDataManager.Instance.Clear();
             StudioDataManager.Instance.Clear();
             StorageDataManager.Instance.Clear();
-            RechargeDataManager.Instance.Clear();
+            StoreDataManager.Instance.Clear();
             DressUpMenuItemDataManager.Clear();
             GuideDataManager.Clear();
             GetSuitItemController.Clear();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -134,12 +134,12 @@ namespace GFGGame
         /// <returns></returns>
         public bool GetRechargeGiftFreeRed()
         {
-            List<GiftBagCfg> _giftCfgs = RechargeDataManager.Instance.GetGiftBagCfgs();
+            List<GiftBagCfg> _giftCfgs = StoreDataManager.Instance.GetGiftBagCfgs();
             for (int i = 0; i < _giftCfgs.Count; i++)
             {
                 GiftBagCfg cfg = _giftCfgs[i];
-                bool isUnLock = RechargeDataManager.Instance.GetGiftStateById(cfg.id);
-                int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
+                bool isUnLock = StoreDataManager.Instance.GetGiftStateById(cfg.id);
+                int buyNum = StoreDataManager.Instance.GetGiftBuyNumById(cfg.id);
                 bool canBuy = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? true : false;
                 if (isUnLock && canBuy && cfg.price == 0) return true;
 

+ 3 - 10
GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs → GameClient/Assets/Game/HotUpdate/Data/StoreDataManager.cs

@@ -18,22 +18,15 @@ namespace GFGGame
         public static int STORY_LV = 1;
         public static int ROLE_LV = 2;
     }
-    // public class RefreshType
-    // {
-    //     public static int NONE = 0;
-    //     public static int DAY = 1;
-    //     public static int WEEK = 2;
-    //     public static int MONTH = 3;
-    // }
+
     public class CostType
     {
         public static int FREE = 0;
-        public static int MONEY = 1;
+        public static int ITEM = 1;
         public static int RMB = 2;
-        public static int ITEM = 3;
     }
 
-    public class RechargeDataManager : SingletonBase<RechargeDataManager>
+    public class StoreDataManager : SingletonBase<StoreDataManager>
     {
         public string[] refreshType = { "永久限购", "每日限购", "每周限购", "每月限购" };
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/RechargeDataManager.cs.meta → GameClient/Assets/Game/HotUpdate/Data/StoreDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6f22da16de1a46f46b8511782b235ae9
+guid: e4f7d3e35893ade458dcdcaca1d625f0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 15 - 23
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs

@@ -4,21 +4,19 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_Component1
+    public partial class UI_ChargeUI
     {
         public GComponent target;
-        public Controller m_c1;
-        public UI_Button2 m_btn0;
-        public UI_Button2 m_btn1;
-        public UI_Button2 m_btn2;
-        public const string URL = "ui://p9mtgheo10not1s";
+        public UI_ComVipLv m_comVipLv;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheol500tb9";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "Component1";
-        private static UI_Component1 _proxy;
+        public const string RES_NAME = "ChargeUI";
+        private static UI_ChargeUI _proxy;
 
-        public static UI_Component1 Create(GObject gObject = null)
+        public static UI_ChargeUI Create(GObject gObject = null)
         {
-            var ui = new UI_Component1();
+            var ui = new UI_ChargeUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +25,11 @@ namespace UI.Store
             return ui;
         }
 
-        public static UI_Component1 Proxy(GObject gObject = null)
+        public static UI_ChargeUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Component1();
+                _proxy = new UI_ChargeUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,20 +56,14 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_btn0 = (UI_Button2)UI_Button2.Create(comp.GetChild("btn0"));
-            m_btn1 = (UI_Button2)UI_Button2.Create(comp.GetChild("btn1"));
-            m_btn2 = (UI_Button2)UI_Button2.Create(comp.GetChild("btn2"));
+            m_comVipLv = (UI_ComVipLv)UI_ComVipLv.Create(comp.GetChild("comVipLv"));
+            m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_btn0.Dispose();
-            m_btn0 = null;
-            m_btn1.Dispose();
-            m_btn1 = null;
-            m_btn2.Dispose();
-            m_btn2 = null;
+            m_comVipLv.Dispose();
+            m_comVipLv = null;
+            m_list = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f0c5c9d190ee838488d6ce19979c34c4
+guid: f0f439025b149e046b6243ba37b06308
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 84 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ComVipLv
+    {
+        public GComponent target;
+        public GTextField m_txtLv;
+        public UI_ProgressBar1 m_proExp;
+        public GLoader m_loaIcon;
+        public GTextField m_txtTips;
+        public GButton m_btnRule;
+        public const string URL = "ui://p9mtgheohhx91r";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ComVipLv";
+        private static UI_ComVipLv _proxy;
+
+        public static UI_ComVipLv Create(GObject gObject = null)
+        {
+            var ui = new UI_ComVipLv();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComVipLv Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComVipLv();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
+            m_proExp = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proExp"));
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtLv = null;
+            m_proExp.Dispose();
+            m_proExp = null;
+            m_loaIcon = null;
+            m_txtTips = null;
+            m_btnRule = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Component1.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ComVipLv.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b26687987c2824c49ba5ed0d61b46a78
+guid: 4e8e2472906b03a419adf2ee418feca7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 24 - 27
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs

@@ -4,23 +4,22 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_RechargeStoreUI
+    public partial class UI_ListChargeItem
     {
         public GComponent target;
-        public Controller m_c1;
-        public UI_Component1 m_comTab;
-        public GTextField m_txtRefreshTime;
-        public GList m_list;
-        public GList m_listGift;
-        public GList m_listExchange;
-        public const string URL = "ui://p9mtgheod4iw0";
+        public GLoader m_icon;
+        public GImage m_imgDouble;
+        public GTextField m_txtName;
+        public UI_Component2 m_btnBuy;
+        public GTextField m_txtDesc;
+        public const string URL = "ui://p9mtgheohhx91i";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "RechargeStoreUI";
-        private static UI_RechargeStoreUI _proxy;
+        public const string RES_NAME = "ListChargeItem";
+        private static UI_ListChargeItem _proxy;
 
-        public static UI_RechargeStoreUI Create(GObject gObject = null)
+        public static UI_ListChargeItem Create(GObject gObject = null)
         {
-            var ui = new UI_RechargeStoreUI();
+            var ui = new UI_ListChargeItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +28,11 @@ namespace UI.Store
             return ui;
         }
 
-        public static UI_RechargeStoreUI Proxy(GObject gObject = null)
+        public static UI_ListChargeItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_RechargeStoreUI();
+                _proxy = new UI_ListChargeItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -60,22 +59,20 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
-            m_comTab = (UI_Component1)UI_Component1.Create(comp.GetChild("comTab"));
-            m_txtRefreshTime = (GTextField)comp.GetChild("txtRefreshTime");
-            m_list = (GList)comp.GetChild("list");
-            m_listGift = (GList)comp.GetChild("listGift");
-            m_listExchange = (GList)comp.GetChild("listExchange");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_imgDouble = (GImage)comp.GetChild("imgDouble");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_btnBuy = (UI_Component2)UI_Component2.Create(comp.GetChild("btnBuy"));
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
-            m_comTab.Dispose();
-            m_comTab = null;
-            m_txtRefreshTime = null;
-            m_list = null;
-            m_listGift = null;
-            m_listExchange = null;
+            m_icon = null;
+            m_imgDouble = null;
+            m_txtName = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            m_txtDesc = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListChargeItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10730a4d0c9ed794cb8cf14d1c99d4a4
+guid: d7929938bc538654195c9a9e5a1d4cf9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 0 - 119
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListGiftItem.cs

@@ -1,119 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Store
-{
-    public partial class UI_ListGiftItem
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public Controller m_c2;
-        public GTextField m_txtDesc;
-        public GGroup m_grpDiscount;
-        public GLoader m_icon;
-        public GTextField m_txtName;
-        public GTextField m_txtEndTime;
-        public GGroup m_grpEndTime;
-        public GTextField m_txtLimit;
-        public GTextField m_txtLock;
-        public GLoader m_loaIcon;
-        public GTextField m_txtIcon;
-        public GGroup m_grpIcon;
-        public GTextField m_txtOriginalPrice;
-        public GGroup m_grpOriginalPrice;
-        public GTextField m_txtPrice;
-        public GGroup m_grpPrice;
-        public const string URL = "ui://p9mtgheo10not1t";
-        public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "ListGiftItem";
-        private static UI_ListGiftItem _proxy;
-
-        public static UI_ListGiftItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListGiftItem();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListGiftItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListGiftItem();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_c1 = comp.GetController("c1");
-            m_c2 = comp.GetController("c2");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_grpDiscount = (GGroup)comp.GetChild("grpDiscount");
-            m_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtEndTime = (GTextField)comp.GetChild("txtEndTime");
-            m_grpEndTime = (GGroup)comp.GetChild("grpEndTime");
-            m_txtLimit = (GTextField)comp.GetChild("txtLimit");
-            m_txtLock = (GTextField)comp.GetChild("txtLock");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtIcon = (GTextField)comp.GetChild("txtIcon");
-            m_grpIcon = (GGroup)comp.GetChild("grpIcon");
-            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
-            m_grpOriginalPrice = (GGroup)comp.GetChild("grpOriginalPrice");
-            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
-            m_grpPrice = (GGroup)comp.GetChild("grpPrice");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_c2 = null;
-            m_txtDesc = null;
-            m_grpDiscount = null;
-            m_icon = null;
-            m_txtName = null;
-            m_txtEndTime = null;
-            m_grpEndTime = null;
-            m_txtLimit = null;
-            m_txtLock = null;
-            m_loaIcon = null;
-            m_txtIcon = null;
-            m_grpIcon = null;
-            m_txtOriginalPrice = null;
-            m_grpOriginalPrice = null;
-            m_txtPrice = null;
-            m_grpPrice = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 16 - 16
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ProgressBar1.cs

@@ -4,37 +4,37 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_Button2
+    public partial class UI_ProgressBar1
     {
-        public GButton target;
-        public GLoader m_loaMascot;
-        public const string URL = "ui://p9mtgheodmsi1q";
+        public GProgressBar target;
+        public GTextField m_txttitle;
+        public const string URL = "ui://p9mtgheohhx91p";
         public const string PACKAGE_NAME = "Store";
-        public const string RES_NAME = "Button2";
-        private static UI_Button2 _proxy;
+        public const string RES_NAME = "ProgressBar1";
+        private static UI_ProgressBar1 _proxy;
 
-        public static UI_Button2 Create(GObject gObject = null)
+        public static UI_ProgressBar1 Create(GObject gObject = null)
         {
-            var ui = new UI_Button2();
+            var ui = new UI_ProgressBar1();
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GProgressBar)gObject;
             ui.Init(ui.target);
             return ui;
         }
 
-        public static UI_Button2 Proxy(GObject gObject = null)
+        public static UI_ProgressBar1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button2();
+                _proxy = new UI_ProgressBar1();
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GButton)gObject;
+            	ui.target =  (GProgressBar)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -55,11 +55,11 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_loaMascot = (GLoader)comp.GetChild("loaMascot");
+            m_txttitle = (GTextField)comp.GetChild("txttitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaMascot = null;
+            m_txttitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ProgressBar1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 81837cf2c5fbf9148b94437c1b354dbd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_RechargeStoreUI.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a60b500458118754b9c08d5764d20886
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 6 - 6
GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs

@@ -12,7 +12,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
+                    StoreDataManager.Instance.UpdateRechargeData(response.RechargeId, response.RechargedTimes);
                     PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
                     EventAgent.DispatchEvent(ConstMessage.BUY_RECHARGE_SUCCESS);
 
@@ -29,7 +29,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.ks.Count; i++)
                     {
-                        RechargeDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
+                        StoreDataManager.Instance.UpdateRechargeData(response.ks[i], response.vs[i]);
                     }
                 }
             }
@@ -44,7 +44,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.ks.Count; i++)
                     {
-                        RechargeDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
+                        StoreDataManager.Instance.UpdateGiftData(response.ks[i], response.vs[i]);
                     }
                 }
             }
@@ -57,7 +57,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
+                    StoreDataManager.Instance.UpdateGiftData(response.GiftBagId, response.BuyTimes);
                     BonusController.TryShowBonusList(GiftBagCfgArray.Instance.GetCfg(response.GiftBagId).itemsArr);
                     EventAgent.DispatchEvent(ConstMessage.BUY_GIFT_SUCCESS);
                     EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
@@ -76,7 +76,7 @@ namespace GFGGame
                 {
                     for (int i = 0; i < response.ks.Count; i++)
                     {
-                        RechargeDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
+                        StoreDataManager.Instance.UpdateExchangeData(response.ks[i], response.vs[i]);
                     }
                 }
             }
@@ -89,7 +89,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    RechargeDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangedTimes);
+                    StoreDataManager.Instance.UpdateExchangeData(response.ExchangeId, response.ExchangedTimes);
                     EventAgent.DispatchEvent(ConstMessage.BUY_EXCHANGE_SUCCESS);
                     ShopExchangeCfg cfg = ShopExchangeCfgArray.Instance.GetCfg(response.ExchangeId);
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(cfg.itemId, cfg.num * response.Times));

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -154,7 +154,7 @@ namespace GFGGame
         }
         private void OnBtnShopClick()
         {
-            ViewManager.Show<RechargeStoreView>();
+            ViewManager.Show<StoreView>();
         }
         private void OnBtnRewardClick()
         {

+ 85 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs

@@ -0,0 +1,85 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class ChargeStoreView : BaseWindow
+    {
+        private UI_ChargeUI _ui;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChargeUI.PACKAGE_NAME;
+            _ui = UI_ChargeUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
+            UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
+            item.m_txtExchangeCount.visible = false;
+            item.m_btnBuy.m_c1.selectedIndex = 1;
+            item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(() =>
+                {
+                    if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
+                    {
+                        RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                    }
+                });
+            }
+            item.target.data = index;
+            item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
+            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.name);
+            bool isDouble = StoreDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
+            item.m_imgDouble.visible = isDouble;
+            item.m_txtDesc.visible = isDouble;
+            item.m_icon.url = "ui://Store/sc_zizhuan_" + itemData.id;
+
+            UI_StoreListItem.ProxyEnd();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fdd2736077e8b324c9b104b9df3b2dc8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs

@@ -46,7 +46,7 @@ namespace GFGGame
             _ui.m_txtName.text = cfg.name;
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(cfg.res, "png");//string.Format("ui://RechargeStore/{0}", cfg.res);
             _ui.m_list.numItems = cfg.itemsArr.Length;
-            _ui.m_c1.selectedIndex = RechargeDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
+            _ui.m_c1.selectedIndex = StoreDataManager.Instance.GetGiftStateById(_giftId) ? 0 : 1;
             if (cfg.lockType == LockType.STORY_LV)
             {
                 StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
@@ -56,10 +56,10 @@ namespace GFGGame
             {
                 _ui.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
             }
-            int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", RechargeDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
+            int buyNum = StoreDataManager.Instance.GetGiftBuyNumById(cfg.id);
+            _ui.m_txtLimit.text = string.Format("{0}({1}/{2})", StoreDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
             // if (cfg.refreshType == RefreshType.NONE) _ui.m_txtLimit.text = "永久限购";
-            _ui.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
+            _ui.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
             _ui.m_grpEndTime.visible = cfg.endTime != "";
 
             _ui.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
@@ -107,7 +107,7 @@ namespace GFGGame
         {
 
             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(_giftId);
-            if (cfg.costType == CostType.MONEY || cfg.costType == CostType.ITEM)
+            if (cfg.costType == CostType.ITEM)
             {
                 long hasNum = ItemDataManager.GetItemNum(cfg.costId);
                 if (hasNum < cfg.price)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs

@@ -58,7 +58,7 @@ namespace GFGGame
             }
             else
             {
-                int lastBuyCount = cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id);//剩余购买次数
+                int lastBuyCount = cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id);//剩余购买次数
                 _maxCanBuy = Math.Min(curMoneyCanBuy, lastBuyCount);
             }
             _maxCanBuy = Math.Max(1, _maxCanBuy);

+ 264 - 264
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -1,289 +1,289 @@
-using UI.Store;
-using UI.CommonGame;
-using FairyGUI;
-using System.Collections.Generic;
-using ET;
+// using UI.Store;
+// using UI.CommonGame;
+// using FairyGUI;
+// using System.Collections.Generic;
+// using ET;
 
-namespace GFGGame
-{
-    public class RechargeStoreView : BaseWindow
-    {
-        private UI_RechargeStoreUI _ui;
-        private List<GiftBagCfg> _giftCfgs;
-        private List<ShopExchangeCfg> _exchangeCfgs;
-        public override void Dispose()
-        {
+// namespace GFGGame
+// {
+//     public class RechargeStoreView : BaseWindow
+//     {
+//         private UI_RechargeStoreUI _ui;
+//         private List<GiftBagCfg> _giftCfgs;
+//         private List<ShopExchangeCfg> _exchangeCfgs;
+//         public override void Dispose()
+//         {
 
-            if (_ui != null)
-            {
-                _ui.Dispose();
-            }
-            _ui = null;
-            base.Dispose();
-        }
+//             if (_ui != null)
+//             {
+//                 _ui.Dispose();
+//             }
+//             _ui = null;
+//             base.Dispose();
+//         }
 
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_RechargeStoreUI.PACKAGE_NAME;
-            _ui = UI_RechargeStoreUI.Create();
-            this.viewCom = _ui.target;
-            isfullScreen = true;
-            this.clickBlankToClose = false;
+//         protected override void OnInit()
+//         {
+//             base.OnInit();
+//             packageName = UI_RechargeStoreUI.PACKAGE_NAME;
+//             _ui = UI_RechargeStoreUI.Create();
+//             this.viewCom = _ui.target;
+//             isfullScreen = true;
+//             this.clickBlankToClose = false;
 
-            _ui.m_list.itemRenderer = ListItemRenderer;
-            _ui.m_listGift.itemRenderer = ListGiftItemRenderer;
-            _ui.m_listExchange.itemRenderer = ListExchangeItemRenderer;
+//             _ui.m_list.itemRenderer = ListItemRenderer;
+//             _ui.m_listGift.itemRenderer = ListGiftItemRenderer;
+//             _ui.m_listExchange.itemRenderer = ListExchangeItemRenderer;
 
-            _ui.m_comTab.m_c1.onChanged.Add(OnComTabChange);
-            _ui.m_c1.onChanged.Add(OnTabChange);
+//             _ui.m_comTab.m_c1.onChanged.Add(OnComTabChange);
+//             _ui.m_c1.onChanged.Add(OnTabChange);
 
 
-        }
-        protected override void AddEventListener()
-        {
-            base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
-            EventAgent.AddEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
-            EventAgent.AddEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
-            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-        }
-        protected override void OnShown()
-        {
-            base.OnShown();
+//         }
+//         protected override void AddEventListener()
+//         {
+//             base.AddEventListener();
+//             EventAgent.AddEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
+//             EventAgent.AddEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
+//             EventAgent.AddEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
+//             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+//         }
+//         protected override void OnShown()
+//         {
+//             base.OnShown();
 
-            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
-            _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
-            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-            UpdateExchangeList();
-            UpdateGiftBagList();
-            OnTabChange();
-            Timers.inst.Add(1, 0, UpdateExchangeTime);
-        }
+//             _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
+//             _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
+//             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
+//             UpdateExchangeList();
+//             UpdateGiftBagList();
+//             OnTabChange();
+//             Timers.inst.Add(1, 0, UpdateExchangeTime);
+//         }
 
-        protected override void OnHide()
-        {
-            base.OnHide();
-            Timers.inst.Remove(UpdateExchangeTime);
+//         protected override void OnHide()
+//         {
+//             base.OnHide();
+//             Timers.inst.Remove(UpdateExchangeTime);
 
-        }
-        protected override void RemoveEventListener()
-        {
-            base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
-            EventAgent.RemoveEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
-            EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
-            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
-        }
+//         }
+//         protected override void RemoveEventListener()
+//         {
+//             base.RemoveEventListener();
+//             EventAgent.RemoveEventListener(ConstMessage.BUY_RECHARGE_SUCCESS, UpdateList);
+//             EventAgent.RemoveEventListener(ConstMessage.BUY_EXCHANGE_SUCCESS, UpdateExchangeList);
+//             EventAgent.RemoveEventListener(ConstMessage.BUY_GIFT_SUCCESS, UpdateGiftBagList);
+//             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+//         }
 
-        private void OnComTabChange()
-        {
-            _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
+//         private void OnComTabChange()
+//         {
+//             _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
 
-        }
-        private void OnTabChange()
-        {
-            _ui.m_list.ScrollToView(0);
-            _ui.m_listGift.ScrollToView(0);
-            _ui.m_listExchange.ScrollToView(0);
-        }
-        private void UpdateList()
-        {
-            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
-        }
-        private void UpdateGiftBagList()
-        {
-            _giftCfgs = RechargeDataManager.Instance.GetGiftBagCfgs();
-            _ui.m_listGift.numItems = _giftCfgs.Count;
-            UpdateRedDot();
-        }
-        private void UpdateExchangeList()
-        {
-            _exchangeCfgs = RechargeDataManager.Instance.GetExchangeCfgs();
-            _ui.m_listExchange.numItems = _exchangeCfgs.Count;
-        }
-        private void UpdateExchangeTime(object param)
-        {
-            long endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
-            string time = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
-            _ui.m_txtRefreshTime.text = time + "后刷新";
-            for (int i = 0; i < _ui.m_listGift.numItems; i++)
-            {
-                UI_ListGiftItem item = UI_ListGiftItem.Proxy(_ui.m_listGift.GetChildAt(i));
-                GiftBagCfg cfg = _giftCfgs[i];
-                item.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
-                UI_ListGiftItem.ProxyEnd();
-            }
-        }
-        private void ListItemRenderer(int index, GObject obj)
-        {
-            RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
-            UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
-            item.m_txtExchangeCount.visible = false;
-            item.m_btnBuy.m_c1.selectedIndex = 1;
-            item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(() =>
-                {
-                    if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
-                    {
-                        RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
-                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
-                    }
-                });
-            }
-            item.target.data = index;
-            item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
-            item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.name);
-            bool isDouble = RechargeDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
-            item.m_imgDouble.visible = isDouble;
-            item.m_txtDesc.visible = isDouble;
-            item.m_icon.url = "ui://Store/sc_zizhuan_" + itemData.id;
+//         }
+//         private void OnTabChange()
+//         {
+//             _ui.m_list.ScrollToView(0);
+//             _ui.m_listGift.ScrollToView(0);
+//             _ui.m_listExchange.ScrollToView(0);
+//         }
+//         private void UpdateList()
+//         {
+//             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
+//         }
+//         private void UpdateGiftBagList()
+//         {
+//             _giftCfgs = StoreDataManager.Instance.GetGiftBagCfgs();
+//             _ui.m_listGift.numItems = _giftCfgs.Count;
+//             UpdateRedDot();
+//         }
+//         private void UpdateExchangeList()
+//         {
+//             _exchangeCfgs = StoreDataManager.Instance.GetExchangeCfgs();
+//             _ui.m_listExchange.numItems = _exchangeCfgs.Count;
+//         }
+//         private void UpdateExchangeTime(object param)
+//         {
+//             long endTime = TimeUtil.GetTomorrowTime(GlobalCfgArray.globalCfg.refreshTime);
+//             string time = TimeUtil.FormattingTime(TimeHelper.ServerNow(), endTime);
+//             _ui.m_txtRefreshTime.text = time + "后刷新";
+//             for (int i = 0; i < _ui.m_listGift.numItems; i++)
+//             {
+//                 UI_ListGiftItem item = UI_ListGiftItem.Proxy(_ui.m_listGift.GetChildAt(i));
+//                 GiftBagCfg cfg = _giftCfgs[i];
+//                 item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
+//                 UI_ListGiftItem.ProxyEnd();
+//             }
+//         }
+//         private void ListItemRenderer(int index, GObject obj)
+//         {
+//             RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
+//             UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
+//             item.m_txtExchangeCount.visible = false;
+//             item.m_btnBuy.m_c1.selectedIndex = 1;
+//             item.m_btnBuy.m_txtTitle.text = itemData.price.ToString();
+//             if (item.target.data == null)
+//             {
+//                 item.target.onClick.Add(() =>
+//                 {
+//                     if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
+//                     {
+//                         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
+//                         LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+//                     }
+//                 });
+//             }
+//             item.target.data = index;
+//             item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
+//             item.m_txtDesc.text = string.Format("首充赠送+{0}{1}", itemData.itemNum, itemData.name);
+//             bool isDouble = StoreDataManager.Instance.GetRechargeBuyNumById(itemData.id) < itemData.doubleTimes;
+//             item.m_imgDouble.visible = isDouble;
+//             item.m_txtDesc.visible = isDouble;
+//             item.m_icon.url = "ui://Store/sc_zizhuan_" + itemData.id;
 
-            UI_StoreListItem.ProxyEnd();
-        }
+//             UI_StoreListItem.ProxyEnd();
+//         }
 
-        private void ListGiftItemRenderer(int index, GObject obj)
-        {
-            UI_ListGiftItem item = UI_ListGiftItem.Proxy(obj);
-            GiftBagCfg cfg = _giftCfgs[index];
+//         private void ListGiftItemRenderer(int index, GObject obj)
+//         {
+//             UI_ListGiftItem item = UI_ListGiftItem.Proxy(obj);
+//             GiftBagCfg cfg = _giftCfgs[index];
 
-            item.m_txtName.text = cfg.name;
-            item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res);
+//             item.m_txtName.text = cfg.name;
+//             item.m_icon.url = ResPathUtil.GetIconPath(cfg.res, "png"); // string.Format("ui://RechargeStore/{0}", cfg.res);
 
-            item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
-            item.m_grpDiscount.visible = cfg.desc != "";
+//             item.m_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
+//             item.m_grpDiscount.visible = cfg.desc != "";
 
-            item.m_txtEndTime.text = RechargeDataManager.Instance.GetEndTime(cfg.id);
-            item.m_grpEndTime.visible = cfg.endTime != "";
+//             item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
+//             item.m_grpEndTime.visible = cfg.endTime != "";
 
-            item.m_c2.selectedIndex = RechargeDataManager.Instance.GetGiftStateById(cfg.id) ? 0 : 1;
-            if (cfg.lockType == LockType.STORY_LV)
-            {
-                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
-                item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
-            }
-            else if (cfg.lockType == LockType.ROLE_LV)
-            {
-                item.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
-            }
+//             item.m_c2.selectedIndex = StoreDataManager.Instance.GetGiftStateById(cfg.id) ? 0 : 1;
+//             if (cfg.lockType == LockType.STORY_LV)
+//             {
+//                 StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLevelId);
+//                 item.m_txtLock.text = string.Format("通关{0}-{1}解锁", StoryUtil.GetChapterOrder(storyLevelCfg.chapterId), storyLevelCfg.order);
+//             }
+//             else if (cfg.lockType == LockType.ROLE_LV)
+//             {
+//                 item.m_txtLock.text = string.Format("角色达到{0}级解锁", cfg.lv);
+//             }
 
-            int buyNum = RechargeDataManager.Instance.GetGiftBuyNumById(cfg.id);
-            item.m_txtLimit.text = string.Format("{0}({1}/{2})", RechargeDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
-            item.m_txtLimit.visible = cfg.maxBuyNum > 0;
-            item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1;
-            if (item.m_c1.selectedIndex == 0)
-            {
-                item.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
-                if (cfg.price > 0 && cfg.costType != CostType.FREE)
-                {
-                    item.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
-                    item.m_grpIcon.visible = true;
-                    item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
+//             int buyNum = StoreDataManager.Instance.GetGiftBuyNumById(cfg.id);
+//             item.m_txtLimit.text = string.Format("{0}({1}/{2})", StoreDataManager.Instance.refreshType[cfg.refreshType], StringUtil.GetColorText(buyNum.ToString(), "#DA8870"), cfg.maxBuyNum);
+//             item.m_txtLimit.visible = cfg.maxBuyNum > 0;
+//             item.m_c1.selectedIndex = cfg.maxBuyNum == 0 || buyNum < cfg.maxBuyNum ? 0 : 1;
+//             if (item.m_c1.selectedIndex == 0)
+//             {
+//                 item.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
+//                 if (cfg.price > 0 && cfg.costType != CostType.FREE)
+//                 {
+//                     item.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
+//                     item.m_grpIcon.visible = true;
+//                     item.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
 
-                    if (cfg.costType == CostType.RMB)
-                    {
-                        item.m_loaIcon.visible = false;
-                        item.m_txtIcon.visible = true;
-                        item.m_txtIcon.text = "¥";
-                    }
-                    else
-                    {
-                        ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
-                        item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-                        item.m_loaIcon.visible = true;
-                        item.m_txtIcon.visible = false;
-                    }
-                }
-                else
-                {
-                    item.m_grpIcon.visible = false;
-                    item.m_grpOriginalPrice.visible = false;
-                    item.m_txtPrice.text = "免费";
-                }
-            }
+//                     if (cfg.costType == CostType.RMB)
+//                     {
+//                         item.m_loaIcon.visible = false;
+//                         item.m_txtIcon.visible = true;
+//                         item.m_txtIcon.text = "¥";
+//                     }
+//                     else
+//                     {
+//                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
+//                         item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+//                         item.m_loaIcon.visible = true;
+//                         item.m_txtIcon.visible = false;
+//                     }
+//                 }
+//                 else
+//                 {
+//                     item.m_grpIcon.visible = false;
+//                     item.m_grpOriginalPrice.visible = false;
+//                     item.m_txtPrice.text = "免费";
+//                 }
+//             }
 
-            if (item.target.data == null)
-            {
-                item.target.onClick.Add(OnBtnBuyClick);
-            }
-            item.target.data = cfg.id;
-            bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && cfg.price == 0;
+//             if (item.target.data == null)
+//             {
+//                 item.target.onClick.Add(OnBtnBuyClick);
+//             }
+//             item.target.data = cfg.id;
+//             bool isRed = item.m_c1.selectedIndex == 0 && item.m_c2.selectedIndex == 0 && cfg.price == 0;
 
-            RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
-            UI_ListGiftItem.ProxyEnd();
-        }
-        private void OnBtnBuyClick(EventContext context)
-        {
-            GObject btn = context.sender as GObject;
-            int giftId = (int)btn.data;
-            GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
-            if (cfg.maxBuyNum != 0 && RechargeDataManager.Instance.GetGiftBuyNumById(giftId) == cfg.maxBuyNum)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("已售罄");
-                return;
-            }
-            if (cfg.price == 0 || cfg.costType == CostType.FREE)
-            {
-                RechargeSProxy.ReqBuyGiftBag((int)btn.data).Coroutine();
-            }
-            else
-            {
-                ViewManager.Show<GiftBagBuyView>(btn.data);
-            }
-        }
+//             RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
+//             UI_ListGiftItem.ProxyEnd();
+//         }
+//         private void OnBtnBuyClick(EventContext context)
+//         {
+//             GObject btn = context.sender as GObject;
+//             int giftId = (int)btn.data;
+//             GiftBagCfg cfg = GiftBagCfgArray.Instance.GetCfg(giftId);
+//             if (cfg.maxBuyNum != 0 && StoreDataManager.Instance.GetGiftBuyNumById(giftId) == cfg.maxBuyNum)
+//             {
+//                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
+//                 return;
+//             }
+//             if (cfg.price == 0 || cfg.costType == CostType.FREE)
+//             {
+//                 RechargeSProxy.ReqBuyGiftBag((int)btn.data).Coroutine();
+//             }
+//             else
+//             {
+//                 ViewManager.Show<GiftBagBuyView>(btn.data);
+//             }
+//         }
 
-        private void ListExchangeItemRenderer(int index, GObject obj)
-        {
-            ShopExchangeCfg cfg = _exchangeCfgs[index];
-            UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
-            item.m_btnBuy.m_c1.selectedIndex = 0;
-            item.m_btnBuy.m_txtTitle.text = cfg.costNum.ToString();
-            item.m_txtExchangeCount.text = string.Format("x{0}", cfg.num);
-            // item.m_txtExchangeCount.visible = cfg.num > 1;
-            bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-            item.m_c1.selectedIndex = isSellOut ? 1 : 0;
-            if (item.target.data == null)
-            {
-                // item.target.onClick.Add(() =>
-                // {
-                //     bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-                //     if (isSellOut)
-                //     {
-                //         PromptController.Instance.ShowFloatTextPrompt("已售罄");
-                //         return;
-                //     }
-                //     ViewManager.Show<ItemExchangeView>(cfg.id);
-                // });
-                item.target.onClick.Add(OnBtnBugItem);
-            }
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
-            item.target.data = cfg;
-            item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costId).res);
-            item.m_txtName.text = itemCfg.name;
-            item.m_txtDesc.text = string.Format("剩余:{0}", cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id));
-            if (cfg.maxLimit == 0) item.m_txtDesc.text = "剩余:不限";
-            item.m_imgDouble.visible = false;
-            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+//         private void ListExchangeItemRenderer(int index, GObject obj)
+//         {
+//             ShopExchangeCfg cfg = _exchangeCfgs[index];
+//             UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
+//             item.m_btnBuy.m_c1.selectedIndex = 0;
+//             item.m_btnBuy.m_txtTitle.text = cfg.costNum.ToString();
+//             item.m_txtExchangeCount.text = string.Format("x{0}", cfg.num);
+//             // item.m_txtExchangeCount.visible = cfg.num > 1;
+//             bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
+//             item.m_c1.selectedIndex = isSellOut ? 1 : 0;
+//             if (item.target.data == null)
+//             {
+//                 // item.target.onClick.Add(() =>
+//                 // {
+//                 //     bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
+//                 //     if (isSellOut)
+//                 //     {
+//                 //         PromptController.Instance.ShowFloatTextPrompt("已售罄");
+//                 //         return;
+//                 //     }
+//                 //     ViewManager.Show<ItemExchangeView>(cfg.id);
+//                 // });
+//                 item.target.onClick.Add(OnBtnBugItem);
+//             }
+//             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.itemId);
+//             item.target.data = cfg;
+//             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costId).res);
+//             item.m_txtName.text = itemCfg.name;
+//             item.m_txtDesc.text = string.Format("剩余:{0}", cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id));
+//             if (cfg.maxLimit == 0) item.m_txtDesc.text = "剩余:不限";
+//             item.m_imgDouble.visible = false;
+//             item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
 
-            UI_StoreListItem.ProxyEnd();
-        }
-        private void OnBtnBugItem(EventContext context)
-        {
-            ShopExchangeCfg cfg = (context.sender as GObject).data as ShopExchangeCfg;
-            bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - RechargeDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
-            if (isSellOut)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("已售罄");
-                return;
-            }
-            ViewManager.Show<ItemExchangeView>(cfg.id);
-        }
+//             UI_StoreListItem.ProxyEnd();
+//         }
+//         private void OnBtnBugItem(EventContext context)
+//         {
+//             ShopExchangeCfg cfg = (context.sender as GObject).data as ShopExchangeCfg;
+//             bool isSellOut = cfg.maxLimit > 0 && cfg.maxLimit - StoreDataManager.Instance.GetExchangeBuyNumById(cfg.id) <= 0;
+//             if (isSellOut)
+//             {
+//                 PromptController.Instance.ShowFloatTextPrompt("已售罄");
+//                 return;
+//             }
+//             ViewManager.Show<ItemExchangeView>(cfg.id);
+//         }
 
-        private void UpdateRedDot()
-        {
-            RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
-        }
-    }
-}
+//         private void UpdateRedDot()
+//         {
+//             RedDotController.Instance.SetComRedDot(_ui.m_comTab.m_btn1.target, RedDotDataManager.Instance.GetRechargeGiftFreeRed());
+//         }
+//     }
+// }

二進制
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0.png


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0_1.png


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0_2.png


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png


二進制
GameClient/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Store/Store_atlas0_3.png.meta → GameClient/Assets/ResIn/UI/Store/Store_atlas_hhx91q.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8a96a6891257ecc4d9211e0a6ddb9845
+guid: a5c6852083c36374bb1abb5264771a08
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

二進制
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes