Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Bag/BagUI.xml

@@ -7,8 +7,9 @@
     <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n17_si5z">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n6_wet2" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z"/>
-    <image id="n16_si5z" name="n16" src="si5zti3" fileName="images/wpbb_zi.png" xy="189,216" group="n17_si5z"/>
+    <component id="n6_wet2" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z">
+      <Button icon="ui://2bsz6nelsi5zti3"/>
+    </component>
     <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
     <group id="n17_si5z" name="grpTop" xy="0,90" size="1080,234"/>
     <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">

FGUIProject/assets/Card/CardDetailUI.xml

@@ -12,6 +12,7 @@
     </image>
     <component id="n1_ojlz" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://7l6lvkayysx99y"/>
     </component>
     <component id="n5_ojlz" name="btnFilter" src="ojlzd" fileName="components/btnFilter.xml" xy="854,96">
       <relation target="" sidePair="right-right,top-top"/>

FGUIProject/assets/Card/package.xml

@@ -97,6 +97,7 @@
     <image id="94m19v" name="kp_kuang_1.png" path="/images/" exported="true"/>
     <image id="94m19w" name="kp_kuang_4.png" path="/images/" exported="true"/>
     <image id="r9ri9x" name="kp_mudan.jpg" path="/images/"/>
+    <image id="ysx99y" name="cpcp_ziti.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -5,13 +5,12 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://e5hnfx8ar9rieg"/>
+      <Button icon="ui://e5hnfx8ar9rieg"/>
     </component>
     <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,105" controller="c1,9"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
-    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">
+    <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">
       <Button title="兑换"/>
     </component>
     <text id="n23_r9ri" name="txtName" xy="680,310" size="216,59" group="n21_r9ri" font="ui://eg2y0ldpwonotja" fontSize="44" color="#b0884e" letterSpacing="-2" text="孔雀东南飞"/>

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticListUI.xml

@@ -5,7 +5,6 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n0_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n12_j539" name="n12" src="j5394" fileName="images/jbhc_bti.png" xy="164,102"/>
     <list id="n4_j539" name="listMenu" xy="31,218" size="1017,80" layout="flow_hz" colGap="-18" autoItemSize="true" align="center" foldInvisibleItems="true">
       <relation target="" sidePair="center-center"/>
       <item url="ui://4f294tdkj539f"/>

FGUIProject/assets/CommonGame/components/ButtonBack.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="90,90" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="c1" exported="true" pages="0,浅色底,1,深色底" selected="0"/>
   <displayList>
-    <loader id="n4_uyux" name="loaBg" xy="-35,6" size="578,116" visible="false" touchable="false" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="|ui://eg2y0ldpuyuxtj8"/>
-    </loader>
-    <loader id="n3_uyux" name="icon" xy="0,0" size="90,90" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
-    <loader id="n5_uyux" name="loaTitle" xy="118,18" size="161,54" autoSize="true"/>
+    <loader id="n4_uyux" name="loaBg" xy="50,10" size="429,76" touchable="false" url="ui://eg2y0ldpysx9tk6" autoSize="true"/>
+    <loader id="n3_uyux" name="n3" xy="0,0" size="92,94" url="ui://eg2y0ldpuyuxtj4" autoSize="true"/>
+    <loader id="n5_uyux" name="icon" xy="125,19" pivot="0.5,0" size="161,54" autoSize="true"/>
   </displayList>
   <Button/>
-  <customProperty target="loaTitle" propertyId="1"/>
 </component>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -3,7 +3,7 @@
   <displayList>
     <graph id="n39_r9ri" name="n39" xy="23,33" pivot="0.5,0.5" size="166,166" group="n41_r9ri" aspect="true" type="eclipse" lineSize="0" fillColor="#ffeed5be"/>
     <loader id="n40_r9ri" name="loaIcon" xy="24,34" size="166,164" group="n41_r9ri" url="ui://374k3dwvr9ri1z" fill="scale"/>
-    <image id="n35_r9ri" name="n35" src="r9ri17" fileName="images/grxx_zytxtx.png" pkg="374k3dwv" xy="21,31" size="170,171" group="n41_r9ri" aspect="true"/>
+    <image id="n35_r9ri" name="n35" src="r9ritjs" fileName="images/grxx_zytxtx.png" xy="21,31" size="170,171" group="n41_r9ri" aspect="true"/>
     <loader id="n37_r9ri" name="loaBorder" xy="0,11" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" url="ui://374k3dwvr9ri20"/>
     <group id="n41_r9ri" name="n41" xy="0,11" size="230,203"/>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -193,12 +193,10 @@
     <image id="uyuxtj3" name="tujian_zkanniu.png" path="/images/" exported="true"/>
     <image id="uyuxtj4" name="xcpz_fhfh.png" path="/imagesExport/" exported="true"/>
     <component id="uyuxtj5" name="ButtonBack.xml" path="/components/" exported="true"/>
-    <image id="uyuxtj6" name="xz_wss.png" path="/images/"/>
     <image id="uyuxtj7" name="xc_bto_1.png" path="/images/"/>
     <image id="uyuxtj8" name="xc_bto.png" path="/images/"/>
     <font id="wonotj9" name="YUNJINSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <font id="wonotja" name="NANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
-    <image id="wonotjb" name="lyq_yunhubl.png" path="/imgItemIcon/" exported="true"/>
     <font id="wonotjc" name="FANGZHENGYANSONG.TTF" path="/Font/" exported="true" renderMode="" samplePointSize="16"/>
     <component id="r9ritjj" name="ButtonApproach.xml" path="/components/"/>
     <image id="r9ritjl" name="tc_kuangk.png" path="/imgnew/"/>
@@ -221,6 +219,8 @@
     <image id="dhoatk2" name="hlhdjficon_1.png" path="/imgItemIcon/" exported="true"/>
     <image id="dhoatk3" name="shalou.png" path="/imgItemIcon/" exported="true"/>
     <image id="ysx9tk4" name="hqtjtbtb.png" path="/images/"/>
+    <image id="ysx9tk5" name="lianyiqun_ys.png" path="/imgItemIcon/" exported="true"/>
+    <image id="ysx9tk6" name="xc_bto_1.png" path="/imagesExport/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/FieldGuide/ChapterItemGuideUI.xml

@@ -7,10 +7,10 @@
     <image id="n1_s61p" name="n1" src="pq5x5z" fileName="images/kp_bejing_di.png" pkg="eg2y0ldp" xy="28,264" size="1024,1586">
       <relation target="" sidePair="width-width,height-height,center-center"/>
     </image>
-    <component id="n2_s61p" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://vqq9h9h4s61p24"/>
     </component>
-    <image id="n3_s61p" name="n3" src="s61p24" fileName="images/bwtj_bti.png" xy="162,96"/>
     <list id="n9_s61p" name="list" xy="56,281" size="967,1536" layout="flow_hz" overflow="scroll" lineGap="40" colGap="50" defaultItem="ui://vqq9h9h4s61p29">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/FieldGuide/FieldGuideUI.xml

@@ -5,7 +5,9 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n2_pjip" name="compBanner" src="pjipg" fileName="components/CompBanner.xml" xy="0,0"/>
-    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://vqq9h9h4ysx93f"/>
+    </component>
     <list id="n13_pjip" name="listGuide" xy="43,407" size="994,1513" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/FieldGuide/SuitGuideUI.xml

@@ -5,7 +5,9 @@
     <loader id="n18_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://vqq9h9h4ysx93g"/>
+    </component>
     <image id="n7_pjip" name="n7" src="pjipk" fileName="images/tujian_diban_2.png" xy="48,376">
       <gearDisplay controller="c1" pages="0"/>
     </image>

FGUIProject/assets/FieldGuide/TravelGuideUI.xml

@@ -6,8 +6,7 @@
     </loader>
     <component id="n2_s61p" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://vqq9h9h4wono3b"/>
+      <Button icon="ui://vqq9h9h4ysx93e"/>
     </component>
     <list id="n9_s61p" name="list" xy="50,264" size="980,1656" layout="flow_hz" overflow="scroll" lineGap="45" colGap="22" defaultItem="ui://vqq9h9h4wono2l" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>

FGUIProject/assets/FieldGuide/TravelShowUI.xml

@@ -4,9 +4,7 @@
     <loader id="n15_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n9_pjip" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
-      <property target="loaTitle" propertyId="1" value="ui://vqq9h9h4wono3c"/>
-    </component>
+    <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <list id="n20_wono" name="list" xy="52,264" size="976,1656" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4wono2m" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>

FGUIProject/assets/FieldGuide/package.xml

@@ -89,8 +89,10 @@
     <image id="wono36" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
     <image id="wono37" name="tujian_tup_3.png" path="/imagesExport/" exported="true"/>
     <image id="wono3a" name="xqfs_wddw.png" path="/components/"/>
-    <image id="wono3b" name="xz_wss.png" path="/images/"/>
-    <image id="wono3c" name="xz_qsws.png" path="/images/"/>
+    <image id="ysx93d" name="xz_xqfs.png" path="/images/"/>
+    <image id="ysx93e" name="xz_ddtj.png" path="/images/"/>
+    <image id="ysx93f" name="tjtj_tj.png" path="/images/"/>
+    <image id="ysx93g" name="tztj_tztj.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Friend/components/ListApplyItem.xml

@@ -9,7 +9,7 @@
     <component id="n21_pdeo" name="btnRefuse" src="jdju1" fileName="components/BtnModel1.xml" xy="656,28" size="94,91">
       <Button icon="ui://wez2ujnnz73e15"/>
     </component>
-    <component id="n23_z73e" name="n23" src="pdeo3" fileName="components/CompHeadWithBg.xml" xy="40,12" pivot="0.5,0.5" size="124,124"/>
+    <component id="n23_z73e" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-6,-41" pivot="0.5,0.5" scale="0.7,0.7"/>
     <image id="n24_z73e" name="n24" src="z73e17" fileName="images/zjm_dj_1.png" xy="127,91" group="n26_z73e"/>
     <text id="n25_z73e" name="txtLvl" xy="134,97" size="29,29" group="n26_z73e" fontSize="20" color="#ffffff" align="center" text="99">
       <relation target="n24_z73e" sidePair="center-center,middle-middle"/>

FGUIProject/assets/Friend/components/ListSearchItem.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="905,147">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_z73e" name="n16" src="z73ex" fileName="images/hy_tjhy_dk.png" xy="0,0"/>
-    <component id="n17_z73e" name="n17" src="pdeo3" fileName="components/CompHeadWithBg.xml" xy="40,11" pivot="0.5,0.5" size="124,124"/>
+    <component id="n17_z73e" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-6,-41" pivot="0.5,0.5" scale="0.7,0.7"/>
     <image id="n18_z73e" name="n18" src="z73e17" fileName="images/zjm_dj_1.png" xy="127,90" group="n20_z73e"/>
     <text id="n19_z73e" name="txtLvl" xy="134,96" size="29,29" group="n20_z73e" fontSize="20" color="#ffffff" align="center" text="99">
       <relation target="n18_z73e" sidePair="center-center,middle-middle"/>
     </text>
     <group id="n20_z73e" name="n20" xy="127,90" size="42,43"/>
-    <text id="n9_pdeo" name="txtName" xy="174,10" size="295,56" fontSize="42" color="#bb996c" text="角色名字七个字"/>
+    <text id="n9_pdeo" name="txtName" xy="192,10" size="295,56" fontSize="42" color="#bb996c" text="角色名字七个字"/>
     <component id="n13_pdeo" name="btnAdd" src="jdju1" fileName="components/BtnModel1.xml" xy="738,26" size="94,94">
       <gearDisplay controller="c1" pages="0"/>
       <Button icon="ui://wez2ujnnz73e1b"/>
@@ -18,7 +18,7 @@
     <image id="n21_z73e" name="n21" src="z73ez" fileName="images/hy_ysqysq.png" xy="696,40">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <loader id="n22_nfg4" name="loaState" xy="180,99" size="100,28" url="ui://wez2ujnnz73eu" autoSize="true">
+    <loader id="n22_nfg4" name="loaState" xy="196,99" size="100,28" url="ui://wez2ujnnz73eu" autoSize="true">
       <gearIcon controller="c2" pages="1" values="ui://wez2ujnnz73ek" default="ui://wez2ujnnz73eu"/>
     </loader>
   </displayList>

FGUIProject/assets/Main/StoryChapterListUI.xml

@@ -11,7 +11,9 @@
       <item/>
       <item/>
     </list>
-    <component id="n1_slb4" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_slb4" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://mfvz4q8kysx9ig"/>
+    </component>
     <component id="n2_slb4" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <image id="n7_slb4" name="bgTitle" src="slb41l" fileName="imagesStory/zhuxian_mengban.png" xy="199,90" size="764,70" visible="false"/>
     <list id="n16_ed2z" name="listTab" xy="199,90" size="764,71" visible="false" layout="row" colGap="10">

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -69,9 +69,6 @@
     <loader id="n46_kzvk" name="btnGuide" xy="480,1455" size="120,120"/>
     <text id="n22_t8o1" name="txtUnpassTips" xy="200,1079" pivot="0.5,0" size="404,54" group="n24_t8o1" fontSize="40" color="#d1b3b1" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
     <group id="n24_t8o1" name="groupUnpass" xy="200,1079" size="404,54" advanced="true"/>
-    <text id="n67_v95q" name="n67" xy="791,1211" size="60,39" group="n55_rqo4" fontSize="28" color="#b89370" vAlign="middle" vars="true" text="花费"/>
-    <loader id="n47_m1l9" name="loaCost" xy="862,1201" size="60,60" group="n55_rqo4" url="ui://eg2y0ldpq08x4" autoSize="true"/>
-    <text id="n18_t8o1" name="txtPowerDesc" xy="933,1211" size="21,39" group="n55_rqo4" fontSize="28" color="#b19270" vAlign="middle" vars="true" text="{power=5}"/>
-    <group id="n55_rqo4" name="n55" xy="791,1201" size="163,60" advanced="true" layout="hz" colGap="11" excludeInvisibles="true"/>
+    <component id="n68_ysx9" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="785,1212"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -2,7 +2,7 @@
 <component size="125,125">
   <displayList>
     <image id="n19_q08x" name="n19" src="q08xc" fileName="images/zjm_mzkuang.png" xy="60,71"/>
-    <component id="n42_r9ri" name="n42" src="kubi7h" fileName="components/CompHeadWithBg.xml" pkg="eg2y0ldp" xy="0,0"/>
+    <component id="n42_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-12,-16" scale="0.7,0.7"/>
     <text id="n20_q08x" name="txtName" xy="141,74" size="156,39" fontSize="28" color="#fdf2df" align="center" autoSize="none" text="名字五个字">
       <relation target="n19_q08x" sidePair="left-left,top-top"/>
     </text>

FGUIProject/assets/Main/package.xml

@@ -437,6 +437,7 @@
     <image id="v95qid" name="zd_zdjnsm_1.png" path="/imagesFight/"/>
     <component id="v95qie" name="ComSkillTips.xml" path="/"/>
     <image id="dhoaif" name="zjm_bbbb.png" path="/images/"/>
+    <image id="ysx9ig" name="fzl_fzl.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RechargeStore/components/StoreListItem.xml

@@ -19,5 +19,6 @@
       <relation target="" sidePair="center-center"/>
     </component>
     <text id="n18_dmsi" name="txtDesc" xy="6,380" pivot="0.5,0" size="290,49" font="ui://eg2y0ldpk1kha2" fontSize="36" color="#bb674e" letterSpacing="-2" text="首充赠送+6000钻石"/>
+    <text id="n21_ysx9" name="txtExchangeCount" xy="202,334" pivot="1,0" size="69,49" fontSize="36" color="#fbf6eb" vars="true" strokeColor="#967e64" strokeSize="2" text="x{count=20}"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/PersonalPhotoUI.xml

@@ -4,9 +4,8 @@
     <loader id="n6_r9ri" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n7_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80" controller="c1,1">
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://374k3dwvr9ri1w"/>
+    <component id="n7_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://374k3dwvr9ri1w"/>
     </component>
     <image id="n5_r9ri" name="n5" src="r9ri18" fileName="images/grxx_grxcxc.png" xy="327,195"/>
     <list id="n0_r9ri" name="list" xy="22,345" size="1035,1575" layout="flow_hz" overflow="scroll" lineGap="40" colGap="10" defaultItem="ui://374k3dwvr9ri1v" autoClearItems="true">

FGUIProject/assets/RoleInfo/components/ComBtn.xml

@@ -1,28 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="500,400" overflow="scroll">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n11_c5sc" name="btnGetAllDressUpItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,63" size="332,46">
+    <component id="n20_lqp0" name="btnAll" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,0" size="330,46" group="n28_ysx9">
+      <gearDisplay controller="c1" pages="0"/>
+      <Button title="666账号" titleFontSize="30"/>
+    </component>
+    <component id="n11_c5sc" name="btnGetAllDressUpItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,61" size="332,46" group="n28_ysx9">
+      <gearDisplay controller="c1" pages="0"/>
       <Button title="获取所有换装部件" titleFontSize="30"/>
     </component>
-    <component id="n13_c5sc" name="btnGetAllCardItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,129" size="330,46">
+    <component id="n13_c5sc" name="btnGetAllCardItem" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,122" size="330,46" group="n28_ysx9">
+      <gearDisplay controller="c1" pages="0"/>
       <Button title="获取所有卡牌" titleFontSize="30"/>
     </component>
-    <component id="n14_lqp0" name="btnSetLv" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,195" size="330,46">
+    <component id="n14_lqp0" name="btnSetLv" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,183" size="330,46" group="n26_ysx9">
       <Button title="设置玩家等级" titleFontSize="30"/>
     </component>
-    <text id="n17_lqp0" name="txtRoleLv" xy="332,197" size="119,42" fontSize="30" autoSize="none" text="99" input="true" prompt="[color=#B6A688]99[/color]" maxLength="3"/>
-    <component id="n15_lqp0" name="btnSetChapter" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,261" size="330,46">
+    <text id="n17_lqp0" name="txtRoleLv" xy="332,185" size="119,42" group="n26_ysx9" fontSize="30" autoSize="none" text="99" input="true" prompt="[color=#B6A688]99[/color]" maxLength="3"/>
+    <group id="n26_ysx9" name="n26" xy="1,183" size="450,46" group="n28_ysx9" advanced="true">
+      <gearDisplay controller="c1" pages="0,1"/>
+    </group>
+    <component id="n15_lqp0" name="btnSetChapter" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,244" size="330,46" group="n27_ysx9">
       <Button title="设置玩家章节" titleFontSize="30"/>
     </component>
-    <text id="n18_lqp0" name="txtChapter" xy="333,262" size="44,42" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
-    <text id="n19_lqp0" name="txtChapterLv" xy="411,262" size="42,42" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
-    <component id="n20_lqp0" name="btnAll" src="c5sc8h" fileName="components/ButtonGM.xml" xy="0,0" size="330,46">
-      <Button title="666账号" titleFontSize="30"/>
-    </component>
-    <text id="n21_lqp0" name="n21" xy="377,262" size="34,41" fontSize="30" text="章"/>
-    <text id="n24_lqp0" name="n24" xy="454,263" size="34,41" fontSize="30" text="关"/>
-    <component id="n25_irk8" name="btnSkipCheckOpen" src="c5sc8h" fileName="components/ButtonGM.xml" xy="1,325" size="330,46">
-      <Button title="跳过功能开启检测" titleFontSize="30"/>
-    </component>
+    <text id="n18_lqp0" name="txtChapter" xy="333,245" size="44,42" group="n27_ysx9" fontSize="30" autoSize="none" text="5" input="true" prompt="[color=#B6A688]章[/color]"/>
+    <text id="n24_lqp0" name="n24" xy="454,246" size="34,41" group="n27_ysx9" fontSize="30" text="关"/>
+    <text id="n21_lqp0" name="n21" xy="377,245" size="34,41" group="n27_ysx9" fontSize="30" text="章"/>
+    <text id="n19_lqp0" name="txtChapterLv" xy="411,245" size="42,42" group="n27_ysx9" fontSize="30" autoSize="none" text="1" input="true" prompt="[color=#B6A688]关[/color]"/>
+    <group id="n27_ysx9" name="n27" xy="1,244" size="487,46" group="n28_ysx9" advanced="true">
+      <gearDisplay controller="c1" pages="0,1"/>
+    </group>
+    <group id="n28_ysx9" name="n28" xy="0,0" size="488,290" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/StudioUI.xml

@@ -4,7 +4,9 @@
     <loader id="n8_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://xz8kxrecysx92u"/>
+    </component>
     <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="340,1014">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>

FGUIProject/assets/Studio/package.xml

@@ -72,6 +72,7 @@
     <image id="wono2r" name="songhuizong.png" path="/imgExpot/" exported="true"/>
     <image id="wono2s" name="xingcijing.png" path="/imgExpot/" exported="true"/>
     <image id="wono2t" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
+    <image id="ysx92u" name="gzs_gzs.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/Travel/TravelUI.xml

@@ -13,12 +13,11 @@
     <component id="n15_wono" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,8"/>
     <component id="n7_wono" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://jitclg1gwono1a"/>
+      <Button icon="ui://jitclg1gwono1a"/>
     </component>
     <image id="n8_wono" name="n8" src="wonoo" fileName="images/xqfs_yldik_1.png" xy="2,280" group="n16_wono"/>
-    <loader id="n17_r9ri" name="n17" xy="299,520" size="522,733" group="n16_wono" scale="0.9,0.9" url="ui://jitclg1gwonob" autoSize="true">
-      <gearIcon controller="c1" pages="0,1" values="ui://jitclg1gwonob|ui://jitclg1gwonob" default="ui://jitclg1gwonoa"/>
+    <loader id="n17_r9ri" name="n17" xy="299,520" size="495,749" group="n16_wono" scale="0.9,0.9" url="ui://jitclg1gwono9" autoSize="true">
+      <gearIcon controller="c1" pages="0,1" values="ui://jitclg1gwono9|ui://jitclg1gwonob" default="ui://jitclg1gwonoa"/>
     </loader>
     <component id="n1_wono" name="btnTips" src="wono3" fileName="components/Button1.xml" xy="926,372" group="n16_wono">
       <Button title="tips" controller="c2" page="1"/>

FGUIProject/assets/Travel/components/ComDress.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="234,290">
-  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <controller name="c1" pages="0,,1,,2," selected="1"/>
   <displayList>
     <image id="n8_wono" name="n8" src="wono11" fileName="images/xqfs_xnk_2.png" xy="0,0"/>
     <image id="n2_wono" name="n2" src="wono10" fileName="images/xqfs_xnk_1.png" xy="0,0" group="n9_wono"/>
-    <loader id="n1_wono" name="loaDress" xy="17,10" size="200,200" group="n9_wono" url="ui://eg2y0ldpwonotjb" autoSize="true"/>
+    <loader id="n1_wono" name="loaDress" xy="17,10" size="200,200" group="n9_wono" url="ui://eg2y0ldpysx9tk5" autoSize="true"/>
     <loader id="n6_wono" name="loaRarity" xy="183,9" size="44,94" group="n9_wono" url="ui://eg2y0ldpd4iw50" autoSize="true"/>
     <text id="n4_wono" name="txtName" xy="81,233" pivot="0.5,0" size="71,46" group="n9_wono" font="ui://eg2y0ldpwonotja" fontSize="34" color="#9b7642" text="默认"/>
     <group id="n9_wono" name="n9" xy="0,0" size="234,290" advanced="true">

FGUIProject/assets/XiuFang/XiuFangUI.xml

@@ -4,8 +4,9 @@
     <loader id="n0_9xlo" name="bg" xy="0,-240" size="1080,2400" url="ui://kv0ad4wy9xlo1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n1_9xlo" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <image id="n3_9xlo" name="n3" src="9xlo7" fileName="images/tzhc_ziti.png" xy="160,102"/>
+    <component id="n1_9xlo" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+      <Button icon="ui://kv0ad4wy9xlo7"/>
+    </component>
     <component id="n4_9xlo" name="component" src="wlc28" fileName="components/Component.xml" xy="74,337" size="932,1246"/>
     <image id="n2_9xlo" name="n2" src="9xlo5" fileName="images/tzhc_jiazidi.png" xy="9,589">
       <relation target="n4_9xlo" sidePair="bottom-bottom"/>

FGUIProject/assets/poem/PoemGalleryUI.xml

@@ -7,8 +7,7 @@
     </loader>
     <component id="n1_r9ri" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://iyz778gkr9ri12i"/>
+      <Button icon="ui://iyz778gkysx9tju"/>
     </component>
     <component id="n11_r9ri" name="comNormal" src="r9ri114" fileName="componentsGallery/ComNormal.xml" xy="0,0" size="1080,1736">
       <gearDisplay controller="c1" pages="1"/>
@@ -18,7 +17,7 @@
       <gearDisplay controller="c1" pages="4"/>
       <relation target="" sidePair="height-height"/>
     </component>
-    <image id="n24_r9ri" name="n24" src="r9ri12k" fileName="imagesGallery/hl_xz_ddik_1.png" xy="0,1736" group="n25_r9ri" pkg="eg2y0ldp"/>
+    <image id="n24_r9ri" name="n24" src="r9ri12k" fileName="images/hl_xz_ddik_1.png" pkg="eg2y0ldp" xy="0,1736" group="n25_r9ri"/>
     <component id="n2_r9ri" name="btnRecover" src="r9ri12l" fileName="componentsGallery/Button11.xml" xy="0,1710" group="n25_r9ri">
       <Button checked="true" title="首页" icon="ui://iyz778gkr9ri11l" selectedIcon="ui://iyz778gkr9ri11c" controller="c1" page="1"/>
     </component>

FGUIProject/assets/poem/PoemPhotoUI.xml

@@ -6,10 +6,9 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80" controller="c1,1">
+    <component id="n21_uyux" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
-      <property target="loaTitle" propertyId="1" value="ui://iyz778gkuyux10a"/>
+      <Button icon="ui://iyz778gkuyux10a"/>
     </component>
     <image id="n13_uyux" name="n13" src="uyuxzx" fileName="imagesPhoto/xc_xzdik.png" xy="266,212" group="n14_uyux"/>
     <component id="n11_11rzz" name="btnTab0" src="11rzzf" fileName="componentsPhoto/Button6.xml" xy="260,210" group="n14_uyux">

FGUIProject/assets/poem/PoemUI.xml

@@ -4,13 +4,16 @@
     <loader id="n0_v482" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_v482" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_v482" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
-      <Button icon="ui://eg2y0ldpuyuxtj4"/>
+      <Button icon="ui://iyz778gkysx9tju"/>
     </component>
-    <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="90,400"/>
-    <component id="n5_r9ri" name="comGallery" src="v4822" fileName="components/ComEctype.xml" xy="90,920">
+    <component id="n4_v482" name="comphoto" src="v4822" fileName="components/ComEctype.xml" xy="112,299" group="n6_ysx9"/>
+    <component id="n5_r9ri" name="comGallery" src="v4822" fileName="components/ComEctype.xml" xy="586,299" group="n6_ysx9">
       <property target="icon" propertyId="1" value="ui://iyz778gkr9ri13h"/>
     </component>
+    <group id="n6_ysx9" name="n6" xy="112,299" size="855,605" advanced="true">
+      <relation target="" sidePair="center-center,top-top"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/poem/components/ComEctype.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="899,253">
-  <controller name="c1" pages="0,,1," selected="1"/>
+<component size="381,605">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_n3xh" name="icon" xy="0,0" size="899,253" url="ui://iyz778gkuyuxzj" autoSize="true"/>
-    <image id="n3_n3xh" name="img" src="uyux10c" fileName="photImages/xc_xcan.png" xy="0,0">
+    <loader id="n4_n3xh" name="icon" xy="0,0" size="381,605" url="ui://iyz778gkuyuxzj" autoSize="true"/>
+    <image id="n3_n3xh" name="img" src="uyux10c" fileName="images/xc_xcan.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n5_uyux" name="n5" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="414,108">
+    <image id="n5_uyux" name="n5" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="155,284">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

FGUIProject/assets/poem/package.xml

@@ -38,7 +38,7 @@
     <image id="uyux109" name="xc_qsws.png" path="/imagesPhoto/"/>
     <image id="uyux10a" name="xc_xczi.png" path="/imagesPhoto/"/>
     <image id="uyux10b" name="xc_xzxzz.png" path="/imagesPhoto/"/>
-    <image id="uyux10c" name="xc_xcan.png" path="/imagesPhoto/"/>
+    <image id="uyux10c" name="xc_xcan.png" path="/images/"/>
     <component id="uyux10d" name="Button8.xml" path="/componentsPhoto/"/>
     <component id="wono10g" name="ComPhotoPostcard.xml" path="/componentsPhoto/"/>
     <image id="wono10h" name="xqfs_yldwd.png" path="/imagesPhoto/" scale="9grid" scale9grid="226,194,452,388"/>
@@ -138,6 +138,7 @@
     <image id="dhoatjr" name="hl_dz_22.png" path="/imagesGallery/"/>
     <image id="dhoatjs" name="hl_sc_11.png" path="/imagesGallery/"/>
     <component id="dhoatjt" name="Button14.xml" path="/componentsGallery/"/>
+    <image id="ysx9tju" name="hl_hlzibt.png" path="/imagesPhoto/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -5,14 +5,16 @@ namespace GFGEditor
 {
     public class ExcelConfig
     {
+        public static string excelsRootDirNameDressUp = "Config";
         /// <summary>
         /// 存放excel表文件夹的的路径
         /// </summary>
-        public const string excelsFolderPath = "../../../gfg/tools/Config";
+        //public const string excelsFolderPath = "../../../gfg/tools/Config";
+        public static string excelsFolderPath { get { return $"../../../gfg/tools/{excelsRootDirNameDressUp}/"; } }
         /// <summary>
         /// 存放临时excel表文件夹的的路径
         /// </summary>
-        public const string excelsCacheFolderPath = "../../../gfg/tools/Config/CacheConfig/";
+        public static string excelsCacheFolderPath = excelsFolderPath + "/ CacheConfig/";
 
         /// <summary>
         /// 共享库中存放sqlite文件的的路径

GameClient/Assets/Editor/ToolsMenu.cs

@@ -270,7 +270,22 @@ namespace GFGEditor
                 CommitWhenRelease = true;
             }
         }
-
+        [MenuItem("Tools/BuildTest/导入临时版本配置")]
+        public static void SetBundlesExcelTestDir()
+        {
+            try
+            {
+                ImportArtResTool.ResRootDirNameDressUp = "Config-demo1";
+                CommitWhenRelease = false;
+                UpdateAndImportExcel();
+            }
+            catch (Exception e)
+            {
+                Log.Error(e.ToString());
+                ExcelConfig.excelsRootDirNameDressUp = "Config";
+                CommitWhenRelease = true;
+            }
+        }
         [MenuItem("Tools/BuildTest/发布临时版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
         public static void BuildBundlesResTemp()
         {

GameClient/Assets/Editor/Xasset/MenuItems.cs

@@ -29,7 +29,8 @@ namespace VEngine.Editor
             BuildScript.BuildPlayer();
         }
 
-        [MenuItem("XAssets/Versions/Copy To StreamingAssets")]
+        //[MenuItem("XAssets/Versions/Copy To StreamingAssets")]
+        [MenuItem("Tools/BuildTest/Copy To StreamingAssets")]
         public static void CopyToStreamingAssets()
         {
             BuildScript.CopyToStreamingAssets();

GameClient/Assets/Game/HotUpdate/Controller/LogController.cs

@@ -22,7 +22,7 @@ namespace GFGGame
             msgDic.Add(_all, new List<string>());
             msgDic.Add(_error, new List<string>());
             msgDic.Add(_log, new List<string>());
-            if (LauncherConfig.onDebug >= 0)
+            if (LauncherConfig.onDebug == 1)
             {
                 this.CreatBtnLog();
             }
@@ -69,7 +69,7 @@ namespace GFGGame
                     //     _btnLog.m_c1.selectedIndex = 1;
                     //     _btnLog.target.alpha = 1;
                     // }
-                    if (LauncherConfig.onDebug >= 0)
+                    if (LauncherConfig.onDebug >= 1)
                     {
 #if !UNITY_EDITOR
                         ViewManager.Show(ViewName.LOG_VIEW);
@@ -77,7 +77,7 @@ namespace GFGGame
                     }
                     break;
                 default:
-                    if (LauncherConfig.onDebug >= 0)
+                    if (LauncherConfig.onDebug >= 1)
                     {
                         if (msgDic[_all].Count == _maxCount)
                         {

GameClient/Assets/Game/HotUpdate/Controller/LogServerHelper.cs

@@ -23,7 +23,7 @@ namespace GFGGame
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
             //HttpTool.Instance.Post(GameConfig.logApiReportUrl, logStr);
             var body = $"?logStr={logStr}";
-            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null);
+            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null,false);
         }
         /// <summary>
         /// 发送玩法参与度
@@ -45,7 +45,7 @@ namespace GFGGame
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
             //HttpTool.Instance.Post(GameConfig.logApiReportUrl, logStr);
             var body = $"?logStr={logStr}";
-            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null);
+            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null,false);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ButtonBack.cs

@@ -7,9 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ButtonBack
     {
         public GButton target;
-        public Controller m_c1;
         public GLoader m_loaBg;
-        public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpuyuxtj5";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ButtonBack";
@@ -57,15 +55,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_loaBg = null;
-            m_loaTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_CompHead.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_CompHead.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListApplyItem.cs

@@ -10,6 +10,7 @@ namespace UI.Friend
         public GTextField m_txtName;
         public GButton m_btnAgree;
         public GButton m_btnRefuse;
+        public GComponent m_comHead;
         public GTextField m_txtLvl;
         public const string URL = "ui://wez2ujnnpdeoj";
         public const string PACKAGE_NAME = "Friend";
@@ -61,6 +62,7 @@ namespace UI.Friend
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnAgree = (GButton)comp.GetChild("btnAgree");
             m_btnRefuse = (GButton)comp.GetChild("btnRefuse");
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
         }
         public void Dispose(bool disposeTarget = false)
@@ -68,6 +70,7 @@ namespace UI.Friend
             m_txtName = null;
             m_btnAgree = null;
             m_btnRefuse = null;
+            m_comHead = null;
             m_txtLvl = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_ListSearchItem.cs

@@ -9,6 +9,7 @@ namespace UI.Friend
         public GComponent target;
         public Controller m_c1;
         public Controller m_c2;
+        public GComponent m_comHead;
         public GTextField m_txtLvl;
         public GTextField m_txtName;
         public GButton m_btnAdd;
@@ -62,6 +63,7 @@ namespace UI.Friend
         {
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
@@ -71,6 +73,7 @@ namespace UI.Friend
         {
             m_c1 = null;
             m_c2 = null;
+            m_comHead = null;
             m_txtLvl = null;
             m_txtName = null;
             m_btnAdd = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentHeadBar.cs

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_ComponentHeadBar
     {
         public GComponent target;
+        public GComponent m_comHead;
         public GTextField m_txtName;
         public GGraph m_holder;
         public GTextField m_txtLvl;
@@ -57,12 +58,14 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_comHead = (GComponent)comp.GetChild("comHead");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_holder = (GGraph)comp.GetChild("holder");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comHead = null;
             m_txtName = null;
             m_holder = null;
             m_txtLvl = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryLevelInfoUI.cs

@@ -30,8 +30,7 @@ namespace UI.Main
         public GLoader m_btnGuide;
         public GTextField m_txtUnpassTips;
         public GGroup m_groupUnpass;
-        public GLoader m_loaCost;
-        public GTextField m_txtPowerDesc;
+        public GComponent m_comCostCurrent;
         public const string URL = "ui://mfvz4q8kvxw538";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryLevelInfoUI";
@@ -102,8 +101,7 @@ namespace UI.Main
             m_btnGuide = (GLoader)comp.GetChild("btnGuide");
             m_txtUnpassTips = (GTextField)comp.GetChild("txtUnpassTips");
             m_groupUnpass = (GGroup)comp.GetChild("groupUnpass");
-            m_loaCost = (GLoader)comp.GetChild("loaCost");
-            m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
+            m_comCostCurrent = (GComponent)comp.GetChild("comCostCurrent");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -131,8 +129,7 @@ namespace UI.Main
             m_btnGuide = null;
             m_txtUnpassTips = null;
             m_groupUnpass = null;
-            m_loaCost = null;
-            m_txtPowerDesc = null;
+            m_comCostCurrent = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -13,6 +13,7 @@ namespace UI.RechargeStore
         public GTextField m_txtName;
         public UI_Component2 m_btnBuy;
         public GTextField m_txtDesc;
+        public GTextField m_txtExchangeCount;
         public const string URL = "ui://vlgobc15d4iwr";
         public const string PACKAGE_NAME = "RechargeStore";
         public const string RES_NAME = "StoreListItem";
@@ -66,6 +67,7 @@ namespace UI.RechargeStore
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_btnBuy = (UI_Component2)UI_Component2.Create(comp.GetChild("btnBuy"));
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -76,6 +78,7 @@ namespace UI.RechargeStore
             m_btnBuy.Dispose();
             m_btnBuy = null;
             m_txtDesc = null;
+            m_txtExchangeCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_ComBtn.cs

@@ -7,6 +7,8 @@ namespace UI.RoleInfo
     public partial class UI_ComBtn
     {
         public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnAll;
         public GButton m_btnGetAllDressUpItem;
         public GButton m_btnGetAllCardItem;
         public GButton m_btnSetLv;
@@ -14,8 +16,6 @@ namespace UI.RoleInfo
         public GButton m_btnSetChapter;
         public GTextInput m_txtChapter;
         public GTextInput m_txtChapterLv;
-        public GButton m_btnAll;
-        public GButton m_btnSkipCheckOpen;
         public const string URL = "ui://374k3dwvlqp0dm";
         public const string PACKAGE_NAME = "RoleInfo";
         public const string RES_NAME = "ComBtn";
@@ -63,6 +63,8 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
+            m_btnAll = (GButton)comp.GetChild("btnAll");
             m_btnGetAllDressUpItem = (GButton)comp.GetChild("btnGetAllDressUpItem");
             m_btnGetAllCardItem = (GButton)comp.GetChild("btnGetAllCardItem");
             m_btnSetLv = (GButton)comp.GetChild("btnSetLv");
@@ -70,11 +72,11 @@ namespace UI.RoleInfo
             m_btnSetChapter = (GButton)comp.GetChild("btnSetChapter");
             m_txtChapter = (GTextInput)comp.GetChild("txtChapter");
             m_txtChapterLv = (GTextInput)comp.GetChild("txtChapterLv");
-            m_btnAll = (GButton)comp.GetChild("btnAll");
-            m_btnSkipCheckOpen = (GButton)comp.GetChild("btnSkipCheckOpen");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_btnAll = null;
             m_btnGetAllDressUpItem = null;
             m_btnGetAllCardItem = null;
             m_btnSetLv = null;
@@ -82,8 +84,6 @@ namespace UI.RoleInfo
             m_btnSetChapter = null;
             m_txtChapter = null;
             m_txtChapterLv = null;
-            m_btnAll = null;
-            m_btnSkipCheckOpen = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -54,6 +54,8 @@ namespace ET
             roleInfo.roleName = message.FriendInfo.RoleInfo.RoleName;
             roleInfo.roleLv = message.FriendInfo.RoleInfo.RoleLvl;
             roleInfo.offlineTimeSec = message.FriendInfo.RoleInfo.OfflineTimeSec;
+            roleInfo.roleHead = message.FriendInfo.RoleInfo.HeadItemId;
+            roleInfo.roleHeadBorder = message.FriendInfo.RoleInfo.HeadBorderItemId;
 
             FriendInfoData friendInfo = new FriendInfoData();
             friendInfo.roleInfo = roleInfo;
@@ -81,6 +83,8 @@ namespace ET
                 roleInfo.roleName = message.FriendList[i].RoleInfo.RoleName;
                 roleInfo.roleLv = message.FriendList[i].RoleInfo.RoleLvl;
                 roleInfo.offlineTimeSec = message.FriendList[i].RoleInfo.OfflineTimeSec;
+                roleInfo.roleHead = message.FriendList[i].RoleInfo.HeadItemId;
+                roleInfo.roleHeadBorder = message.FriendList[i].RoleInfo.HeadBorderItemId;
 
                 FriendInfoData friendInfo = new FriendInfoData();
                 friendInfo.roleInfo = roleInfo;
@@ -143,6 +147,8 @@ namespace GFGGame
                         roleInfo.roleName = response.FriendList[i].RoleInfo.RoleName;
                         roleInfo.roleLv = response.FriendList[i].RoleInfo.RoleLvl;
                         roleInfo.offlineTimeSec = response.FriendList[i].RoleInfo.OfflineTimeSec;
+                        roleInfo.roleHead = response.FriendList[i].RoleInfo.HeadItemId;
+                        roleInfo.roleHeadBorder = response.FriendList[i].RoleInfo.HeadBorderItemId;
 
                         FriendInfoData friendInfo = new FriendInfoData();
                         friendInfo.roleInfo = roleInfo;
@@ -280,6 +286,8 @@ namespace GFGGame
                         roleInfo.roleName = response.RoleList[i].RoleName;
                         roleInfo.roleLv = response.RoleList[i].RoleLvl;
                         roleInfo.offlineTimeSec = response.RoleList[i].OfflineTimeSec;
+                        roleInfo.roleHead = response.RoleList[i].HeadItemId;
+                        roleInfo.roleHeadBorder = response.RoleList[i].HeadBorderItemId;
                         FriendDataManager.Instance.AddSearchData(roleInfo);
                     }
                     return true;
@@ -305,6 +313,8 @@ namespace GFGGame
                         roleInfo.roleName = response.RoleList[i].RoleName;
                         roleInfo.roleLv = response.RoleList[i].RoleLvl;
                         roleInfo.offlineTimeSec = response.RoleList[i].OfflineTimeSec;
+                        roleInfo.roleHead = response.RoleList[i].HeadItemId;
+                        roleInfo.roleHeadBorder = response.RoleList[i].HeadBorderItemId;
                         FriendDataManager.Instance.AddRecommendData(roleInfo);
                     }
                     return true;

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -41,7 +41,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listGuide.onClickItem.Add(OnClickListGuideItem);
             _ui.m_compBanner.m_listTab.onClickItem.Add(OnClickListBannerItem);
-            _ui.m_compBanner.m_loaderPic.onClick.Add(OnClickBannerPic);
+            // _ui.m_compBanner.m_loaderPic.onClick.Add(OnClickBannerPic);
 
 
 

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendAddView.cs

@@ -85,6 +85,7 @@ namespace GFGGame
             OtherRoleInfoData roleInfoData = _searchDatas[index];
 
             UI_ListSearchItem item = UI_ListSearchItem.Proxy(obj);
+            RoleInfoManager.Instance.UpdateHead(item.m_comHead, roleInfoData.roleHead, roleInfoData.roleHeadBorder);
             item.m_txtName.text = roleInfoData.roleName;
             item.m_txtLvl.text = roleInfoData.roleLv.ToString();
             item.m_c1.selectedIndex = 0;
@@ -170,6 +171,7 @@ namespace GFGGame
         {
             FriendInfoData data = FriendDataManager.Instance.ApplyDatas[index];
             UI_ListApplyItem item = UI_ListApplyItem.Proxy(obj);
+            RoleInfoManager.Instance.UpdateHead(item.m_comHead, data.roleInfo.roleHead, data.roleInfo.roleHeadBorder);
             item.m_txtName.text = data.roleInfo.roleName;
             item.m_txtLvl.text = data.roleInfo.roleLv.ToString();
             if (item.m_btnAgree.data == null)

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -33,6 +33,11 @@ namespace GFGGame
         protected override void Init()
         {
             base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
             packageName = UI_FriendUI.PACKAGE_NAME;
             _ui = UI_FriendUI.Create();
             viewCom = _ui.target;
@@ -47,13 +52,7 @@ namespace GFGGame
             _ui.m_btnDelete.onClick.Add(OnBtnDeleteClick);
             _ui.m_btnAdd.onClick.Add(OnBtnAddClick);
             _ui.m_btnSendAll.onClick.Add(OnBtnSendAllClick);
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            _ui.m_btnBack.onClick.Add(OnHide);
-
+            _ui.m_btnBack.onClick.Add(GoBackFrom);
         }
         protected override void AddEventListener()
         {
@@ -115,6 +114,9 @@ namespace GFGGame
                 _sceneObject = null;
             }
             _ui.m_list.numItems = 0;
+        }
+        private void GoBackFrom()
+        {
             ViewManager.GoBackFrom(typeof(FriendView).FullName);
         }
         protected override void RemoveEventListener()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -197,7 +197,7 @@ namespace GFGGame
             updateNeedItem();
 
 
-            _ui.m_comCostCurrent.visible = true;
+            // _ui.m_comCostCurrent.visible = true;
 
             _index = 0;
             // this.clickBlankToClose = true;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -199,7 +199,9 @@ namespace GFGGame
             }
             _ui.m_txtTitle.text = title;
             _ui.m_txtLevelDesc.text = levelCfg.desc;
-            _ui.m_txtPowerDesc.SetVar("power", "" + levelCfg.power).FlushVars();
+            ItemUtil.SetItemNeedNum(_ui.m_comCostCurrent, ConstItemID.POWER, levelCfg.power);
+            _ui.m_comCostCurrent.visible = levelCfg.power > 0;
+            // _ui.m_txtPowerDesc.SetVar("power", "" + levelCfg.power).FlushVars();
             _ui.m_scoreType.url = "ui://CommonGame/kp_sx_" + fightCfg.scoreType;
             if (fightCfg.targetName != null && fightCfg.targetName.Length > 0)
             {

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -158,6 +158,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
             EventAgent.AddEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
             EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.AddEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
         }
         protected override void OnShown()
         {
@@ -173,6 +174,8 @@ namespace GFGGame
 
             SceneController.UpdateMainScene(_sceneObject);
             UpdateRoleLvl();
+            UpdateHead();
+
             _valueBarController.OnShown();
 
 
@@ -205,6 +208,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
             EventAgent.RemoveEventListener(ConstMessage.STORY_LEVEL_CHANGE, CheckFunOpen);
             EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.CHANGE_ROLE_HEAD, UpdateHead);
 
         }
         private void AddEffect()
@@ -540,6 +544,11 @@ namespace GFGGame
             _ui.m_headBar.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
         }
 
+        private void UpdateHead()
+        {
+            RoleInfoManager.Instance.UpdateHead(_ui.m_headBar.m_comHead, RoleDataManager.headId, RoleDataManager.headBorderId);
+        }
+
         private void CheckFunOpen()
         {
             _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

@@ -141,6 +141,7 @@ namespace GFGGame
             loaIcon.texture = _photoInfos[index].Ntexture;
 
             item.m_txtTime.text = TimeUtil.FormattingTime1(_photoInfos[index].CreationTime);
+            item.m_txtTime.visible = false;
             item.m_btnLock.m_c1.selectedIndex = _photoInfos[index].LockingStatus ? 1 : 0;
             item.m_btnUp.m_c1.selectedIndex = _photoInfos[index].ToppingStatus ? 1 : 0;
             if (item.m_btnLock.target.data == null)

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

@@ -136,6 +136,7 @@ namespace GFGGame
         {
             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)
@@ -256,6 +257,8 @@ namespace GFGGame
             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)

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -34,12 +34,12 @@ namespace GFGGame
             _ui.m_ComBtn.m_btnAll.onClick.Add(OnClickBtnAll);
             _ui.m_btnAddItem.onClick.Add(OnClickBtnAddItem);
             _ui.m_btnGM.onClick.Add(OnClickBtnGM);
-            _ui.m_ComBtn.m_btnSkipCheckOpen.onClick.Add(OnClickBtnSkipCheckOpen);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_ComBtn.m_c1.selectedIndex = LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL ? 0 : 1;
         }
 
         protected override void OnHide()

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -65,7 +65,7 @@ namespace GFGGame
         }
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(OtherRoleInfoData).FullName);
+            ViewManager.GoBackFrom(typeof(OtherRoleInfoView).FullName);
         }
         protected override void RemoveEventListener()
         {

GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -3,13 +3,13 @@ using GFGGame;
 using GFGGame.Launcher;
 using FairyGUI;
 using System;
+using System.Collections.Generic;
 
 public class GameLauncher : MonoBehaviour
 {
     private void Awake()
     {
         DontDestroyOnLoad(gameObject);
-
     }
 
     // Start is called before the first frame update
@@ -22,7 +22,7 @@ public class GameLauncher : MonoBehaviour
         HealthAdviceView.Instance.Open();
         InitBugly();
 
-        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL ? 1 : 10;
+        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.TISHEN ? 10 : 1;
         Timers.inst.Add(time, 1, (object param) =>
         {
             HealthAdviceView.Instance.Close();
@@ -108,7 +108,7 @@ public class GameLauncher : MonoBehaviour
         {
             BuglyAgent.InitWithAppId("766c5bdb0f");
         }
-        else if (LauncherConfig.netType == LauncherConfig.EnumNetType.DEV)
+        else if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP)
         {
             BuglyAgent.InitWithAppId("b6d0b1b8c5");
         }

GameClient/Assets/Game/Launcher/Log/LogServerHelperHttp.cs

@@ -13,7 +13,7 @@ namespace GFGGame
         public static void SendNodeLog(int node, int serverId = 1)
         {
             var body = $"?logStr={LauncherConfig.platformId}|{SystemInfo.deviceUniqueIdentifier}|{node}";
-            HttpTool.Instance.Get(LauncherConfig.logApiReportLauncherUrl + body, null);
+            HttpTool.Instance.Get(LauncherConfig.logApiReportLauncherUrl + body, null,false);
         }
     }
 }

GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player"
-    xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
-    <application android:networkSecurityConfig="@xml/network_security_config">
-
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools"
+	android:installLocation="preferExternal">
+	
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true"/>
+    <application>
+        <activity
+			android:name="com.taptap.sdk.TapTapActivity"
+			android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+			android:exported="false"
+			android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
     </application>
 
     <!--bugly配置权限start-->