充值资源替换

FGUIProject/assets/CommonGame/package.xml

@@ -176,6 +176,7 @@
     <image id="bd1ca0" name="jingzhongh_bg.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
     <component id="n3xha1" name="ComCostCurrency.xml" path="/components/" exported="true"/>
     <font id="k1kha2" name="SIMKAI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="10nota3" name="scsc_bjbj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RechargeStore/RechargeStoreUI.xml

@@ -1,31 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <image id="n2_d4iw" name="n2" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240">
+    <image id="n2_d4iw" name="n2" src="10nota3" fileName="bgimg/scsc_bjbj.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n1_d4iw" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
     <component id="n3_d4iw" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n4_d4iw" name="n4" src="d4iwd" fileName="images/sc_yj_xiantiao.png" xy="44,332" size="992,2"/>
-    <image id="n6_d4iw" name="n6" src="d4iwb" fileName="images/sc_ej_mengban.png" xy="46,389" size="988,70"/>
-    <component id="n8_d4iw" name="n8" src="d4iwf" fileName="components/ButtonTab1.xml" xy="46,389">
-      <Button title="钻石"/>
-    </component>
-    <image id="n9_d4iw" name="n9" src="nz0tx" fileName="images/sc_rwrw.png" xy="336,542">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
+    <component id="n1_d4iw" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
+    <image id="n15_10not" name="n15" src="dmsi1d" fileName="images/sc_kuangjia_1.png" xy="0,305" size="1080,1615">
+      <relation target="" sidePair="height-height,top-top"/>
     </image>
-    <list id="n10_d4iw" name="list" xy="0,534" size="685,1060" overflow="scroll" scrollBarFlags="128" lineGap="62" scrollItemToViewOnClick="false">
+    <image id="n16_10not" name="n16" src="10not1r" fileName="images/sc_kuangjia_3.png" xy="0,1613"/>
+    <component id="n17_10not" name="comTab" src="10not1s" fileName="components/Component1.xml" xy="96,290"/>
+    <list id="n10_d4iw" name="list" xy="0,368" size="1080,1208" layout="flow_hz" overflow="scroll" scrollBarFlags="64" colGap="22" defaultItem="ui://vlgobc15d4iwr" align="center" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <component id="n12_nz0t" name="btn" src="nz0t14" fileName="components/Button1.xml" xy="391,215">
-      <Button checked="true" controller="c1" page="0"/>
-    </component>
-    <image id="n13_nz0t" name="n13" src="nz0t12" fileName="images/sc_zdyy_1.png" xy="0,1223">
-      <relation target="" sidePair="bottom-bottom"/>
-    </image>
-    <image id="n14_nz0t" name="n14" src="nz0t13" fileName="images/sc_zdyy_2.png" xy="379,1675">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </image>
   </displayList>
 </component>

FGUIProject/assets/RechargeStore/components/Button2.xml

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="258,70" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_dmsi" src="dmsi17" name="n0" xy="0,0">
-      <gearDisplay controller="button" pages="0,2"/>
-      <relation target="" sidePair="width,height"/>
-    </image>
-    <image id="n1_dmsi" src="dmsi16" name="n1" xy="0,0">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width,height"/>
-    </image>
+    <loader id="n2_10not" name="icon" xy="0,0" size="258,70" url="ui://vlgobc15dmsi17" autoSize="true"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/RechargeStore/components/Component1.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="890,70">
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <displayList>
+    <component id="n17_10not" name="n17" src="dmsi1q" fileName="components/Button2.xml" xy="0,0">
+      <Button icon="ui://vlgobc15dmsi17" selectedIcon="ui://vlgobc15dmsi16" controller="c1" page="0"/>
+    </component>
+    <component id="n18_10not" name="n18" src="dmsi1q" fileName="components/Button2.xml" xy="314,0">
+      <Button icon="ui://vlgobc15dmsi19" selectedIcon="ui://vlgobc15dmsi18" controller="c1" page="1"/>
+    </component>
+    <component id="n19_10not" name="n19" src="dmsi1q" fileName="components/Button2.xml" xy="628,0">
+      <Button icon="ui://vlgobc15dmsi1b" selectedIcon="ui://vlgobc15dmsi1a" controller="c1" page="2"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/RechargeStore/components/StoreListItem.xml

@@ -2,12 +2,12 @@
 <component size="302,517" pivot="0.5,0">
   <displayList>
     <image id="n17_dmsi" name="n17" src="dmsi1c" fileName="images/sc_kuangdikjia_1.png" xy="0,0"/>
-    <image id="n12_d4iw" name="imgDouble" src="dmsi1e" fileName="images/sc_kuangjia_2.png" xy="242,97"/>
+    <image id="n12_d4iw" name="imgDouble" src="dmsi1e" fileName="images/sc_kuangjia_2.png" xy="234,109"/>
     <loader id="n15_d4iw" name="icon" xy="70,211" size="162,162" url="ui://vlgobc15d4iwl"/>
