zhaoyang před 2 roky
rodič
revize
75bd296ac9

+ 14 - 11
FGUIProject/assets/Store/ItemExchangeUI.xml

@@ -2,14 +2,17 @@
 <component size="962,695">
   <displayList>
     <component id="n0_hinb" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,695"/>
-    <text id="n5_hinb" name="txtName" xy="426,28" pivot="0.5,0" size="116,74" fontSize="56" color="#8f6e30" align="center" text="名字"/>
+    <text id="n5_hinb" name="txtName" xy="426,28" pivot="0.5,0" size="116,74" group="n33_l500" fontSize="56" color="#8f6e30" align="center" text="名字"/>
     <image id="n19_ai2z" name="n19" src="dmsi1o" fileName="images/sc_tc_kuang_2.png" xy="64,148" group="n21_ai2z"/>
     <loader id="n4_hinb" name="icon" xy="73,158" size="200,200" group="n21_ai2z" aspect="true"/>
     <loader id="n17_ugdz" name="rarity" xy="231,158" size="44,94" group="n21_ai2z" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n28_10not" name="txtNum" xy="139,313" pivot="0.5,0" size="69,49" group="n21_ai2z" fontSize="36" color="#fff7e6" align="center" strokeColor="#816531" text="x10"/>
-    <text id="n29_10not" name="txtLastCount" xy="102,358" pivot="0.5,0" size="138,44" group="n21_ai2z" fontSize="32" color="#bc8068" text="剩余:100"/>
-    <group id="n21_ai2z" name="n21" xy="64,148" size="220,254"/>
-    <text id="n30_10not" name="txtHasCount" xy="708,121" size="138,46" fontSize="34" color="#a38e66" align="center" ubb="true" text="已拥有:"/>
+    <text id="n28_10not" name="txtNum" xy="145,313" pivot="0.5,0" size="56,49" group="n21_ai2z" fontSize="36" color="#fff7e6" align="center" strokeColor="#816531" text="x10"/>
+    <text id="n29_10not" name="txtLastCount" xy="109,358" pivot="0.5,0" size="123,44" group="n21_ai2z" fontSize="32" color="#bc8068" text="剩余:100"/>
+    <group id="n21_ai2z" name="n21" xy="64,148" size="220,254" group="n33_l500"/>
+    <text id="n30_10not" name="txtHasCount" xy="708,121" size="138,46" group="n33_l500" fontSize="34" color="#a38e66" align="center" ubb="true" text="已拥有:"/>
+    <text id="n31_10not" name="txtDiscribe" xy="331,176" size="546,187" group="n33_l500" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
+    <group id="n33_l500" name="n33" xy="64,28" size="813,374"/>
+    <list id="n35_l500" name="listItem" xy="46,245" size="200,300" overflow="scroll"/>
     <text id="n32_10not" name="n32" xy="56,422" size="180,59" group="n22_ai2z" fontSize="44" color="#a08249" align="center" text="兑换数量"/>
     <image id="n8_hinb" name="n8" src="dmsi1p" fileName="images/sc_tc_kuang_3.png" xy="257,429" group="n22_ai2z"/>
     <text id="n25_t1at" name="txtCount" xy="384,426" size="200,56" group="n22_ai2z" fontSize="42" color="#fdf3d7" align="center" vAlign="middle" autoSize="none" text="找钱"/>
@@ -18,17 +21,17 @@
     <component id="n23_ai2z" name="btnAll" src="ai2z9f" fileName="components/Button12.xml" pkg="eg2y0ldp" xy="761,417" group="n22_ai2z">
       <Button icon="ui://p9mtgheodmsi1n"/>
     </component>
-    <group id="n22_ai2z" name="n22" xy="56,417" size="849,75"/>
+    <group id="n22_ai2z" name="n22" xy="56,417" size="849,75" group="n34_l500"/>
     <image id="n18_ai2z" name="n18" src="j48o9a" fileName="images/kp_sjsj_di_4.png" pkg="eg2y0ldp" xy="346,521" size="276,34" group="n16_ugdz"/>
     <text id="n20_ai2z" name="n20" xy="374,510" size="76,49" group="n27_10not" fontSize="36" color="#a08249" text="花费"/>
     <loader id="n14_ugdz" name="iconPrice" xy="459,519" size="32,32" group="n27_10not" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n15_ugdz" name="txtPrice" xy="500,510" size="93,49" group="n27_10not" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
+    <text id="n15_ugdz" name="txtPrice" xy="500,510" size="74,49" group="n27_10not" fontSize="36" color="#fdf3d7" autoClearText="true" text="9999"/>
     <group id="n27_10not" name="n27" xy="374,510" size="219,49" group="n16_ugdz"/>
-    <group id="n16_ugdz" name="n16" xy="346,510" size="276,49" advanced="true"/>
-    <component id="n6_hinb" name="btnExchange" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="294,566">
-      <Button title="兑换"/>
+    <group id="n16_ugdz" name="n16" xy="346,510" size="276,49" group="n34_l500" advanced="true"/>
+    <component id="n6_hinb" name="btnExchange" src="q08x7" fileName="components/Button2.xml" pkg="mk0fwx0x" xy="294,566" group="n34_l500">
+      <Button title="购买"/>
     </component>
-    <text id="n31_10not" name="txtDiscribe" xy="331,176" size="546,96" fontSize="36" color="#a38b64" autoSize="none" text="描述描述描述描述描述描述描述描述"/>
+    <group id="n34_l500" name="n34" xy="56,417" size="849,260"/>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>

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


