Merge commit 'e4b5169234073aa920d60bcdf46f1f53af05fb87' into zhaoyang

* commit 'e4b5169234073aa920d60bcdf46f1f53af05fb87':
  商城
  商城资源
  导表
  公用机提交
  公用机提交
  本地调试地址改为内网

FGUIProject/assets/RechargeStore/StoreUI.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" group="n3_fqor" fill="scaleMatchWidth">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <component id="n1_fqor" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80" group="n3_fqor"/>
+    <component id="n2_fqor" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n3_fqor" controller="c1,10"/>
+    <group id="n3_fqor" name="n3" xy="0,-240" size="1080,2400"/>
+  </displayList>
+</component>

FGUIProject/assets/RechargeStore/package.xml

@@ -4,13 +4,6 @@
     <component id="d4iw0" name="RechargeStoreUI.xml" path="/" exported="true"/>
     <image id="d4iwd" name="sc_yj_xiantiao.png" path="/images/" scale="9grid" scale9grid="14,0,28,0"/>
     <image id="d4iwg" name="sc_kuangjiazi_1.png" path="/images/"/>
-    <image id="d4iwh" name="sc_kuangjiazi_2.png" path="/imagesExport/" exported="true"/>
-    <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"/>
-    <image id="d4iwo" name="sc_zizhuan_4.png" path="/imagesExport/" exported="true"/>
-    <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"/>
     <component id="nz0t14" name="Button1.xml" path="/components/"/>
     <image id="dmsi15" name="scsc_anniuej_2.png" path="/images/"/>
@@ -39,16 +32,32 @@
     <image id="10not1u" name="sc_kuangand.png" path="/images/"/>
     <component id="10nota8" name="ItemExchangeUI.xml" path="/" exported="true"/>
     <component id="10not1v" name="GiftBagBuyUI.xml" path="/" exported="true"/>
-    <image id="10not1w" name="jinbi_1.png" path="/imagesExport/"/>
     <image id="10not1x" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="19,2,38,4"/>
     <image id="iftftaa" name="sc_cwcw_1.png" path="/images/"/>
     <image id="iftftab" name="sc_cwcw_2.png" path="/images/"/>
     <image id="iftftac" name="sc_cwcw_3.png" path="/images/"/>
-    <image id="iftftad" name="jinbi_1(1).png" path="/imagesExport/"/>
     <image id="iftftae" name="sc_xtxtxt(1).png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
     <component id="iftftaf" name="Component2.xml" path="/components/"/>
     <image id="t8xrtag" name="sc_kuangdikjia_3.png" path="/images/"/>
     <image id="qqattah" name="scsc_fuhao.png" path="/images/"/>
+    <component id="fqor7x" name="StoreUI.xml" path="/"/>
+    <image id="fqortai" name="sc_zhuangshishan.png" path="/imagesNew/"/>
+    <image id="fqortaj" name="sc_tab_yueka_xuanzhong.png" path="/imagesNew/"/>
+    <image id="fqortak" name="sc_tab_yueka.png" path="/imagesNew/"/>
+    <image id="fqortal" name="sc_tab_libao_xuanzhong.png" path="/imagesNew/"/>
+    <image id="fqortam" name="sc_tab_libao.png" path="/imagesNew/"/>
+    <image id="fqortan" name="sc_tab_chognzhi_xuanzhong.png" path="/imagesNew/"/>
+    <image id="fqortao" name="sc_tab_chognzhi.png" path="/imagesNew/"/>
+    <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="fqortat" name="sc_jiazi.png" path="/imagesNew/"/>
+    <image id="fqortau" name="sc_xian.png" path="/imagesNew/"/>
+    <image id="fqortav" name="sc_subTab_xz.png" path="/imagesNew/"/>
+    <image id="fqortaw" name="sc_subtab.png" path="/imagesNew/"/>
+    <image id="fqortax" name="sc_tab.png" path="/imagesNew/"/>
+    <image id="fqortay" name="sc_zhuangshihua1.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\RechargeStore" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -71,8 +71,14 @@ namespace GFGGame
 #else
             ChannelId = 101;
 #endif
-
-            cfgUrl = "http://gfg1.obs.cn-north-4.myhuaweicloud.com/14/platform/{cfgName}.json";
+            if(cfgName == "cfg_local")
+            {
+                cfgUrl = "http://10.108.64.189:81/platform/{cfgName}.json";
+            }
+            else
+            {
+                cfgUrl = "http://gfg1.obs.cn-north-4.myhuaweicloud.com/14/platform/{cfgName}.json";
+            }
         }
 
         public static void InitPlatform(string json)