-    <text id="n16_d4iw" name="txtName" xy="76,140" pivot="0.5,0" size="149,52" fontSize="38" color="#906d4b" align="center" text="钻石600">
+    <text id="n16_d4iw" name="txtName" xy="76,140" pivot="0.5,0" size="149,51" fontSize="38" color="#906d4b" align="center" text="钻石600">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n14_d4iw" name="btnBuy" src="d4iw59" fileName="components/Button5.xml" pkg="eg2y0ldp" xy="19,433"/>
-    <text id="n18_dmsi" name="txtDouble" xy="8,394" pivot="0.5,0" size="286,49" fontSize="36" color="#bb674e" text="首充赠送+60钻石"/>
+    <text id="n18_dmsi" name="txtDouble" xy="8,380" pivot="0.5,0" size="286,49" fontSize="36" color="#bb674e" text="首充赠送+60钻石"/>
   </displayList>
 </component>

FGUIProject/assets/RechargeStore/package.xml

@@ -2,16 +2,10 @@
 <packageDescription id="vlgobc15">
   <resources>
     <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
-    <image id="d4iw9" name="sc_bjtu.png" path="/images/" atlas="alone_npot"/>
-    <image id="d4iwa" name="sc_ej_anniu_xz.png" path="/images/"/>
-    <image id="d4iwb" name="sc_ej_mengban.png" path="/images/" scale="9grid" scale9grid="31,17,62,34"/>
-    <image id="d4iwc" name="sc_yj_anniu_xz.png" path="/images/"/>
     <image id="d4iwd" name="sc_yj_xiantiao.png" path="/images/" scale="9grid" scale9grid="14,0,28,0"/>
     <component id="d4iwf" name="ButtonTab1.xml" path="/components/"/>
     <image id="d4iwg" name="sc_kuangjiazi_1.png" path="/images/"/>
     <image id="d4iwh" name="sc_kuangjiazi_2.png" path="/imagesExport/" exported="true"/>
-    <image id="d4iwi" name="sc_scjiabei.png" path="/images/"/>
-    <image id="d4iwk" name="sc_diban_1.png" path="/images/"/>
     <image id="d4iwl" name="sc_zizhuan_1.png" path="/imagesExport/" exported="true"/>
     <image id="d4iwm" name="sc_zizhuan_2.png" path="/imagesExport/" exported="true"/>
     <image id="d4iwn" name="sc_zizhuan_3.png" path="/imagesExport/" exported="true"/>
@@ -19,17 +13,6 @@
     <image id="d4iwp" name="sc_zizhuan_5.png" path="/imagesExport/" exported="true"/>
     <image id="d4iwq" name="sc_zizhuan_6.png" path="/imagesExport/" exported="true"/>
     <component id="d4iwr" name="StoreListItem.xml" path="/components/" exported="true"/>
-    <image id="nz0tt" name="sc_ejzi_1.png" path="/images/"/>
-    <image id="nz0tu" name="sc_ejzi_2.png" path="/images/"/>
-    <image id="nz0tv" name="sc_ejzi_3.png" path="/images/"/>
-    <image id="nz0tw" name="sc_ejzi_4.png" path="/images/"/>
-    <image id="nz0tx" name="sc_rwrw.png" path="/images/"/>
-    <image id="nz0ty" name="sc_yj_zi_1.png" path="/images/"/>
-    <image id="nz0tz" name="sc_yj_zi_2.png" path="/images/"/>
-    <image id="nz0t10" name="sc_yj_zi_3.png" path="/images/"/>
-    <image id="nz0t11" name="sc_yj_zi_4.png" path="/images/"/>
-    <image id="nz0t12" name="sc_zdyy_1.png" path="/images/"/>
-    <image id="nz0t13" name="sc_zdyy_2.png" path="/images/"/>
     <component id="nz0t14" name="Button1.xml" path="/components/"/>
     <image id="dmsi15" name="scsc_anniuej_2.png" path="/images/"/>
     <image id="dmsi16" name="sc_anniuyij_1.png" path="/images/"/>
@@ -39,12 +22,11 @@
     <image id="dmsi1a" name="sc_anniuyij_5.png" path="/images/"/>
     <image id="dmsi1b" name="sc_anniuyij_6.png" path="/images/"/>
     <image id="dmsi1c" name="sc_kuangdikjia_1.png" path="/images/"/>
-    <image id="dmsi1d" name="sc_kuangjia_1.png" path="/images/"/>
+    <image id="dmsi1d" name="sc_kuangjia_1.png" path="/images/" scale="9grid" scale9grid="269,469,540,1064"/>
     <image id="dmsi1e" name="sc_kuangjia_2.png" path="/images/"/>
     <image id="dmsi1f" name="sc_shulianga.png" path="/images/"/>
     <image id="dmsi1g" name="scsc_anniuej_1.png" path="/images/"/>
     <image id="dmsi1h" name="sc_xtxtxt.png" path="/images/"/>
-    <image id="dmsi1i" name="sc_kuangand.png" path="/images/"/>
     <image id="dmsi1j" name="sc_kuangczcz.png" path="/images/"/>
     <image id="dmsi1k" name="sc_kuangdikjia_2.png" path="/images/"/>
     <image id="dmsi1l" name="sc_kuangsjsj.png" path="/images/"/>