+ 20 - 0
FGUIProject/assets/Store/StoreChargeUI.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920" opaque="false">
+  <displayList>
+    <text id="n31_hhx9" name="n31" xy="230,723" size="619,39" fontSize="28" color="#8c8580" text="游戏中任意付费会按照1人民币*10换算成会员经验"/>
+    <component id="n33_hhx9" name="comVipLv" src="hhx91r" fileName="components/ComVipLv.xml" xy="62,493"/>
+    <list id="n10_d4iw" name="list" xy="0,793" size="1080,1033" layout="flow_hz" overflow="hidden" colGap="20" defaultItem="ui://p9mtgheohhx91i" align="center" scrollItemToViewOnClick="false">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n29_hhx9" name="n29" src="hhx90" fileName="components/ComZhuangShi.xml" xy="690,1420">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+  </displayList>
+</component>

+ 0 - 0
FGUIProject/assets/Store/GiftBagStoreUI.xml → FGUIProject/assets/Store/StoreGiftBagUI.xml


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

@@ -130,10 +130,11 @@
     <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="ChargeStoreUI.xml" path="/" exported="true"/>
+    <component id="l500tb9" name="StoreChargeUI.xml" path="/" exported="true"/>
     <component id="l500tbb" name="Button5.xml" path="/components/"/>
-    <component id="l500tbc" name="GiftBagStoreUI.xml" path="/" exported="true"/>
+    <component id="l500tbc" name="StoreGiftBagUI.xml" path="/" exported="true"/>
     <component id="l500tbe" name="ListShopItem.xml" path="/components/"/>
+    <component id="l500tbf" name="StoreChargeAddUpUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Store" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Store
 {
-    public partial class UI_ChargeStoreUI
+    public partial class UI_StoreChargeUI
     {
         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 = "ChargeStoreUI";
-        private static UI_ChargeStoreUI _proxy;
+        public const string RES_NAME = "StoreChargeUI";
+        private static UI_StoreChargeUI _proxy;
 
-        public static UI_ChargeStoreUI Create(GObject gObject = null)
+        public static UI_StoreChargeUI Create(GObject gObject = null)
         {
-            var ui = new UI_ChargeStoreUI();
+            var ui = new UI_StoreChargeUI();
             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_ChargeStoreUI Proxy(GObject gObject = null)
+        public static UI_StoreChargeUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ChargeStoreUI();
+                _proxy = new UI_StoreChargeUI();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagStoreUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreChargeUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1291afd3f76e51948a0a4d1d4e986382
+guid: 63651d1b4faf0bd498e89e4bdc688ec1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_GiftBagStoreUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGiftBagUI.cs

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/ChargeStoreView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreGiftBagUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fdd2736077e8b324c9b104b9df3b2dc8
+guid: 42ea7247ca4ad884c9c2e5a8d184b5cc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 65 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -0,0 +1,65 @@
+using UI.Store;
+using UI.CommonGame;
+using FairyGUI;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class StoreChargeAddUpView : BaseWindow
+    {
+        private UI_StoreGiftBagUI _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_StoreGiftBagUI.PACKAGE_NAME;
+            _ui = UI_StoreGiftBagUI.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();
+            int menu2 = (int)this.viewData;
+            _shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
+            _shopCfgs = ShopDataManager.Instance.SortGiftBagCfgs(_shopCfgs);
+            _ui.m_list.numItems = _shopCfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+
+        private void ListItemRenderer(int index, GObject obj)
+        {
+            ShopCfg shopCfg = _shopCfgs[index];
+            ShopViewManager.Instance.UptadeItem(obj, shopCfg);
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c6fe948fadb670847a1128234e82287b
+guid: e330ba9af7e07e543b423d8fd79f0ae3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 4 - 12
GameClient/Assets/Game/HotUpdate/Views/Store/ChargeStoreView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -6,9 +6,9 @@ using ET;
 
 namespace GFGGame
 {
-    public class ChargeStoreView : BaseWindow
+    public class StoreChargeView : BaseWindow
     {
-        private UI_ChargeStoreUI _ui;
+        private UI_StoreChargeUI _ui;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
@@ -25,8 +25,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_ChargeStoreUI.PACKAGE_NAME;
-            _ui = UI_ChargeStoreUI.Create();
+            packageName = UI_StoreChargeUI.PACKAGE_NAME;
+            _ui = UI_StoreChargeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
             this.clickBlankToClose = false;
@@ -70,14 +70,6 @@ namespace GFGGame
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnClickBtnBuy);
-                // 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.itemName);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_ChargeStoreUI.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3d04756b768f0264294471abdd1f7de1
+guid: d6c0992d39a69454aa5cef76c3332e3f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/Store/GiftBagStoreView.cs → GameClient/Assets/Game/HotUpdate/Views/Store/StoreGiftBagView.cs

@@ -6,9 +6,9 @@ using ET;
 
 namespace GFGGame
 {
-    public class GiftBagStoreView : BaseWindow
+    public class StoreGiftBagView : BaseWindow
     {
-        private UI_GiftBagStoreUI _ui;
+        private UI_StoreGiftBagUI _ui;
         private List<ShopCfg> _shopCfgs;
 
         public override void Dispose()
@@ -25,8 +25,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_GiftBagStoreUI.PACKAGE_NAME;
-            _ui = UI_GiftBagStoreUI.Create();
+            packageName = UI_StoreGiftBagUI.PACKAGE_NAME;
+            _ui = UI_StoreGiftBagUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
             this.clickBlankToClose = false;

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

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

binární
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


binární
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes