zhaoyang 2 年之前
父節點
當前提交
caff64a684
共有 31 個文件被更改,包括 547 次插入45 次删除
  1. 0 0
      FGUIProject/assets/Store/ChargeStoreUI.xml
  2. 21 0
      FGUIProject/assets/Store/GiftBagStoreUI.xml
  3. 18 0
      FGUIProject/assets/Store/components/Button5.xml
  4. 21 31
      FGUIProject/assets/Store/components/ListGiftItem.xml
  5. 37 0
      FGUIProject/assets/Store/components/ListShopItem.xml
  6. 5 2
      FGUIProject/assets/Store/package.xml
  7. 1 1
      GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs
  8. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button5.cs
  9. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button5.cs.meta
  10. 7 7
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeStoreUI.cs
  11. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeStoreUI.cs.meta
  12. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagStoreUI.cs
  13. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagStoreUI.cs.meta
  14. 102 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListShopItem.cs
  15. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListShopItem.cs.meta
  16. 8 0
      GameClient/Assets/Game/HotUpdate/Views/Store.meta
  17. 3 3
      GameClient/Assets/Game/HotUpdate/Views/Store/ChargeStoreView.cs
  18. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/ChargeStoreView.cs.meta
  19. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagBuyView.cs
  20. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagBuyView.cs.meta
  21. 128 0
      GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs
  22. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs.meta
  23. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs
  24. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs.meta
  25. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/RechargeStoreView.cs
  26. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/RechargeStoreView.cs.meta
  27. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs
  28. 0 0
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs.meta
  29. 二進制
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  30. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_atlas0.png
  31. 二進制
      GameClient/Assets/ResIn/UI/Store/Store_fui.bytes

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


+ 21 - 0
FGUIProject/assets/Store/GiftBagStoreUI.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <list id="n0_l500" name="list" xy="22,495" size="1036,1362" layout="flow_hz" overflow="scroll" colGap="30" defaultItem="ui://p9mtgheol500tbe" align="center" vAlign="middle" autoClearItems="true">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n2_l500" name="n2" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

+ 18 - 0
FGUIProject/assets/Store/components/Button5.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="148,35" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n9_l500" name="txtIcon" xy="3,-4" size="36,44" group="n8_l500" fontSize="32" color="#5a3e16" align="center" text="¥"/>
+    <loader id="n3_l500" name="loaIcon" xy="41,-2" size="40,40" group="n8_l500" aspect="true" visible="false" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n5_l500" name="txtOriginalPrice" xy="46,-3" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
+    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="41,16" pivot="0.5,0" group="n7_l500">
+      <relation target="n5_l500" sidePair="width-width"/>
+    </image>
+    <group id="n7_l500" name="n7" xy="41,-3" size="60,44" group="n8_l500"/>
+    <text id="n4_l500" name="txtPrice" xy="103,-9" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
+    <group id="n8_l500" name="n8" xy="3,-9" size="143,54" advanced="true" layout="hz" colGap="2" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+  </displayList>
+  <Button/>
+</component>

+ 21 - 31
FGUIProject/assets/Store/components/ListGiftItem.xml

@@ -1,45 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="478,401">
-  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="0"/>
-  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
+<component size="460,270">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1"/>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n22_10not" name="n22" src="dmsi1k" fileName="images/sc_kuangdikjia_2.png" xy="0,0"/>
-    <image id="n24_10not" name="n24" src="dmsi1j" fileName="images/sc_kuangczcz.png" xy="2,98" group="n26_10not"/>
-    <text id="n25_10not" name="txtDesc" xy="23,121" size="80,78" group="n26_10not" fontSize="32" color="#ffe5cf" align="center" leading="-5" letterSpacing="-2" vars="true" text="超值&#xA;{count=250}%"/>
-    <group id="n26_10not" name="grpDiscount" xy="2,98" size="128,132" advanced="true"/>
-    <loader id="n23_10not" name="icon" xy="56,186" size="140,140" aspect="true" url="ui://vlgobc15d4iwl" fill="scaleMatchHeight"/>
-    <text id="n27_10not" name="txtName" xy="346,135" pivot="0.5,0" anchor="true" size="85,56" fontSize="42" color="#906d4b" align="center" leading="-5" letterSpacing="-2" text="珍珠"/>
-    <image id="n28_10not" name="n28" src="dmsi1l" fileName="images/sc_kuangsjsj.png" xy="269,232" group="n30_10not"/>
-    <text id="n29_10not" name="txtEndTime" xy="300,230" pivot="0.5,0" size="90,41" group="n30_10not" fontSize="30" color="#ffffff" align="center" leading="-5" letterSpacing="-2" strokeColor="#b98653" strokeSize="2" text="12小时"/>
-    <group id="n30_10not" name="grpEndTime" xy="269,230" size="155,42" advanced="true">
-      <gearDisplay controller="c1" pages="0"/>
+    <image id="n22_10not" name="n22" src="hhx91f" fileName="imagesNew/GiftBag_baseboard1.png" xy="26,0"/>
+    <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="0,-1" group="n26_10not"/>
+    <text id="n48_l500" name="n48" xy="17,7" size="69,46" group="n26_10not" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
+    <text id="n49_l500" name="txtDesc" xy="18,32" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
+    <text id="n50_l500" name="n50" xy="67,45" size="19,31" group="n51_l500" fontSize="22" color="#ffffff" letterSpacing="-2" text="%"/>
+    <group id="n51_l500" name="n51" xy="18,32" size="68,52" group="n26_10not" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n32_10not" name="txtLimit" xy="41,332" pivot="0.5,0" size="177,36" fontSize="26" color="#ab9a87" align="center" leading="-5" letterSpacing="-2" ubb="true" text="每日限购(0/1)">
+    <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="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天后下架">
       <gearDisplay controller="c1" pages="0"/>
     </text>
-    <text id="n31_10not" name="txtLock" xy="347,300" pivot="0.5,0" anchor="true" size="215,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+    <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)">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <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解锁">
       <gearDisplay controller="c2" pages="1"/>
     </text>
-    <loader id="n36_iftf" name="loaIcon" xy="246,294" size="60,60" group="n38_iftf" visible="false" url="ui://vlgobc15iftftad" fill="scaleFree"/>
-    <text id="n37_iftf" name="txtIcon" xy="245,299" pivot="0.5,0" size="44,54" group="n38_iftf" fontSize="40" color="#896e5f" text="¥"/>
-    <group id="n38_iftf" name="grpIcon" xy="246,299" size="44,54" group="n43_iftf" advanced="true" layout="hz" excludeInvisibles="true"/>
-    <text id="n39_iftf" name="txtOriginalPrice" xy="303,299" pivot="0.5,0" size="71,54" group="n41_iftf" fontSize="40" color="#bca89d" align="center" text="100"/>
-    <image id="n40_iftf" name="n40" src="iftftae" fileName="images/sc_xtxtxt(1).png" xy="306,326" pivot="0.5,0" size="72,2" group="n41_iftf">
-      <relation target="n39_iftf" sidePair="width-width"/>
-    </image>
-    <group id="n41_iftf" name="grpOriginalPrice" xy="300,299" size="78,54" group="n43_iftf" advanced="true"/>
-    <text id="n42_iftf" name="txtPrice" xy="391,299" pivot="0.5,0" size="48,54" group="n43_iftf" fontSize="40" color="#896e5f" align="right" text="10"/>
-    <group id="n43_iftf" name="grpPrice" xy="246,299" size="196,54" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
-      <gearDisplay controller="c1" pages="0"/>
-      <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <text id="n44_iftf" name="n44" xy="291,296" size="124,54" fontSize="40" color="#a59f8f" align="center" text="已售罄">
+    <text id="n44_iftf" name="n44" xy="280,120" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
     </text>
-    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="3,96">
+    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="-7,-29">
       <gearDisplay controller="c1" pages="1"/>
     </image>
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="257,184"/>
   </displayList>
 </component>

+ 37 - 0
FGUIProject/assets/Store/components/ListShopItem.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="290,455">
+  <controller name="c1" alias="礼包购买状态" pages="0,,1," selected="1"/>
+  <controller name="c2" alias="礼包解锁状态" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n22_10not" name="n22" src="hhx9w" fileName="imagesNew/GiftBag_baseboard.png" xy="0,0"/>
+    <image id="n47_l500" name="imgDouble" src="hhx9v" fileName="imagesNew/font_save_baseboard.png" xy="191,263" group="n54_l500"/>
+    <text id="n48_l500" name="n48" xy="208,271" size="69,46" group="n54_l500" fontSize="34" color="#ffffff" letterSpacing="-2" text="超值"/>
+    <text id="n49_l500" name="txtDesc" xy="205,301" pivot="0.5,0" size="55,51" group="n51_l500" fontSize="38" color="#ffffff" align="center" letterSpacing="-2" strokeColor="#cc3300" text="800"/>
+    <text id="n50_l500" name="n50" xy="254,314" size="19,31" group="n51_l500" fontSize="22" color="#ffffff" letterSpacing="-2" text="%"/>
+    <group id="n51_l500" name="n51" xy="205,301" size="68,52" group="n54_l500" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <group id="n54_l500" name="n54" xy="191,263" size="100,96" group="n26_10not"/>
+    <group id="n26_10not" name="grpDiscount" xy="191,263" size="100,96" advanced="true"/>
+    <loader id="n23_10not" name="icon" xy="61,169" size="162,162" aspect="true" url="ui://p9mtgheohhx91n" fill="scaleMatchHeight"/>
+    <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" text="1天后下架">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <text id="n32_10not" 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)">
+      <gearDisplay controller="c1" pages="0"/>
+    </text>
+    <text id="n31_10not" name="txtLock" xy="145,121" pivot="0.5,0" anchor="true" size="210,49" fontSize="36" color="#aa9561" align="center" leading="-5" letterSpacing="-2" text="通关4-10解锁">
+      <gearDisplay controller="c2" pages="1"/>
+    </text>
+    <text id="n44_iftf" name="n44" xy="89,330" size="112,49" fontSize="36" color="#a59f8f" align="center" text="已售罄">
+      <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+    </text>
+    <image id="n45_t8xr" name="n45" src="10not1u" fileName="images/sc_kuangand.png" xy="0,-84" size="291,600">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <component id="n53_l500" name="btnBuy" src="l500tbb" fileName="components/Button5.xml" xy="71,390"/>
+    <image id="n55_l500" name="n55" src="fqortau" fileName="imagesNew/sc_xian.png" xy="27,119" size="236,4"/>
+  </displayList>
+</component>

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

@@ -50,7 +50,7 @@
     <image id="fqortap" name="sc_zhuangshihua.png" path="/imagesNew/"/>
     <image id="fqortaq" name="sc_tab_xuanzhong.png" path="/imagesNew/"/>
     <image id="fqortar" name="sc_xiangqing.png" path="/imagesNew/"/>
-    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/"/>
+    <image id="fqortas" name="sc_jinxiexian.png" path="/imagesNew/" scale="9grid" scale9grid="15,2,30,4"/>
     <image id="fqortau" name="sc_xian.png" path="/imagesNew/" scale="9grid" scale9grid="11,1,22,2"/>
     <image id="fqortav" name="sc_subTab_xz.png" path="/imagesNew/"/>
     <image id="fqortaw" name="sc_subtab.png" path="/imagesNew/"/>
@@ -130,7 +130,10 @@
     <component id="hhx91p" name="ProgressBar1.xml" path="/components/"/>
     <image id="hhx91q" name="sc_beijing.png" path="/imagesNew/" atlas="alone_npot"/>
     <component id="hhx91r" name="ComVipLv.xml" path="/components/"/>
-    <component id="l500tb9" name="ChargeUI.xml" path="/" exported="true"/>
+    <component id="l500tb9" name="ChargeStoreUI.xml" path="/" exported="true"/>
+    <component id="l500tbb" name="Button5.xml" path="/components/"/>
+    <component id="l500tbc" name="GiftBagStoreUI.xml" path="/" exported="true"/>
+    <component id="l500tbe" name="ListShopItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs

@@ -29,7 +29,7 @@ namespace GFGGame
             if (com.m_btnRule.data == null)
             {
                 com.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-                com.m_btnRule.data = 300007;
+                com.m_btnRule.data = 300009;
             }
             if (nextVipCfg != null)
             {

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_Button5.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_Button5
+    {
+        public GButton target;
+        public GTextField m_txtIcon;
+        public GLoader m_loaIcon;
+        public GTextField m_txtOriginalPrice;
+        public GTextField m_txtPrice;
+        public const string URL = "ui://p9mtgheol500tbb";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
+
+        public static UI_Button5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button5();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button5();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_txtIcon = (GTextField)comp.GetChild("txtIcon");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtOriginalPrice = (GTextField)comp.GetChild("txtOriginalPrice");
+            m_txtPrice = (GTextField)comp.GetChild("txtPrice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtIcon = null;
+            m_loaIcon = null;
+            m_txtOriginalPrice = null;
+            m_txtPrice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeStoreUI.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_ChargeUI
+    public partial class UI_ChargeStoreUI
     {
         public GComponent target;
         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 = "ChargeUI";
-        private static UI_ChargeUI _proxy;
+        public const string RES_NAME = "ChargeStoreUI";
+        private static UI_ChargeStoreUI _proxy;
 
-        public static UI_ChargeUI Create(GObject gObject = null)
+        public static UI_ChargeStoreUI Create(GObject gObject = null)
         {
-            var ui = new UI_ChargeUI();
+            var ui = new UI_ChargeStoreUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Store
             return ui;
         }
 
-        public static UI_ChargeUI Proxy(GObject gObject = null)
+        public static UI_ChargeStoreUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ChargeUI();
+                _proxy = new UI_ChargeStoreUI();
             }
             var ui = _proxy;
             if(gObject == null)

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagStoreUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_GiftBagStoreUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://p9mtgheol500tbc";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "GiftBagStoreUI";
+        private static UI_GiftBagStoreUI _proxy;
+
+        public static UI_GiftBagStoreUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GiftBagStoreUI();
+            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_GiftBagStoreUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GiftBagStoreUI();
+            }
+            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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 102 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ListShopItem.cs

@@ -0,0 +1,102 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Store
+{
+    public partial class UI_ListShopItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public Controller m_c2;
+        public GImage m_imgDouble;
+        public GTextField m_txtDesc;
+        public GGroup m_grpDiscount;
+        public GLoader m_icon;
+        public GTextField m_txtName;
+        public GTextField m_txtEndTime;
+        public GTextField m_txtLimit;
+        public GTextField m_txtLock;
+        public UI_Button5 m_btnBuy;
+        public const string URL = "ui://p9mtgheol500tbe";
+        public const string PACKAGE_NAME = "Store";
+        public const string RES_NAME = "ListShopItem";
+        private static UI_ListShopItem _proxy;
+
+        public static UI_ListShopItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListShopItem();
+            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_ListShopItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListShopItem();
+            }
+            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_imgDouble = (GImage)comp.GetChild("imgDouble");
+            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_txtLimit = (GTextField)comp.GetChild("txtLimit");
+            m_txtLock = (GTextField)comp.GetChild("txtLock");
+            m_btnBuy = (UI_Button5)UI_Button5.Create(comp.GetChild("btnBuy"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_c2 = null;
+            m_imgDouble = null;
+            m_txtDesc = null;
+            m_grpDiscount = null;
+            m_icon = null;
+            m_txtName = null;
+            m_txtEndTime = null;
+            m_txtLimit = null;
+            m_txtLock = null;
+            m_btnBuy.Dispose();
+            m_btnBuy = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/Store.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b5a6d93f7f1ca1f44940bd33da16774e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ChargeStoreView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/ChargeStoreView.cs

@@ -8,7 +8,7 @@ namespace GFGGame
 {
     public class ChargeStoreView : BaseWindow
     {
-        private UI_ChargeUI _ui;
+        private UI_ChargeStoreUI _ui;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
@@ -25,8 +25,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ChargeUI.PACKAGE_NAME;
-            _ui = UI_ChargeUI.Create();
+            packageName = UI_ChargeStoreUI.PACKAGE_NAME;
+            _ui = UI_ChargeStoreUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
             this.clickBlankToClose = false;

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


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagBuyView.cs


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/GiftBagBuyView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagBuyView.cs.meta


+ 128 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs

@@ -0,0 +1,128 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class GiftBagStoreView : BaseWindow
+    {
+        private UI_GiftBagStoreUI _ui;
+        private List<ShopCfg> _shopCfgs;
+
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+            }
+            _ui = null;
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_GiftBagStoreUI.PACKAGE_NAME;
+            _ui = UI_GiftBagStoreUI.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();
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            // UI_ListShopItem item = UI_ListShopItem.Proxy(obj);
+            // ShopCfg 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_txtDesc.SetVar("count", cfg.desc).FlushVars(); ;
+            // item.m_grpDiscount.visible = cfg.desc != "";
+
+            // item.m_txtEndTime.text = StoreDataManager.Instance.GetEndTime(cfg.id);
+            // item.m_grpEndTime.visible = cfg.endTime != "";
+
+            // 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 = 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_btnBuy.m_txtOriginalPrice.text = NumberUtil.ChangeNumberUnit(cfg.originalPrice);// cfg.originalPrice.ToString();
+            //     if (cfg.price > 0 && cfg.costType != CostType.FREE)
+            //     {
+            //         item.m_btnBuy.m_grpOriginalPrice.visible = cfg.originalPrice > 0;
+            //         item.m_btnBuy.m_grpIcon.visible = true;
+            //         item.m_btnBuy.m_txtPrice.text = NumberUtil.ChangeNumberUnit(cfg.price);// cfg.price.ToString();
+
+            //         if (cfg.costType == CostType.RMB)
+            //         {
+            //             item.m_btnBuy.m_loaIcon.visible = false;
+            //             item.m_btnBuy.m_txtIcon.visible = true;
+            //             item.m_btnBuy.m_txtIcon.text = "¥";
+            //         }
+            //         else
+            //         {
+            //             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.costId);
+            //             item.m_btnBuy.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+            //             item.m_btnBuy.m_loaIcon.visible = true;
+            //             item.m_btnBuy.m_txtIcon.visible = false;
+            //         }
+            //     }
+            //     else
+            //     {
+            //         item.m_btnBuy.m_grpIcon.visible = false;
+            //         item.m_btnBuy.m_grpOriginalPrice.visible = false;
+            //         item.m_btnBuy.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;
+
+            // RedDotController.Instance.SetComRedDot(item.target, isRed, "", -6, 100);
+            // UI_ListShopItem.ProxyEnd();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs.meta

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

+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/ItemExchangeView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs.meta


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/RechargeStoreView.cs


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Store/RechargeStoreView.cs.meta


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/StoreView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs


+ 0 - 0
GameClient/Assets/Game/HotUpdate/Views/RechargeStore/StoreView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs.meta


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


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


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