@@ -53,6 +35,8 @@
     <image id="dmsi1o" name="sc_tc_kuang_2.png" path="/images/"/>
     <image id="dmsi1p" name="sc_tc_kuang_3.png" path="/images/"/>
     <component id="dmsi1q" name="Button2.xml" path="/components/"/>
+    <image id="10not1r" name="sc_kuangjia_3.png" path="/images/"/>
+    <component id="10not1s" name="Component1.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Component1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.RechargeStore
+{
+    public partial class UI_Component1
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public const string URL = "ui://vlgobc1510not1s";
+        public const string PACKAGE_NAME = "RechargeStore";
+        public const string RES_NAME = "Component1";
+        private static UI_Component1 _proxy;
+
+        public static UI_Component1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component1();
+            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_Component1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component1();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_Component1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RechargeStore/UI_RechargeStoreUI.cs

@@ -8,10 +8,10 @@ namespace UI.RechargeStore
     {
         public GComponent target;
         public Controller m_c1;
-        public GComponent m_valueBar;
         public GButton m_btnBack;
+        public GComponent m_valueBar;
+        public UI_Component1 m_comTab;
         public GList m_list;
-        public GButton m_btn;
         public const string URL = "ui://vlgobc15d4iw0";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "RechargeStoreUI";
@@ -60,18 +60,19 @@ namespace UI.RechargeStore
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_comTab = (UI_Component1)UI_Component1.Create(comp.GetChild("comTab"));
             m_list = (GList)comp.GetChild("list");
-            m_btn = (GButton)comp.GetChild("btn");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_valueBar = null;
             m_btnBack = null;
+            m_valueBar = null;
+            m_comTab.Dispose();
+            m_comTab = null;
             m_list = null;
-            m_btn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,10 +7,7 @@ namespace GFGGame
         public static async ETTask ReqRecharge(int rechargeId)
         {
             M2C_Recharge response = null;
-            response = (M2C_Recharge)await MessageHelper.SendToServer(new C2M_Recharge()
-            {
-                RechargeId = rechargeId
-            });
+            response = (M2C_Recharge)await MessageHelper.SendToServer(new C2M_Recharge() { RechargeId = rechargeId });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -31,13 +31,17 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            InitList();
+
+            _ui.m_list.itemRenderer = ListItemRenderer;
+            _ui.m_comTab.m_c1.onChanged.Add(OnComTabChange);
+            _ui.m_c1.onChanged.Add(OnTabChange);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
+            _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
         }
 
         protected override void OnHide()
@@ -50,35 +54,35 @@ namespace GFGGame
         {
             this.Hide();
         }
+        private void OnComTabChange()
+        {
+            _ui.m_c1.selectedIndex = _ui.m_comTab.m_c1.selectedIndex;
+        }
+        private void OnTabChange()
+        {
 
-        private void InitList()
+        }
+        private void ListItemRenderer(int index, GObject obj)
         {
-            _ui.m_list.RemoveChildren();
-            RechargeCfg[] dataArray = RechargeCfgArray.Instance.dataArray;
-            int len = dataArray.Length;
-            for (int i = 0; i < len; i++)
+            RechargeCfg itemData = RechargeCfgArray.Instance.dataArray[index];
+            UI_StoreListItem item = UI_StoreListItem.Proxy(obj);
+            item.m_btnBuy.text = itemData.price.ToString();
+            if (item.m_btnBuy.data == null)
             {
-                RechargeCfg itemData = dataArray[i];
-                UI_StoreListItem itemUI = UI_StoreListItem.Proxy();
-                itemUI.m_btnBuy.text = "¥" + itemData.price;
-                itemUI.m_btnBuy.onClick.Add(() =>
+                item.m_btnBuy.onClick.Add(() =>
                 {
                     RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
                 });
-                itemUI.m_txtName.text = itemData.name + "x" + itemData.itemNum;
-                itemUI.m_imgDouble.visible = false;
-                itemUI.m_icon.url = "ui://RechargeStore/sc_zizhuan_" + itemData.id;
-                _ui.m_list.AddChild(itemUI.target);
-                // int order = i + 1;
-                // if((order)%3 == 0 && order < len)
-                // {
-                //     GLoader line = new GLoader();
-                //     line.autoSize = true;
-                //     line.url = "ui://RechargeStore/sc_kuangjiazi_2";
-                //     _ui.m_list.AddChild(line);
-                // }
-                UI_StoreListItem.ProxyEnd();
             }
+            item.m_btnBuy.data = index;
+            item.m_txtName.text = string.Format("{0}{1}", itemData.itemNum, itemData.name);
+            item.m_txtDouble.text = string.Format("首冲赠送+{0}{1}", itemData.itemNum, itemData.name);
+            item.m_imgDouble.visible = false;
+            item.m_txtDouble.visible = false;
+            item.m_icon.url = "ui://RechargeStore/sc_zizhuan_" + itemData.id;
+
+            UI_StoreListItem.ProxyEnd();
         }
+
     }
-}
+}

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_10nota3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c24307227d08a564b89a18f292714877
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: