Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

FGUIProject/assets/ClothingSynthetic/components/Component3.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="101,34">
   <displayList>
-    <image id="n34_ja9w" name="n34" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="0,3"/>
-    <text id="n35_ja9w" name="txtProgess" xy="12,0" size="48,34" fontSize="24" color="#e5ded7" text="0/0"/>
-    <image id="n36_ja9w" name="loaderPlus" src="ja9w1i" fileName="images/jiahao.png" xy="69,7"/>
+    <image id="n34_ja9w" name="n34" src="ja9w1j" fileName="images/hc_kuang_6.png" xy="-8,3" size="118,28"/>
+    <image id="n36_ja9w" name="loaderPlus" src="ja9w1i" fileName="images/jiahao.png" xy="84,7"/>
+    <text id="n35_ja9w" name="txtProgess" xy="2,0" pivot="0.5,0.5" size="88,34" fontSize="24" color="#e5ded7" letterSpacing="-1" text="100/10"/>
   </displayList>
 </component>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -40,7 +40,7 @@
     <image id="ja9w1g" name="hc_kuang_2.png" path="/images/"/>
     <image id="ja9w1h" name="hc_xiant_2.png" path="/images/"/>
     <image id="ja9w1i" name="jiahao.png" path="/images/"/>
-    <image id="ja9w1j" name="hc_kuang_6.png" path="/images/"/>
+    <image id="ja9w1j" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="25,7,50,14"/>
     <component id="lwri1k" name="Component3.xml" path="/components/"/>
     <image id="842s1l" name="hc_bj_1.jpg" path="/images/"/>
     <image id="f5bl1m" name="hc_kuang_3.png" path="/images/"/>

FGUIProject/assets/CommonGame/BuyCountUI.xml

@@ -24,7 +24,7 @@
     <component id="n7_hinb" name="btnCancel" src="q08x6" fileName="components/Button1.xml" pkg="mk0fwx0x" xy="54,354">
       <Button title="取消"/>
     </component>
-    <text id="n24_ai2z" name="txtBuyTips" xy="314,471" pivot="0.5,0" size="308,36" fontSize="26" color="#a0845c" text="消耗1珍珠，可兑换10缴销"/>
+    <text id="n24_ai2z" name="txtBuyTips" xy="301,471" pivot="0.5,0" size="333,36" fontSize="26" color="#a0845c" text="消耗1珍珠，可兑换10马蹄金"/>
   </displayList>
   <relation target="n0_hinb" sidePair="height-height"/>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -196,6 +196,9 @@
     <image id="slyzthy" name="yx_yihd.png" path="/images/"/>
     <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
+    <image id="kqhdp" name="gzs_bjbj.png" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <image id="es2qti0" name="ejzjm_bj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <image id="kqhd1a" name="zjm_bj_1.jpg" path="/bgimg/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Loading/LoadingView.xml

@@ -15,7 +15,7 @@
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
     </image>
     <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>
-    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="25" color="#d8c584" align="center" autoSize="none" strokeColor="#333333" text="启动中...">
+    <text id="n7_hibu" name="txtDescLeft" xy="90,1722" size="900,44" group="n8_hibu" fontSize="25" color="#d8c584" align="center" autoSize="none" text="启动中...">
       <relation target="" sidePair=""/>
     </text>
     <group id="n8_hibu" name="n8" xy="90,1722" size="900,44" advanced="true">

FGUIProject/assets/Main/MainUI.xml

@@ -10,7 +10,7 @@
     <image id="n9_q08x" name="n9" src="q08xk" fileName="images/zjm_yying.png" xy="0,1491" size="1080,429">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
-    <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="522,190">
+    <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="522,190" visible="false">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="6,790" visible="false">

FGUIProject/assets/Main/RoleInfoUI.xml

@@ -3,8 +3,8 @@
   <displayList>
     <loader id="n0_d4iw" name="bg" xy="-73,0" size="877,1000" touchable="false" url="ui://mfvz4q8kmhyhd5"/>
     <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="214,313"/>
-    <text id="n2_d4iw" name="txtTitle" xy="20,22" size="726,56" visible="false" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
-    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="304,86"/>
+    <text id="n2_d4iw" name="txtTitle" xy="-13,22" size="726,56" visible="false" fontSize="42" color="#ffffff" align="center" autoSize="none" text="个人信息"/>
+    <component id="n4_d4iw" name="n4" src="kubi7h" fileName="components/CompHeadWithBg.xml" xy="288,127" pivot="0.5,0.5" scale="1.6,1.6"/>
     <text id="n5_d4iw" name="txtRoleName" xy="273,313" pivot="0.5,0" size="186,61" fontSize="46" color="#a37349" align="center" text="角色名五"/>
     <text id="n6_d4iw" name="n6" xy="57,440" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
     <text id="n7_d4iw" name="n7" xy="57,500" size="71,46" fontSize="34" color="#aa794d" text="经验"/>
@@ -29,6 +29,6 @@
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <loader id="n24_mhyh" name="loaChangeName" xy="513,331" size="34,36" url="ui://mfvz4q8kmhyhd8" autoSize="true"/>
-    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="263,86"/>
+    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="247,86" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -26,7 +26,9 @@
     <loader id="n16_t8o1" name="loaderHead" xy="210,2" pivot="0.5,0" anchor="true" size="332,558" url="ui://mfvz4q8kj48o96" autoSize="true" clearOnPublish="true"/>
     <loader id="n47_m1l9" name="loaCost" xy="812,1101" size="60,60" visible="false" url="ui://eg2y0ldpq08x4" autoSize="true"/>
     <text id="n18_t8o1" name="txtPowerDesc" xy="806,1110" size="161,39" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力：{power=5}"/>
-    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="17,152" size="54,426"/>
+    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="17,152" size="54,426">
+      <relation target="" sidePair="top-top"/>
+    </image>
     <text id="n21_t8o1" name="txtTargetName" xy="26,167" pivot="0.5,0" size="32,395" fontSize="32" color="#dcc7b3" align="center" leading="0" autoSize="height" text="挑战对手·巴拉巴拉">
       <relation target="n34_pal5" sidePair="top-top"/>
     </text>

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -2,17 +2,17 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="520,1678"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="77,1431"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1292"/>
-    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="873,1205"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="378,2112"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="552,1948"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="672,1729"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="460,1594"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="243,1410"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="485,1235"/>
+    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,1124"/>
     <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="529,945"/>
-    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="134,786"/>
-    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="901,689"/>
-    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="413,515"/>
-    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="507,209"/>
+    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="302,847"/>
+    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="464,672"/>
+    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="706,550"/>
+    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="492,384"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -2,25 +2,25 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n37_n1kn" name="n37" src="n1knde" fileName="imagesStory/beijing2_bg.jpg" xy="-4,-3" aspect="true"/>
-    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="634,2422"/>
-    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="486,2250"/>
-    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="307,2142"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="144,2027"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="458,1909"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="726,1890"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="992,1779"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="720,1624"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="235,1485"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="13,1342"/>
-    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="177,1186"/>
-    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="509,1126"/>
-    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="756,1047"/>
-    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="627,881"/>
-    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="294,714"/>
-    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="549,574"/>
-    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="388,491"/>
-    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="123,401"/>
-    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="301,319"/>
-    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="512,259"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="731,2325"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="518,2250"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="338,2133"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="291,1975"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="514,1878"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="770,1810"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="621,1659"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="453,1539"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="271,1446"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="146,1292"/>
+    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="360,1205"/>
+    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="547,1106"/>
+    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="718,995"/>
+    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="845,840"/>
+    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="647,757"/>
+    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="435,653"/>
+    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="225,546"/>
+    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="111,392"/>
+    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="291,300"/>
+    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="471,210"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -3,17 +3,24 @@
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
     <component id="n21_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="318,2231"/>
-    <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="550,2110"/>
-    <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="928,1988"/>
-    <component id="n24_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="763,1841"/>
-    <component id="n25_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="556,1716"/>
-    <component id="n26_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="194,1563"/>
-    <component id="n27_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="258,1285"/>
-    <component id="n28_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="100,973"/>
-    <component id="n29_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="662,1159"/>
-    <component id="n30_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="991,901"/>
-    <component id="n31_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="669,728"/>
-    <component id="n32_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="218,557"/>
-    <component id="n33_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="549,361"/>
+    <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="531,2108"/>
+    <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="765,2058"/>
+    <component id="n24_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="945,1948"/>
+    <component id="n25_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="796,1804"/>
+    <component id="n26_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="589,1704"/>
+    <component id="n27_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="384,1606"/>
+    <component id="n28_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="184,1458"/>
+    <component id="n29_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="325,1339"/>
+    <component id="n30_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="506,1234"/>
+    <component id="n31_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="707,1168"/>
+    <component id="n32_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="929,1131"/>
+    <component id="n33_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,949"/>
+    <component id="n34_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="642,833"/>
+    <component id="n35_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="411,771"/>
+    <component id="n36_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="182,684"/>
+    <component id="n37_j4p1" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="282,511"/>
+    <component id="n38_j4p1" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="448,416"/>
+    <component id="n39_j4p1" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="610,314"/>
+    <component id="n40_j4p1" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="446,187"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -2,17 +2,25 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
-    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="592,2450"/>
-    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="340,2308"/>
-    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="630,2221"/>
-    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="145,2012"/>
-    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="728,1577"/>
-    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="51,1384"/>
-    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="465,1111"/>
-    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1009,1166"/>
-    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="493,913"/>
-    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="481,432"/>
-    <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="745,302"/>
-    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="493,168"/>
+    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="578,2386"/>
+    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="237,2111"/>
+    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="428,2224"/>
+    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="408,1985"/>
+    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="637,1930"/>
+    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="862,1873"/>
+    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="736,1689"/>
+    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="568,1563"/>
+    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="367,1472"/>
+    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="175,1384"/>
+    <component id="n30_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="242,1176"/>
+    <component id="n31_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="486,1095"/>
+    <component id="n32_j4p1" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="720,1086"/>
+    <component id="n33_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="927,1004"/>
+    <component id="n34_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="728,872"/>
+    <component id="n35_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="515,784"/>
+    <component id="n36_j4p1" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="316,682"/>
+    <component id="n37_j4p1" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="402,478"/>
+    <component id="n38_j4p1" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="607,377"/>
+    <component id="n39_j4p1" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="507,156"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml

@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,2167"/>
-    <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1917"/>
-    <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1917"/>
-    <component id="n45_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,1667"/>
-    <component id="n46_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1407"/>
-    <component id="n47_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1407"/>
-    <component id="n48_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,1157"/>
-    <component id="n49_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,907"/>
-    <component id="n50_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,907"/>
-    <component id="n51_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,657"/>
-    <component id="n52_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,397"/>
-    <component id="n53_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,397"/>
+    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="-7,-24"/>
+    <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="466,2331"/>
+    <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="657,2218"/>
+    <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="805,2095"/>
+    <component id="n45_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="606,2000"/>
+    <component id="n46_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="410,1920"/>
+    <component id="n47_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="218,1797"/>
+    <component id="n48_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="375,1643"/>
+    <component id="n49_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="798,1482"/>
+    <component id="n50_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="600,1584"/>
+    <component id="n51_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="834,1302"/>
+    <component id="n52_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="636,1214"/>
+    <component id="n53_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="419,1119"/>
+    <component id="n54_j4p1" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="242,1008"/>
+    <component id="n55_j4p1" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="188,810"/>
+    <component id="n56_j4p1" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="400,741"/>
+    <component id="n57_j4p1" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="635,750"/>
+    <component id="n58_j4p1" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="877,691"/>
+    <component id="n59_j4p1" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="656,554"/>
+    <component id="n60_j4p1" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="416,495"/>
+    <component id="n61_j4p1" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="480,296"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -2,11 +2,11 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="483,2066"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="472,1673"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="84,1410"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="849,1206"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="154,785"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="408,365"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="509,1972"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="639,1655"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="411,1425"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="553,1172"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="343,909"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="586,712"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml

@@ -2,15 +2,15 @@
 <component size="1170,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="slb41o" fileName="imagesStory/zhuxian_ditu.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
-    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="476,2298"/>
-    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="282,2133"/>
-    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="286,1782"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="667,1706"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="469,1443"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,1277"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="364,1073"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="740,967"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="364,754"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="523,529"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="585,2184"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="603,1951"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="375,1784"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="202,1583"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="547,1474"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="752,1288"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="441,1141"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="642,955"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="345,812"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="599,656"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -2,15 +2,15 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
-    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="317,2227"/>
-    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,2072"/>
-    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="925,1806"/>
-    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="562,1712"/>
+    <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="346,2224"/>
+    <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="707,2082"/>
+    <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="927,1803"/>
+    <component id="n11_ux8s" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="537,1704"/>
     <component id="n12_ux8s" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="187,1562"/>
     <component id="n13_ux8s" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="407,1327"/>
     <component id="n14_ux8s" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,1161"/>
-    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="924,922"/>
-    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="177,825"/>
-    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="437,431"/>
+    <component id="n15_ux8s" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="856,956"/>
+    <component id="n16_ux8s" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="556,783"/>
+    <component id="n17_ux8s" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="286,470"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -2,15 +2,15 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
-    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="607,2225"/>
-    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="150,2007"/>
-    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="513,1734"/>
-    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="746,1542"/>
-    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="41,1365"/>
-    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1000,1157"/>
-    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="492,916"/>
-    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="470,438"/>
-    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="739,301"/>
-    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="496,141"/>
+    <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="484,2255"/>
+    <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="688,2077"/>
+    <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="511,1804"/>
+    <component id="n23_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="680,1591"/>
+    <component id="n24_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="306,1409"/>
+    <component id="n25_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="609,1167"/>
+    <component id="n26_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="780,974"/>
+    <component id="n27_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="604,755"/>
+    <component id="n28_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="422,570"/>
+    <component id="n29_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="663,292"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n24_fa5e" name="n24" src="kqhdp" fileName="images/gzs_bjbj.png" xy="0,-240">
+    <image id="n24_fa5e" name="n24" src="kqhdp" fileName="images/gzs_bjbj.png" xy="0,-240" pkg="eg2y0ldp">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <image id="n25_kqhd" name="n25" src="kqhdz" fileName="images/gzsxian_2.png" xy="61,162">

FGUIProject/assets/Studio/StudioUI.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n6_fa5e" name="n6" src="kqhd1a" fileName="images/zjm_bj_1.jpg" xy="0,-240">
+    <image id="n6_fa5e" name="n6" src="es2qti0" fileName="bgimg/ejzjm_bj.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <component id="n1_rbxq" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="840,910">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd17"/>
+    <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"/>
     </component>
-    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="30,1064">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd19"/>
+    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="128,450">
+      <relation target="" sidePair="left-left,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1g"/>
     </component>
-    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="30,1345">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd18"/>
+    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="876,191">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1f"/>
     </component>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="820,1497">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd16"/>
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/Studio/components/ComEctype.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="198,198">
+<component size="84,403">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_n3xh" name="icon" xy="-23,-9" size="236,218" url="ui://xz8kxreckqhd19" autoSize="true"/>
-    <image id="n3_n3xh" name="img" src="mnxr1c" fileName="images/zjm_anhui.png" xy="0,0">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n2_rbxq" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="63,80">
+    <loader id="n4_n3xh" name="icon" xy="0,0" size="84,403" url="ui://xz8kxreces2q1e" autoSize="true"/>
+    <image id="n3_n3xh" name="img" src="es2q1h" fileName="images/ejzjm_gbzt.png" xy="0,4">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

FGUIProject/assets/Studio/package.xml

@@ -11,7 +11,6 @@
     <component id="n3xhi" name="Button12.xml" path="/components/"/>
     <component id="n3xhn" name="ListPropertyItem.xml" path="/components/"/>
     <image id="kqhdo" name="zpsxian_1.png" path="/images/"/>
-    <image id="kqhdp" name="gzs_bjbj.png" path="/images/" atlas="alone_npot"/>
     <image id="kqhdq" name="gzsatb_1.png" path="/images/" exported="true"/>
     <image id="kqhdr" name="gzsatb_2.png" path="/images/" exported="true"/>
     <image id="kqhds" name="gzsdi_1.png" path="/images/"/>
@@ -28,12 +27,11 @@
     <image id="kqhd13" name="gzswtb_2.png" path="/images/" exported="true"/>
     <image id="kqhd14" name="gzswtb_3.png" path="/images/" exported="true"/>
     <image id="kqhd15" name="gzswtb_4.png" path="/images/" exported="true"/>
-    <image id="kqhd16" name="zjm_rk_11.png" path="/images/"/>
-    <image id="kqhd17" name="zjm_rk_8.png" path="/images/"/>
-    <image id="kqhd18" name="zjm_rk_9.png" path="/images/"/>
-    <image id="kqhd19" name="zjm_rk_10.png" path="/images/"/>
-    <image id="kqhd1a" name="zjm_bj_1.jpg" path="/images/" atlas="alone_npot"/>
-    <image id="mnxr1c" name="zjm_anhui.png" path="/images/"/>
+    <image id="es2q1d" name="ejzjm_4.png" path="/images/"/>
+    <image id="es2q1e" name="ejzjm_1.png" path="/images/"/>
+    <image id="es2q1f" name="ejzjm_2.png" path="/images/"/>
+    <image id="es2q1g" name="ejzjm_3.png" path="/images/"/>
+    <image id="es2q1h" name="ejzjm_gbzt.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -17,7 +17,7 @@ namespace GFGGame
             set { _dailyLoginId = value; }
         }
 
-        private int _bonusStatus = 1;
+        private int _bonusStatus = 0;
         /// <summary>
         /// 七日登录 当前奖励状态
         /// </summary>

GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -53,14 +53,6 @@ namespace GFGGame
         public bool GetMailRed()
         {
             if (MailDataManager.Instance.UnreadCount > 0) return true;
-            // Dictionary<long, MailInfo> mailInfoDic = MailDataManager.Instance.MailInfoDic;
-            // foreach (MailInfo mailInfo in mailInfoDic.Values)
-            // {
-            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 1) return false;//数据已排序，第一个已读，则所没有含奖邮件
-            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 3) return false;//数据已排序，第一个已领，则所有奖励已领
-            //     if (MailDataManager.Instance.GetMailState(mailInfo) == 2) return true;//数据已排序，有奖励未领
-
-            // }
 
             return false;
         }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingSynthetic/UI_Component3.cs

@@ -7,8 +7,8 @@ namespace UI.ClothingSynthetic
     public partial class UI_Component3
     {
         public GComponent target;
-        public GTextField m_txtProgess;
         public GImage m_loaderPlus;
+        public GTextField m_txtProgess;
         public const string URL = "ui://4f294tdklwri1k";
         public const string PACKAGE_NAME = "ClothingSynthetic";
         public const string RES_NAME = "Component3";
@@ -56,13 +56,13 @@ namespace UI.ClothingSynthetic
 
         private void Init(GComponent comp)
         {
-            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
             m_loaderPlus = (GImage)comp.GetChild("loaderPlus");
+            m_txtProgess = (GTextField)comp.GetChild("txtProgess");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtProgess = null;
             m_loaderPlus = null;
+            m_txtProgess = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -21,6 +21,13 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
         public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8ks2cc5p";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10003";
@@ -82,6 +89,13 @@ namespace UI.Main
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
             m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -112,6 +126,20 @@ namespace UI.Main
             m_g12 = null;
             m_g13.Dispose();
             m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,6 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
+        public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8ks2cc5q";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10004";
@@ -80,6 +88,14 @@ namespace UI.Main
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +124,22 @@ namespace UI.Main
             m_g11 = null;
             m_g12.Dispose();
             m_g12 = null;
+            m_g13.Dispose();
+            m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -20,6 +20,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
+        public UI_CompStoryLevelItem m_g13;
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
         public const string URL = "ui://mfvz4q8kga166s";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10005";
@@ -80,6 +88,14 @@ namespace UI.Main
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
+            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -108,6 +124,22 @@ namespace UI.Main
             m_g11 = null;
             m_g12.Dispose();
             m_g12 = null;
+            m_g13.Dispose();
+            m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComEctype.cs

@@ -10,7 +10,6 @@ namespace UI.Studio
         public Controller m_c1;
         public GLoader m_icon;
         public GImage m_img;
-        public GImage m_imgLock;
         public const string URL = "ui://xz8kxrecrbxq5";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComEctype";
@@ -61,14 +60,12 @@ namespace UI.Studio
             m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_img = (GImage)comp.GetChild("img");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_icon = null;
             m_img = null;
-            m_imgLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -249,7 +249,11 @@ namespace GFGGame
         {
             DecomposeCfg cfg = DecomposeCfgArray.Instance.GetCfg(_curRarity);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.consumeId);
-
+            if (_decomposeCount <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未选择分解服装");
+                return;
+            }
             int consumeCount = cfg.consumeCount * _decomposeCount;
             if (consumeCount > ItemDataManager.GetItemNum(cfg.consumeId))
             {

GameClient/Assets/Game/HotUpdate/Views/CommonGame/RewardView.cs

@@ -72,11 +72,30 @@ namespace GFGGame
         {
             // obj.data = _listItemDatas[index];
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
+            string name = "";
+            string iconRes = "";
+            string ext = "png";
+
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_listItemDatas[index].id);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_listItemDatas[index].id);
-            item.m_comRewardItem.m_txtName.text = itemCfg.name;
+
+            if (suitCfg != null)
+            {
+                name = suitCfg.name;
+                iconRes = suitCfg.res;
+            }
+            else
+            {
+                name = itemCfg.name;
+                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
+                iconRes = itemCfg.res;
+            }
+
+            item.m_comRewardItem.m_txtName.text = name;
             // item.m_txtCount.text = _listItemDatas[index].num==1?"": string.Format("x{0}", _listItemDatas[index].num);
             item.m_comRewardItem.m_txtCount.text = string.Format("x{0}", _listItemDatas[index].num);
-            item.m_comRewardItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_comRewardItem.m_loaIcon.url = ResPathUtil.GetIconPath(iconRes, ext);
+
             item.m_comRewardItem.m_imgOnceBonus.visible = _listItemDatas[index].isOnceBonus;
             string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_zl");
             int childIndex = _ui.m_comListReward.m_listReward.ItemIndexToChildIndex(index);

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -112,6 +112,7 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
             _ui.m_txtRecommendCount.SetVar("v1", "" + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount)).FlushVars();
+            _ui.m_txtRecommendCount.SetVar("v2", GlobalCfgArray.globalCfg.recommendCount.ToString()).FlushVars();
             _ui.m_btnRecommend.enabled = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount) > 0;
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             _ui.m_btnAutoPlay.selected = EquipDataCache.cacher.autoPlay;

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

@@ -39,7 +39,7 @@ namespace GFGGame
                     return;
                 }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, null, true);
+                ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog) }, new object[] { typeof(StoryChapterView).Name, MainStoryDataManager.currentChapterCfgId }, true);
             }
         }
 

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

@@ -143,7 +143,9 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            Over(false);
+            // this.Hide();
+            ViewManager.GoBackFrom(typeof(StoryDialogView).Name);
+            // Over(false);
         }
 
         private void OnClickBtnNext()

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

@@ -125,8 +125,11 @@ namespace GFGGame
             UpdateRoleLvl();
             _valueBarController.OnShown();
 
-            // CheckFunOpen();
-            // UpdateToCheckGuide();
+            long lastTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            {
+                ViewManager.Show<DailyLoginView>();
+            }
             Timers.inst.AddUpdate(Update);
         }
 
@@ -361,7 +364,8 @@ namespace GFGGame
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             _ui.m_btnZhaiXing.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnCiPai.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
-            _ui.m_btnDailyLogin.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false);
+            _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false)
+            || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));
             _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
 

GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4bcfcfc65ecec984eb30826cfc6b9140
+guid: 845e52a898fcf7c4a8798884dfe5e770
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3ef20342acda61e4d92c4cbceb81f8a8
+guid: ff995218236889445a810799ed2c14ae
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9674e399a3d101e49a2c50eb874ad3b4
+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: