Merge remote-tracking branch 'remotes/origin/master' into xiaojie

FGUIProject/assets/Bag/GiftBoxSelectorUI.xml

@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,970">
+<component size="1026,968">
   <displayList>
-    <image id="n0_v5no" name="n0" src="v5notm5" fileName="images/tanchuang_2.png" xy="-61,-37" size="1023,1026"/>
-    <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="849,-29" group="n11_v5no"/>
-    <image id="n14_v5no" name="n14" src="v5notm0" fileName="images/lm_db_3.png" xy="331,138" size="575,274" group="n11_v5no"/>
-    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="-9,79" group="n11_v5no"/>
-    <text id="n15_v5no" name="txtItemDes" xy="390,168" size="462,217" group="n11_v5no" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
-    <text id="n5_v5no" name="txtTotalNum" xy="725,89" size="206,41" group="n11_v5no" fontSize="28" color="#b08d5c" align="center" leading="1" autoSize="shrink" text="已拥有：1940"/>
-    <loader id="n7_v5no" name="loaIcon" xy="171,255" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
-    <image id="n1_v5no" name="n1" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="130,69" pivot="0.5,0.5" group="n33_x8jz"/>
-    <text id="n3_v5no" name="txtName" xy="279,51" pivot="0.5,0" size="404,54" group="n33_x8jz" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" autoClearText="true" text="稀有升星稀星稀星稀星"/>
-    <image id="n2_v5no" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="702,71" pivot="0.5,0.5" group="n33_x8jz" scale="-1,1"/>
-    <group id="n33_x8jz" name="n33" xy="130,51" size="702,54" group="n11_v5no" advanced="true" layout="hz" colGap="19" excludeInvisibles="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
-    <group id="n11_v5no" name="n11" xy="-9,-29" size="946,459"/>
-    <image id="n18_v5no" name="n18" src="v5notm4" fileName="images/lm_zsx0.png" xy="117,423" group="n21_v5no"/>
-    <text id="n19_v5no" name="n19" xy="378,422" size="206,44" group="n21_v5no" fontSize="32" color="#b69566" align="center" leading="1" autoSize="none" text="自选道具"/>
-    <list id="n20_v5no" name="list" xy="43,494" size="875,241" group="n21_v5no" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="20" defaultItem="ui://2bsz6nelv5notmb" align="center">
+    <image id="n0_v5no" name="n0" src="m5qxtn2" fileName="images/ty_tc_m.png" xy="0,0" size="1026,968"/>
+    <group id="n11_v5no" name="n11" xy="47,-34" size="919,434"/>
+    <graph id="n35_m5qx" name="holderLeftTop" xy="160,115" size="69,35" group="n11_v5no"/>
+    <component id="n31_cu9w" name="btnCancel" src="cu9wtmj" fileName="components/BtnCancel.xml" xy="878,-34" group="n11_v5no"/>
+    <image id="n6_v5no" name="n6" src="v5notm9" fileName="images/wplb_db.png" xy="47,49" group="n11_v5no" scale="0.9,0.9"/>
+    <text id="n15_v5no" name="txtItemDes" xy="411,231" size="462,169" group="n11_v5no" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#b08d5c" leading="1" autoSize="ellipsis" text="摘星道具摘星道具摘星道具摘星道 具摘星道具摘星道具摘星道具"/>
+    <text id="n5_v5no" name="txtTotalNum" xy="114,314" size="206,41" group="n11_v5no" font="ui://eg2y0ldpa0cftkx" fontSize="28" color="#a3783b" align="center" leading="1" autoSize="shrink" text="已拥有：1940"/>
+    <text id="n3_v5no" name="txtName" xy="413,118" size="404,54" group="n11_v5no" font="ui://eg2y0ldpa0cftkx" fontSize="40" color="#8d6f45" vAlign="middle" leading="1" autoClearText="true" text="稀有升星稀星稀星稀星"/>
+    <loader id="n7_v5no" name="loaIcon" xy="209,204" pivot="0.5,0.5" anchor="true" size="164,164" group="n11_v5no" aspect="true" autoSize="true"/>
+    <image id="n18_v5no" name="n18" src="v5notm4" fileName="images/lm_zsx0.png" xy="511,408" pivot="0.5,0" anchor="true" group="n21_v5no"/>
+    <text id="n19_v5no" name="n19" xy="400,407" size="206,44" group="n21_v5no" font="ui://eg2y0ldpa0cftkx" fontSize="32" color="#b69566" align="center" leading="1" autoSize="none" text="自选道具"/>
+    <list id="n20_v5no" name="list" xy="497,603" pivot="0.5,0.5" anchor="true" size="765,261" group="n21_v5no" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="37" defaultItem="ui://2bsz6nelv5notmb" align="center">
       <item/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n21_v5no" name="n21" xy="43,422" size="875,313"/>
-    <image id="n22_v5no" name="n22" src="v5notm3" fileName="images/lm_zhuangshixian_duan.png" xy="73,766" group="n27_v5no"/>
-    <text id="n24_v5no" name="txtSelRewardStr" xy="357,783" size="247,44" group="n27_v5no" fontSize="28" color="#915e15" align="center" leading="1" autoSize="none" text="已选奖励：0/8"/>
-    <component id="n30_cu9w" name="btnSub" src="cu9wtme" fileName="components/BtnSub.xml" xy="348,845" group="n27_v5no"/>
-    <group id="n27_v5no" name="n27" xy="73,766" size="816,161"/>
+    <group id="n21_v5no" name="n21" xy="115,407" size="765,327"/>
+    <graph id="n37_m5qx" name="holderRightDowm" xy="900,892" size="69,35" group="n27_v5no"/>
+    <image id="n22_v5no" name="n22" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="88,750" group="n27_v5no"/>
+    <text id="n24_v5no" name="txtSelRewardStr" xy="372,767" size="247,44" group="n27_v5no" font="ui://eg2y0ldpa0cftky" fontSize="32" color="#b58744" align="center" leading="1" autoSize="none" text="已选奖励：0/8"/>
+    <component id="n30_cu9w" name="btnSub" src="cu9wtme" fileName="components/BtnSub.xml" xy="305,827" group="n27_v5no" pkg="eg2y0ldp"/>
+    <group id="n27_v5no" name="n27" xy="88,750" size="881,177"/>
   </displayList>
 </component>

FGUIProject/assets/Bag/components/BtnSub.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="265,82" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_cu9w" name="n0" src="v5notlz" fileName="images/lm_an__xuanzhong_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_cu9w" name="title" xy="0,0" size="265,82" font="ui://eg2y0ldpa0cftkz" fontSize="32" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Bag/components/ListSelectorItem.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="172,241" overflow="hidden">
+<component size="172,255" overflow="hidden">
   <displayList>
-    <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="23,189"/>
-    <text id="n21_l6ko" name="txtSelNum" xy="56,184" size="60,53" fontSize="39" color="#915e15" align="center" vAlign="middle" autoSize="shrink" text="100" input="true" maxLength="3" keyboardType="4"/>
-    <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="-1,188"/>
-    <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="121,189"/>
-    <image id="n0_v5no" name="n0" src="v5notm7" fileName="images/wpk_db_1_da.png" xy="0,1" group="n20_yjmk"/>
-    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="100,88" group="n20_yjmk" fill="scale"/>
-    <image id="n18_qqhz" name="n18" src="v5notm8" fileName="images/wpk_sz_db_1.png" xy="8,120" size="155,45" group="n20_yjmk"/>
-    <text id="n19_qqhz" name="txtNum" xy="58,122" size="54,42" group="n20_yjmk" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
-    <group id="n20_yjmk" name="n20" xy="0,1" size="172,172"/>
+    <image id="n2_v5no" name="n2" src="v5notmc" fileName="images/db_jiajian_1.png" xy="24,203"/>
+    <text id="n21_l6ko" name="txtSelNum" xy="57,200" size="60,53" font="ui://eg2y0ldpa0cftkx" fontSize="39" color="#915e15" align="center" vAlign="middle" autoSize="shrink" text="100" input="true" maxLength="3" keyboardType="4"/>
+    <component id="n15_cu9w" name="btnReduce" src="cu9wtmf" fileName="components/BtnReduce.xml" xy="0,202"/>
+    <component id="n16_cu9w" name="btnAdd" src="cu9wtmg" fileName="components/BtnAdd.xml" xy="122,203"/>
+    <image id="n0_v5no" name="n0" src="m5qxtmy" fileName="images/wpk_db.png" xy="0,1" group="n20_yjmk"/>
+    <loader id="n11_v5no" name="loaIcon" xy="87,84" pivot="0.5,0.5" anchor="true" size="120,120" group="n20_yjmk" fill="scale"/>
+    <image id="n18_qqhz" name="n18" src="m5qxtmz" fileName="images/wpk_sz_db.png" xy="80,119" size="85,39" group="n20_yjmk"/>
+    <text id="n19_qqhz" name="txtNum" xy="96,116" pivot="0.5,0.5" size="57,44" group="n20_yjmk" font="ui://eg2y0ldpa0cftkx" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="120"/>
+    <group id="n20_yjmk" name="n20" xy="0,1" size="173,173"/>
   </displayList>
 </component>

FGUIProject/assets/Bag/package.xml

@@ -10,18 +10,11 @@
     <image id="v5notlw" name="an_jia.png" path="/images/"/>
     <image id="v5notlx" name="an_jian.png" path="/images/"/>
     <image id="v5notly" name="back.png" path="/images/"/>
-    <image id="v5notlz" name="lm_an__xuanzhong_1.png" path="/images/"/>
-    <image id="v5notm0" name="lm_db_3.png" path="/images/"/>
-    <image id="v5notm3" name="lm_zhuangshixian_duan.png" path="/images/"/>
     <image id="v5notm4" name="lm_zsx0.png" path="/images/"/>
-    <image id="v5notm5" name="tanchuang_2.png" path="/images/"/>
     <image id="v5notm6" name="tc_wp_zz.png" path="/images/"/>
-    <image id="v5notm7" name="wpk_db_1_da.png" path="/images/"/>
-    <image id="v5notm8" name="wpk_sz_db_1.png" path="/images/"/>
     <image id="v5notm9" name="wplb_db.png" path="/images/"/>
     <component id="v5notmb" name="ListSelectorItem.xml" path="/components/" exported="true"/>
     <image id="v5notmc" name="db_jiajian_1.png" path="/images/"/>
-    <component id="cu9wtme" name="BtnSub.xml" path="/components/" exported="true"/>
     <component id="cu9wtmf" name="BtnReduce.xml" path="/components/" exported="true"/>
     <component id="cu9wtmg" name="BtnAdd.xml" path="/components/" exported="true"/>
     <component id="cu9wtmj" name="BtnCancel.xml" path="/components/" exported="true"/>
@@ -38,6 +31,9 @@
     <component id="m9eitmv" name="Button1.xml" path="/components/"/>
     <image id="m9eitmw" name="tc_anniu_qx.png" path="/imgnew/"/>
     <image id="m9eitmx" name="tc_anniu_qd.png" path="/imgnew/"/>
+    <image id="m5qxtmy" name="wpk_db.png" path="/images/"/>
+    <image id="m5qxtmz" name="wpk_sz_db.png" path="/images/"/>
+    <image id="m5qxtn2" name="ty_tc_m.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/Button18.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="228,74" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n2_m5qx" name="n2" src="m5qxton" fileName="imgnew/an_s_white.png" xy="0,0"/>
+    <image id="n3_m5qx" name="n3" src="m5qxtom" fileName="imgnew/an_s_yellow.png" xy="0,0"/>
+    <text id="n6_m5qx" name="title" xy="0,0" size="228,74" font="ui://eg2y0ldpa0cftkw" fontSize="32" color="#8f6129" align="center" vAlign="middle" autoSize="none" text="天">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/Button19.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="386,82" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="ColorType" alias="ColorType" exported="true" pages="0,,1," selected="1">
+    <remark page="0" value="金黄色"/>
+    <remark page="1" value="白金色"/>
+  </controller>
+  <displayList>
+    <loader id="n2_m5qx" name="n2" xy="0,0" size="386,82" url="ui://eg2y0ldpm5qxtos" autoSize="true">
+      <gearIcon controller="ColorType" pages="0,1" values="ui://eg2y0ldpm5qxtn4|ui://eg2y0ldpm5qxtos"/>
+    </loader>
+    <text id="n1_cu9w" name="title" xy="0,0" size="386,82" font="ui://eg2y0ldpa0cftkz" fontSize="40" color="#ac6f41" align="center" vAlign="middle" autoSize="none" singleLine="true" text="使用">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/package.xml

@@ -378,6 +378,17 @@
     <image id="ozultoh" name="sc_yk_zz.png" path="/imagesNew/"/>
     <image id="ozultoi" name="sc_yk_jsdb.png" path="/imagesNew/"/>
     <image id="m9eitok" name="jinghua2.png" path="/imgItemIcon/" exported="true"/>
+    <image id="m5qxtol" name="ty_tc_s.png" path="/imagesNew/" exported="true"/>
+    <image id="m5qxtom" name="an_s_yellow.png" path="/imgnew/"/>
+    <image id="m5qxton" name="an_s_white.png" path="/imgnew/"/>
+    <component id="m5qxtoo" name="Button18.xml" path="/components/" exported="true"/>
+    <image id="m5qxtn4" name="an_m_yellow.png" path="/imagesNew/"/>
+    <component id="cu9wtme" name="Button19.xml" path="/components/" exported="true"/>
+    <image id="m5qxtop" name="ty_tc_l.png" path="/imagesNew/" exported="true"/>
+    <image id="m5qxtoq" name="dx_db.png" path="/imagesNew/" exported="true"/>
+    <image id="m5qxs" name="ty_tc_l_db.png" path="/imagesNew/" exported="true"/>
+    <image id="jx6zpm" name="lm_touxiangdb.png" path="/imagesNew/" exported="true"/>
+    <image id="m5qxtos" name="an_m_white.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Mail/MailUI.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1225">
+<component size="1026,1376">
   <displayList>
-    <component id="n0_ehs9" name="bg" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,93" size="962,1130"/>
-    <image id="n1_ehs9" name="n1" src="ehs93" fileName="images/yx_btzs.png" pkg="eg2y0ldp" xy="20,0"/>
-    <image id="n2_ehs9" name="n2" src="ehs92" fileName="images/yx_btzi_1.png" xy="3,-26"/>
-    <list id="n7_ehs9" name="list" xy="46,164" size="874,859" overflow="scroll" lineGap="27" defaultItem="ui://y44a413eehs9d">
+    <image id="n0_ehs9" name="bg" src="m5qxtop" fileName="imagesNew/ty_tc_l.png" pkg="eg2y0ldp" xy="0,0"/>
+    <image id="n18_m5qx" name="n18" src="m5qxs" fileName="imagesNew/ty_tc_l_db.png" pkg="eg2y0ldp" xy="32,191"/>
+    <graph id="n20_m5qx" name="holderLeftTop" xy="160,115" size="69,35"/>
+    <graph id="n21_m5qx" name="holderRightDowm" xy="894,1299" size="69,35"/>
+    <image id="n15_m5qx" name="n15" src="m5qxr" fileName="images/xgnc_btkuang.png" xy="320,59" group="n17_m5qx"/>
+    <text id="n16_m5qx" name="n16" xy="507,95" pivot="0.5,0.5" anchor="true" size="160,51" group="n17_m5qx" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#a98151" letterSpacing="2" text="系统邮箱"/>
+    <group id="n17_m5qx" name="n17" xy="320,59" size="386,71"/>
+    <list id="n7_ehs9" name="list" xy="44,229" size="902,900" overflow="scroll" lineGap="17" defaultItem="ui://y44a413eehs9d">
       <item/>
       <item/>
       <item/>
@@ -12,15 +16,15 @@
       <item/>
       <item/>
     </list>
-    <text id="n10_kxic" name="txtTips" xy="401,559" size="164,54" fontSize="40" color="#736b64" text="暂无邮件"/>
-    <text id="n11_j8b3" name="txtCount" xy="930,113" pivot="1,0" anchor="true" size="243,36" fontSize="26" color="#b19977" ubb="true" text="当前邮件：100/300">
+    <text id="n10_kxic" name="txtTips" xy="513,586" pivot="0.5,0.5" anchor="true" size="164,54" fontSize="40" color="#736b64" align="center" vAlign="middle" text="暂无邮件"/>
+    <text id="n11_j8b3" name="txtCount" xy="931,143" pivot="1,0" anchor="true" size="281,44" font="ui://eg2y0ldpa0cftkx" fontSize="32" color="#b08d5c" ubb="true" text="当前邮件：100/300">
       <relation target="" sidePair="right-right"/>
     </text>
-    <text id="n12_j8b3" name="txtMaxCount" xy="246,1170" pivot="0.5,0" size="473,41" fontSize="30" color="#c1aa8f" text="最高可储存300封邮箱，请及时查看"/>
-    <component id="n9_ehs9" name="btnDelete" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="88,1059">
+    <text id="n12_j8b3" name="txtMaxCount" xy="256,1281" pivot="0.5,0" size="442,39" font="ui://eg2y0ldpa0cftkx" fontSize="28" color="#c6a980" text="最高可储存300封邮箱，请及时查看"/>
+    <component id="n9_ehs9" name="btnDelete" src="cu9wtme" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="76,1166" controller="ColorType,1">
       <Button title="一键删除"/>
     </component>
-    <component id="n8_ehs9" name="btnGet" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="530,1059">
+    <component id="n8_ehs9" name="btnGet" src="cu9wtme" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="528,1165">
       <Button title="一键领取"/>
     </component>
   </displayList>

FGUIProject/assets/Mail/components/Button1.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="186,74" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
-  <displayList>
-    <image id="n0_ehs9" src="ehs91" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
-    </image>
-  </displayList>
-</component>

FGUIProject/assets/Mail/components/ListItem.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="874,152">
-  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+<component size="901,148">
+  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
-    <image id="n7_ehs9" name="bg" src="ehs94" fileName="images/yx_dik_1.png" xy="0,0"/>
-    <loader id="n4_ehs9" name="loaIcon" xy="35,32" size="84,84" url="ui://y44a413eehs95" autoSize="true">
-      <gearIcon controller="c1" pages="1,2,3" values="ui://y44a413eehs96|ui://y44a413eehs97|ui://y44a413eehs90" default="ui://y44a413eehs95"/>
+    <image id="n7_ehs9" name="bg" src="m5qxtoq" fileName="imagesNew/dx_db.png" pkg="eg2y0ldp" xy="0,0"/>
+    <image id="n10_m5qx" name="n10" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" pkg="eg2y0ldp" xy="76,10" size="291,283" scale="0.46,0.46"/>
+    <loader id="n4_ehs9" name="loaIcon" xy="142,76" pivot="0.5,0.5" anchor="true" size="84,84" url="ui://y44a413eehs90" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2,3" values="ui://y44a413em5qxv|ui://y44a413eehs96|ui://y44a413eehs97|ui://y44a413eehs90"/>
     </loader>
-    <text id="n5_ehs9" name="txtTitle" xy="184,18" size="423,52" fontSize="38" color="#9b7853" autoSize="none" autoClearText="true" text="请稍后..."/>
-    <text id="n6_ehs9" name="txtTime" xy="184,95" size="189,39" fontSize="28" color="#c19f7b" autoClearText="true" text="剩余时间：5天"/>
-    <component id="n8_ehs9" name="btnLook" src="ehs9e" fileName="components/Button1.xml" xy="669,41"/>
+    <text id="n5_ehs9" name="txtTitle" xy="215,26" size="423,52" font="ui://eg2y0ldpa0cftkx" fontSize="32" color="#9b7853" vAlign="middle" autoSize="none" autoClearText="true" text="请稍后..."/>
+    <text id="n6_ehs9" name="txtTime" xy="215,80" size="187,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#c19f7b" autoClearText="true" text="剩余时间：5天"/>
+    <component id="n8_ehs9" name="btnLook" src="m5qxtoo" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="635,37">
+      <Button title="前往"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Mail/package.xml

@@ -2,9 +2,6 @@
 <packageDescription id="y44a413e">
   <resources>
     <image id="ehs90" name="yx_icon_4.png" path="/images/"/>
-    <image id="ehs91" name="yx_anniu_1.png" path="/images/"/>
-    <image id="ehs92" name="yx_btzi_1.png" path="/images/"/>
-    <image id="ehs94" name="yx_dik_1.png" path="/images/"/>
     <image id="ehs95" name="yx_icon_1.png" path="/images/"/>
     <image id="ehs96" name="yx_icon_2.png" path="/images/"/>
     <image id="ehs97" name="yx_icon_3.png" path="/images/"/>
@@ -12,7 +9,6 @@
     <image id="ehs9b" name="kp_sjsj_di_4.png" path="/images/"/>
     <component id="ehs9c" name="MailUI.xml" path="/" exported="true"/>
     <component id="ehs9d" name="ListItem.xml" path="/components/"/>
-    <component id="ehs9e" name="Button1.xml" path="/components/"/>
     <component id="ehs9f" name="MailContentUI.xml" path="/" exported="true"/>
     <component id="ehs9g" name="ComContent.xml" path="/components/"/>
     <image id="kxick" name="ts_canghaiym.png" path="/images/"/>
@@ -21,6 +17,8 @@
     <component id="oq7rn" name="ListRewardItem.xml" path="/components/"/>
     <image id="oq7ro" name="yx_btzs.png" path="/images/"/>
     <image id="oq7rp" name="yx_xiant_1.png" path="/images/"/>
+    <image id="m5qxr" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
+    <image id="m5qxv" name="tb_youjian.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Mail" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightFailUI.xml

@@ -13,7 +13,7 @@
     </list>
     <image id="n7_jx6z" name="n7" src="jx6zpl" fileName="imagesNew/duihuakuang_db.png" xy="431,180"/>
     <text id="n9_jx6z" name="n9" xy="485,207" size="425,150" fontSize="32" color="#a88656" autoSize="none" text="通关失败别灰心！试试以下途径提升自己~"/>
-    <image id="n5_jx6z" name="n5" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" xy="156,142" size="262,254" group="n8_jx6z" aspect="true"/>
+    <image id="n5_jx6z" name="n5" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" xy="156,142" size="262,254" group="n8_jx6z" aspect="true" pkg="eg2y0ldp"/>
     <image id="n6_jx6z" name="n6" src="jx6zpn" fileName="imagesNew/shengqi.png" xy="200,166" group="n8_jx6z"/>
     <group id="n8_jx6z" name="n8" xy="156,142" size="262,254"/>
     <image id="n10_ebfi" name="n10" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="112,393" size="846,10"/>

FGUIProject/assets/Main/package.xml

@@ -629,7 +629,6 @@
     <component id="jx6zpe" name="StoryFightFailUI.xml" path="/" exported="true"/>
     <component id="jx6zpf" name="ListFailItem.xml" path="/components/"/>
     <image id="jx6zpl" name="duihuakuang_db.png" path="/imagesNew/"/>
-    <image id="jx6zpm" name="lm_touxiangdb.png" path="/imagesNew/"/>
     <image id="jx6zpn" name="shengqi.png" path="/imagesNew/"/>
     <image id="jx6zpo" name="tc_xuanxiangkuang_1.png" path="/imagesNew/"/>
     <image id="jx6zpp" name="yf_db_1.png" path="/imagesNew/"/>

FGUIProject/assets/Notice/NoticeSystemShowUI.xml

@@ -6,10 +6,10 @@
     </loader>
     <component id="n12_kjq3" name="btnBack" src="kjq3p" fileName="components/Button3.xml" xy="99,364" group="n23_kjq3"/>
     <image id="n16_kjq3" name="n16" src="kjq3d" fileName="images/gg_gg_btbt_1.png" xy="280,350" group="n28_kjq3"/>
-    <text id="n17_kjq3" name="txtTitle" xy="344,354" pivot="0.5,0" size="390,74" group="n28_kjq3" fontSize="56" color="#8f6e30" text="活动标题活动标"/>
+    <text id="n17_kjq3" name="txtTitle" xy="341,354" pivot="0.5,0" size="396,74" group="n28_kjq3" fontSize="56" color="#8f6e30" text="活动标题活动标"/>
     <group id="n28_kjq3" name="n28" xy="280,350" size="519,85" group="n23_kjq3"/>
-    <component id="n27_kjq3" name="ComContent" src="kjq3u" fileName="components/ComContent.xml" xy="95,455" group="n23_kjq3"/>
-    <loader id="n30_fz8v" name="n30" xy="95,1426" size="890,192" group="n23_kjq3">
+    <component id="n27_kjq3" name="ComContent" src="kjq3u" fileName="components/ComContent.xml" xy="95,474" size="890,1034" group="n23_kjq3"/>
+    <loader id="n30_fz8v" name="n30" xy="95,1509" size="890,192" group="n23_kjq3">
       <relation target="n27_kjq3" sidePair="top-bottom"/>
     </loader>
     <group id="n23_kjq3" name="n23" xy="0,0" size="1080,1920" advanced="true">

FGUIProject/assets/Notice/NoticeUI.xml

@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1062,1300">
+<component size="1026,1376">
   <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
-    <image id="n0_kjq3" name="n0" src="kjq36" fileName="images/gg_gg_dtpian.png" xy="0,-67"/>
-    <list id="n1_kjq3" name="listActivity" xy="72,53" size="927,1074" overflow="scroll" defaultItem="ui://d8t5ezjbkjq3l" align="center">
+    <image id="n0_kjq3" name="n0" src="m5qxtop" fileName="imagesNew/ty_tc_l.png" pkg="eg2y0ldp" xy="0,0"/>
+    <image id="n10_m5qx" name="n10" src="m5qxs" fileName="imagesNew/ty_tc_l_db.png" pkg="eg2y0ldp" xy="33,190"/>
+    <graph id="n11_m5qx" name="holderLeftTop" xy="160,115" size="69,35"/>
+    <graph id="n12_m5qx" name="holderRightDowm" xy="894,1299" size="69,35"/>
+    <image id="n7_m5qx" name="titleButtonBg" src="m5qxv" fileName="images/tc_yq_db.png" xy="233,72" group="n8_m5qx"/>
+    <component id="n3_kjq3" name="btnActivity" src="kjq3j" fileName="components/Button1.xml" xy="257,76" group="n8_m5qx">
+      <gearColor controller="c1" pages="1" values="#ffffff" default="#ad8547"/>
+      <Button title="活动公告" titleColor="#ffffff" selectedTitle="活动公告" selectedIcon="ui://d8t5ezjbm5qxw" controller="c1" page="0"/>
+    </component>
+    <component id="n4_kjq3" name="btnNotice" src="kjq3j" fileName="components/Button1.xml" xy="478,78" group="n8_m5qx">
+      <gearColor controller="c1" pages="0" values="#ffffff" default="#ad8547"/>
+      <Button checked="true" title="系统公告" titleColor="#ad8547" selectedTitle="系统公告" selectedIcon="ui://d8t5ezjbm5qxw" controller="c1" page="1"/>
+    </component>
+    <group id="n8_m5qx" name="buttonCom" xy="233,72" size="516,78" advanced="true"/>
+    <list id="n1_kjq3" name="listActivity" xy="44,220" size="927,1013" overflow="scroll" defaultItem="ui://d8t5ezjbkjq3l" align="center">
       <gearDisplay controller="c1" pages="0"/>
       <item/>
       <item/>
@@ -12,7 +25,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n2_kjq3" name="listNotice" xy="72,53" size="927,1075" overflow="scroll" lineGap="3" defaultItem="ui://d8t5ezjbkjq3m">
+    <list id="n2_kjq3" name="listNotice" xy="44,227" size="911,1003" overflow="scroll" lineGap="23" defaultItem="ui://d8t5ezjbkjq3m">
       <gearDisplay controller="c1" pages="1"/>
       <item/>
       <item/>
@@ -21,14 +34,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n3_kjq3" name="btnActivity" src="kjq3j" fileName="components/Button1.xml" xy="154,1197" group="n5_kjq3">
-      <Button icon="ui://d8t5ezjbkjq35" selectedIcon="ui://d8t5ezjbkjq32" controller="c1" page="0"/>
-    </component>
-    <component id="n4_kjq3" name="btnNotice" src="kjq3j" fileName="components/Button1.xml" xy="548,1197" group="n5_kjq3">
-      <Button checked="true" icon="ui://d8t5ezjbkjq33" selectedIcon="ui://d8t5ezjbkjq34" controller="c1" page="1"/>
-    </component>
-    <group id="n5_kjq3" name="n5" xy="154,1197" size="735,108" advanced="true" layout="hz" colGap="53" excludeInvisibles="true"/>
-    <text id="n6_hmrw" name="txtTips" xy="408,500" size="244,54" fontSize="40" color="#736b64" align="center" text="暂无系统公告">
+    <text id="n6_hmrw" name="txtTips" xy="513,527" pivot="0.5,0.5" anchor="true" size="244,54" fontSize="40" color="#736b64" align="center" text="暂无系统公告">
       <gearText controller="c1" pages="1" values="暂无系统公告" default="暂无活动公告"/>
     </text>
   </displayList>

FGUIProject/assets/Notice/components/Button1.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="341,108" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+<component size="251,71" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <loader id="n2_kjq3" name="icon" xy="0,0" size="50,50" autoSize="true"/>
+    <text id="n3_m5qx" name="title" xy="0,0" size="251,71" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#ad8547" align="center" vAlign="middle" autoSize="none" text=""/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Notice/components/ListNoticeItem.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="927,184">
+<component size="901,148">
   <displayList>
-    <image id="n10_kjq3" name="n10" src="kjq3g" fileName="images/gg_gg_xtxtk.png" xy="0,26" group="n15_kjq3"/>
-    <text id="n11_kjq3" name="txtTitle" xy="42,75" size="359,59" group="n15_kjq3" fontSize="44" color="#bb996c" autoSize="none" text="确认下个小时前显示的是分钟还是小时"/>
-    <text id="n12_kjq3" name="txtTime" xy="426,80" size="164,49" group="n15_kjq3" fontSize="36" color="#c8aa84" text="2022/8/8"/>
-    <component id="n13_kjq3" name="btnGo" src="kjq3n" fileName="components/Button2.xml" xy="684,67" group="n15_kjq3"/>
-    <group id="n15_kjq3" name="n15" xy="0,26" size="915,157"/>
+    <image id="n10_kjq3" name="n10" src="m5qxtoq" fileName="imagesNew/dx_db.png" pkg="eg2y0ldp" xy="0,0" group="n15_kjq3"/>
+    <text id="n11_kjq3" name="txtTitle" xy="112,26" size="505,49" group="n15_kjq3" font="ui://eg2y0ldpa0cftkx" fontSize="36" color="#ad8547" autoSize="none" text="确认下个小时前显示的是分钟还是小时"/>
+    <text id="n12_kjq3" name="txtTime" xy="112,78" size="114,39" group="n15_kjq3" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#c8aa84" text="2022/8/8"/>
+    <component id="n13_kjq3" name="btnGo" src="m5qxtoo" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="636,37" group="n15_kjq3">
+      <Button title="前往"/>
+    </component>
+    <group id="n15_kjq3" name="n15" xy="0,0" size="901,148"/>
   </displayList>
 </component>

FGUIProject/assets/Notice/package.xml

@@ -29,6 +29,8 @@
     <component id="kjq3s" name="Button5.xml" path="/components/"/>
     <component id="kjq3t" name="NoticeSystemShowUI.xml" path="/" exported="true"/>
     <component id="kjq3u" name="ComContent.xml" path="/components/"/>
+    <image id="m5qxv" name="tc_yq_db.png" path="/images/"/>
+    <image id="m5qxw" name="tc_yq_xz_yellow.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Notice" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/ChangeNameUI.xml

@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="960,665" bgColor="#000000">
+<component size="1026,654" bgColor="#000000">
   <displayList>
-    <image id="n4_xt5s" name="bg" src="r9riw" fileName="images/xgnc_dik_1.png" xy="0,0"/>
-    <image id="n11_hpgr" name="n11" src="r9riv" fileName="images/xgnc_btkuang.png" xy="282,83"/>
-    <text id="n12_r9ri" name="n12" xy="387,87" size="186,62" fontSize="46" color="#a98151" text="修改昵称"/>
-    <image id="n13_r9ri" name="n13" src="r9rix" fileName="images/xgnc_dik_2.png" xy="200,238"/>
-    <text id="n10_xt5s" name="inputName" xy="217,248" size="526,56" fontSize="38" color="#ac8450" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
-    <component id="n5_xt5s" name="btnSure" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="338,490">
-      <Button title="确定" titleColor="#ffffff" titleFontSize="42"/>
+    <image id="n4_xt5s" name="bg" src="m5qxtol" fileName="imagesNew/ty_tc_s.png" pkg="eg2y0ldp" xy="0,0"/>
+    <graph id="n21_m5qx" name="holderLeftTop" xy="160,115" size="69,35"/>
+    <graph id="n20_m5qx" name="holderRightDowm" xy="900,577" size="69,35"/>
+    <image id="n11_hpgr" name="n11" src="r9riv" fileName="images/xgnc_btkuang.png" xy="305,54"/>
+    <image id="n13_r9ri" name="n13" src="m5qxgm" fileName="images/sr_dk.png" xy="143,175"/>
+    <text id="n12_r9ri" name="n12" xy="405,57" size="186,61" fontSize="46" color="#a98151" text="修改昵称"/>
+    <text id="n10_xt5s" name="inputName" xy="182,174" size="526,56" fontSize="38" color="#d0ba9a" autoSize="none" text="" input="true" prompt="[color=#C3B4A6]请输入新角色名称[/color]" maxLength="7"/>
+    <component id="n5_xt5s" name="btnSure" src="m5qxtoo" fileName="components/Button18.xml" pkg="eg2y0ldp" xy="379,515">
+      <Button title="确定" titleFontSize="42"/>
     </component>
-    <text id="n15_r9ri" name="txtNeed" xy="336,422" size="208,44" group="n17_v95q" fontSize="32" color="#b99f7b" text="改名消耗：0/1"/>
-    <loader id="n16_r9ri" name="loaIcon" xy="563,411" size="60,60" group="n17_v95q" url="ui://eg2y0ldpkztethq" autoSize="true"/>
-    <group id="n17_v95q" name="n17" xy="336,411" size="287,60" advanced="true" layout="hz" colGap="13" excludeInvisibles="true">
+    <text id="n15_r9ri" name="txtNeed" xy="387,407" size="210,44" group="n17_v95q" fontSize="32" color="#b08d5c" text="改名消耗：0/1"/>
+    <loader id="n16_r9ri" name="loaIcon" xy="614,396" size="60,60" group="n17_v95q" url="ui://eg2y0ldpkztethq" autoSize="true"/>
+    <group id="n17_v95q" name="n17" xy="387,396" size="287,60" advanced="true" layout="hz" colGap="13" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
+    <image id="n19_m5qx" name="n19" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="91,470"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/SettingUI.xml

@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="960,665">
+<component size="1026,654">
   <displayList>
-    <loader id="n0_r9ri" name="bg" xy="0,0" size="960,665" touchable="false" url="ui://374k3dwvr9riw" autoSize="true"/>
-    <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="309,83" size="342,68" group="n16_oqa1"/>
-    <text id="n15_oqa1" name="n15" xy="432,87" size="95,61" group="n16_oqa1" fontSize="46" color="#a98151" text="设置"/>
-    <group id="n16_oqa1" name="n16" xy="309,83" size="342,68"/>
-    <component id="n9_r9ri" name="btnLogout" src="r9ritjh" fileName="components/Button18.xml" pkg="mk0fwx0x" xy="511,488" aspect="true">
+    <image id="n0_r9ri" name="bg" src="m5qxtol" fileName="imagesNew/ty_tc_s.png" pkg="eg2y0ldp" xy="0,0"/>
+    <graph id="n19_m5qx" name="holderLeftTop" xy="160,115" size="69,35"/>
+    <graph id="n20_m5qx" name="holderRightDowm" xy="900,577" size="69,35"/>
+    <image id="n14_oqa1" name="n14" src="r9riv" fileName="images/xgnc_btkuang.png" xy="304,53" group="n16_oqa1"/>
+    <text id="n15_oqa1" name="n15" xy="452,62" size="79,52" group="n16_oqa1" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#a98151" text="设置"/>
+    <group id="n16_oqa1" name="n16" xy="304,53" size="386,71"/>
+    <component id="n9_r9ri" name="btnLogout" src="cu9wtme" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="508,497" aspect="true" controller="ColorType,1">
       <Button title="注销账户"/>
     </component>
-    <component id="n13_oqa1" name="btnExit" src="oqa1tjt" fileName="components/Button21.xml" pkg="mk0fwx0x" xy="112,488" aspect="true">
+    <component id="n13_oqa1" name="btnExit" src="cu9wtme" fileName="components/Button19.xml" pkg="eg2y0ldp" xy="91,497" aspect="true">
       <Button title="返回登录"/>
     </component>
-    <text id="n6_r9ri" name="n6" xy="144,273" size="87,56" group="n12_r9ri" fontSize="42" color="#c58c88" text="音乐"/>
-    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="258,276" group="n12_r9ri">
+    <text id="n6_r9ri" name="n6" xy="185,242" size="79,52" group="n12_r9ri" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#ac6f41" text="音乐"/>
+    <component id="n8_r9ri" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="274,238" group="n12_r9ri">
       <Button checked="true"/>
     </component>
-    <group id="n12_r9ri" name="n12" xy="144,273" size="244,61"/>
-    <text id="n5_r9ri" name="n5" xy="572,272" size="87,56" group="n11_r9ri" fontSize="42" color="#c58c88" text="音效"/>
-    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="685,273" group="n11_r9ri">
+    <group id="n12_r9ri" name="n12" xy="185,238" size="219,58"/>
+    <text id="n5_r9ri" name="n5" xy="586,242" size="79,52" group="n11_r9ri" font="ui://eg2y0ldpa0cftkx" fontSize="38" color="#ac6f41" text="音效"/>
+    <component id="n7_r9ri" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="673,237" group="n11_r9ri">
       <Button checked="true"/>
     </component>
-    <group id="n11_r9ri" name="n11" xy="572,272" size="243,59"/>
+    <group id="n11_r9ri" name="n11" xy="586,237" size="217,58"/>
+    <image id="n18_m5qx" name="n18" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="91,471"/>
   </displayList>
 </component>

FGUIProject/assets/RoleInfo/components/ButtonToggle.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="130,58" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="1"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_d4iw" name="n0" src="d4iw6i" fileName="images/grxx_yx_dk.png" xy="0,0">
+    <image id="n0_d4iw" name="n0" src="m5qxgq" fileName="images/an_kg_close.png" xy="0,0" pivot="0.5,0.5" rotation="180">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_d4iw" name="n1" src="d4iw6j" fileName="images/grxx_yx_gb.png" xy="0,0">
+    <image id="n1_d4iw" name="n1" src="m5qxgp" fileName="images/an_kg_open.png" xy="65,29" pivot="0.5,0.5" anchor="true">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

FGUIProject/assets/RoleInfo/package.xml

@@ -39,7 +39,6 @@
     <image id="r9rit" name="jnsm_3.png" path="/images/" exported="true"/>
     <image id="r9riu" name="xgnc_sjsjan.png" path="/images/"/>
     <image id="r9riv" name="xgnc_btkuang.png" path="/images/" scale="9grid" scale9grid="99,17,198,34"/>
-    <image id="r9riw" name="xgnc_dik_1.png" path="/images/"/>
     <image id="r9rix" name="xgnc_dik_2.png" path="/images/"/>
     <image id="r9riy" name="xgxx_zytjtb.png" path="/images/"/>
     <image id="r9riz" name="grxx_bjbj.png" path="/images/"/>
@@ -77,6 +76,9 @@
     <image id="volsgh" name="grxc_db.png" path="/images/"/>
     <image id="volsgi" name="tb_jiahao.png" path="/images/"/>
     <image id="volsgj" name="lm_dt_zsx2.png" path="/componentsBg/"/>
+    <image id="m5qxgm" name="sr_dk.png" path="/images/"/>
+    <image id="m5qxgp" name="an_kg_open.png" path="/images/"/>
+    <image id="m5qxgq" name="an_kg_close.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -122,7 +122,7 @@ namespace GFGGame
                     return ConstBonusStatus.GOT;
                 }
 
-                if (GameGlobal.myNumericComponent.GetAsLong(ET.NumericType.RechargeTotal) > 0)
+                if (GameGlobal.myNumericComponent.GetAsLong(ET.NumericType.FirstRechargeTotal) > 0)
                 {
                     return ConstBonusStatus.CAN_GET;
                 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_GiftBoxSelectorUI.cs

@@ -7,12 +7,14 @@ namespace UI.Bag
     public partial class UI_GiftBoxSelectorUI
     {
         public GComponent target;
+        public GGraph m_holderLeftTop;
         public GButton m_btnCancel;
         public GTextField m_txtItemDes;
         public GTextField m_txtTotalNum;
-        public GLoader m_loaIcon;
         public GTextField m_txtName;
+        public GLoader m_loaIcon;
         public GList m_list;
+        public GGraph m_holderRightDowm;
         public GTextField m_txtSelRewardStr;
         public GButton m_btnSub;
         public const string URL = "ui://2bsz6nelu85qtlv";
@@ -62,23 +64,27 @@ namespace UI.Bag
 
         private void Init(GComponent comp)
         {
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
             m_btnCancel = (GButton)comp.GetChild("btnCancel");
             m_txtItemDes = (GTextField)comp.GetChild("txtItemDes");
             m_txtTotalNum = (GTextField)comp.GetChild("txtTotalNum");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_list = (GList)comp.GetChild("list");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_txtSelRewardStr = (GTextField)comp.GetChild("txtSelRewardStr");
             m_btnSub = (GButton)comp.GetChild("btnSub");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_holderLeftTop = null;
             m_btnCancel = null;
             m_txtItemDes = null;
             m_txtTotalNum = null;
-            m_loaIcon = null;
             m_txtName = null;
+            m_loaIcon = null;
             m_list = null;
+            m_holderRightDowm = null;
             m_txtSelRewardStr = null;
             m_btnSub = null;
             if(disposeTarget && target != null)

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Button19
+    {
+        public GButton target;
+        public Controller m_ColorType;
+        public const string URL = "ui://eg2y0ldpcu9wtme";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button19";
+        private static UI_Button19 _proxy;
+
+        public static UI_Button19 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button19();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button19 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button19();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_ColorType = comp.GetController("ColorType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_ColorType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button19.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Mail/UI_MailUI.cs

@@ -7,7 +7,9 @@ namespace UI.Mail
     public partial class UI_MailUI
     {
         public GComponent target;
-        public GComponent m_bg;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public GList m_list;
         public GTextField m_txtTips;
         public GTextField m_txtCount;
@@ -61,7 +63,9 @@ namespace UI.Mail
 
         private void Init(GComponent comp)
         {
-            m_bg = (GComponent)comp.GetChild("bg");
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_list = (GList)comp.GetChild("list");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
@@ -72,6 +76,8 @@ namespace UI.Mail
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
             m_list = null;
             m_txtTips = null;
             m_txtCount = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeUI.cs

@@ -8,10 +8,14 @@ namespace UI.Notice
     {
         public GComponent target;
         public Controller m_c1;
-        public GList m_listActivity;
-        public GList m_listNotice;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
+        public GImage m_titleButtonBg;
         public GButton m_btnActivity;
         public GButton m_btnNotice;
+        public GGroup m_buttonCom;
+        public GList m_listActivity;
+        public GList m_listNotice;
         public GTextField m_txtTips;
         public const string URL = "ui://d8t5ezjbkjq3i";
         public const string PACKAGE_NAME = "Notice";
@@ -61,19 +65,27 @@ namespace UI.Notice
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_listActivity = (GList)comp.GetChild("listActivity");
-            m_listNotice = (GList)comp.GetChild("listNotice");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
+            m_titleButtonBg = (GImage)comp.GetChild("titleButtonBg");
             m_btnActivity = (GButton)comp.GetChild("btnActivity");
             m_btnNotice = (GButton)comp.GetChild("btnNotice");
+            m_buttonCom = (GGroup)comp.GetChild("buttonCom");
+            m_listActivity = (GList)comp.GetChild("listActivity");
+            m_listNotice = (GList)comp.GetChild("listNotice");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_listActivity = null;
-            m_listNotice = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
+            m_titleButtonBg = null;
             m_btnActivity = null;
             m_btnNotice = null;
+            m_buttonCom = null;
+            m_listActivity = null;
+            m_listNotice = null;
             m_txtTips = null;
             if(disposeTarget && target != null)
             {

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

@@ -8,6 +8,8 @@ namespace UI.RoleInfo
     {
         public GComponent target;
         public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public GTextInput m_inputName;
         public GButton m_btnSure;
         public GTextField m_txtNeed;
@@ -60,6 +62,8 @@ namespace UI.RoleInfo
         private void Init(GComponent comp)
         {
             m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_inputName = (GTextInput)comp.GetChild("inputName");
             m_btnSure = (GButton)comp.GetChild("btnSure");
             m_txtNeed = (GTextField)comp.GetChild("txtNeed");
@@ -68,6 +72,8 @@ namespace UI.RoleInfo
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
             m_inputName = null;
             m_btnSure = null;
             m_txtNeed = null;

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

@@ -7,7 +7,9 @@ namespace UI.RoleInfo
     public partial class UI_SettingUI
     {
         public GComponent target;
-        public GLoader m_bg;
+        public GImage m_bg;
+        public GGraph m_holderLeftTop;
+        public GGraph m_holderRightDowm;
         public GButton m_btnLogout;
         public GButton m_btnExit;
         public GButton m_btnMusic;
@@ -59,7 +61,9 @@ namespace UI.RoleInfo
 
         private void Init(GComponent comp)
         {
-            m_bg = (GLoader)comp.GetChild("bg");
+            m_bg = (GImage)comp.GetChild("bg");
+            m_holderLeftTop = (GGraph)comp.GetChild("holderLeftTop");
+            m_holderRightDowm = (GGraph)comp.GetChild("holderRightDowm");
             m_btnLogout = (GButton)comp.GetChild("btnLogout");
             m_btnExit = (GButton)comp.GetChild("btnExit");
             m_btnMusic = (GButton)comp.GetChild("btnMusic");
@@ -68,6 +72,8 @@ namespace UI.RoleInfo
         public void Dispose(bool disposeTarget = false)
         {
             m_bg = null;
+            m_holderLeftTop = null;
+            m_holderRightDowm = null;
             m_btnLogout = null;
             m_btnExit = null;
             m_btnMusic = null;

GameClient/Assets/Game/HotUpdate/Views/Bag/GiftBoxSelectorView.cs

@@ -17,6 +17,10 @@ namespace GFGGame
         private int _selCount; //选择的数量
         private Dictionary<int, int> _selDic; //选择礼包内的物品<物品id,数量>
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
 
         public override void Dispose()
         {
@@ -76,6 +80,7 @@ namespace GFGGame
             UpdateView();
             UpdateList();
             SetSelAllNum();
+            AddEffect();
         }
 
         protected override void OnHide()
@@ -89,9 +94,25 @@ namespace GFGGame
             _selDic.Clear();
             _selCount = 0;
 
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+
             base.OnHide();
         }
 
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_L_up");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLeftTop, resPath1,
+                out _gameObject1, out _wrapper1);
+
+            //邊框右下角特效
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_R_Down");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRightDowm, resPath2,
+                out _gameObject2, out _wrapper2);
+        }
+
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs

@@ -86,7 +86,7 @@ namespace GFGGame
         private void OnNumericChange(EventContext context)
         {
             var status = (int)context.data;
-            if (status == NumericType.FirstRechargeBonusStatus || status == NumericType.RechargeTotal)
+            if (status == NumericType.FirstRechargeBonusStatus || status == NumericType.FirstRechargeTotal)
             {
                 UpdateView();
             }

GameClient/Assets/Game/HotUpdate/Views/Mail/MailView.cs

@@ -22,6 +22,11 @@ namespace GFGGame
         public bool _canShowContent = false;//获取内容数据返回前不可查看
         public List<MailInfo> mailInfos;//= new List<MailInfo>();
 
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+
         public override void Dispose()
         {
             if (_ui != null)
@@ -76,6 +81,7 @@ namespace GFGGame
             base.OnShown();
             mailDataMgr.CurPage = 0;
             UpdateNormal();
+            AddEffect();
         }
         private void UpdateNormal()
         {
@@ -197,6 +203,8 @@ namespace GFGGame
         }
         protected override void OnHide()
         {
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             base.OnHide();
         }
         protected override void RemoveEventListener()
@@ -209,5 +217,18 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.MAIL_AllDELETE, UpdateNormal);
             EventAgent.RemoveEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
         }
+
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_L_up");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLeftTop, resPath1,
+                out _gameObject1, out _wrapper1);
+
+            //邊框右下角特效
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_R_Down");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRightDowm, resPath2,
+                out _gameObject2, out _wrapper2);
+        }
     }
 }

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

@@ -860,7 +860,7 @@ namespace GFGGame
                 UpdateRoleLvl();
                 CheckFunOpen();
             }
-            if (numericType == NumericType.FirstRechargeBonusStatus || numericType == NumericType.RechargeTotal)
+            if (numericType == NumericType.FirstRechargeBonusStatus || numericType == NumericType.FirstRechargeTotal)
             {
                 UpdateBtnFirstRecharge();
             }

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -7,7 +7,10 @@ namespace GFGGame
     public class NoticeView : BaseWindow
     {
         private UI_NoticeUI _ui;
-
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
 
         public override void Dispose()
         {
@@ -54,11 +57,15 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = 1;
             _ui.m_listActivity.visible = true;
             _ui.m_listNotice.visible = true;
+            _ui.m_buttonCom.visible = true;
             OnCtrlChange();
+            AddEffect();
         }
 
         protected override void OnHide()
         {
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             base.OnHide();
         }
         protected override void RemoveEventListener()
@@ -67,6 +74,20 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_SYSTOM_ADD, OnCtrlChange);
             EventAgent.RemoveEventListener(ConstMessage.NOTICE_SYSTOM_REMOVE, OnCtrlChange);
         }
+
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_L_up");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLeftTop, resPath1,
+                out _gameObject1, out _wrapper1);
+
+            //邊框右下角特效
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_R_Down");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRightDowm, resPath2,
+                out _gameObject2, out _wrapper2);
+        }
+
         private void OnCtrlChange()
         {
             if (_ui.m_c1.selectedIndex == 0)
@@ -117,6 +138,7 @@ namespace GFGGame
         {
             _ui.m_listActivity.visible = false;
             _ui.m_listNotice.visible = false;
+            _ui.m_buttonCom.visible = false;
             NoticeInfo noticeInfo = (context.sender as GObject).data as NoticeInfo;
             if (noticeInfo.content == "")
             {

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

@@ -1,12 +1,18 @@
 using UI.RoleInfo;
 using System.Text.RegularExpressions;
 using ET;
+using UnityEngine;
+using FairyGUI;
 
 namespace GFGGame
 {
     public class ChangeNameView : BaseWindow
     {
         private UI_ChangeNameUI _ui;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
 
         public override void Dispose()
         {
@@ -38,13 +44,29 @@ namespace GFGGame
             this._ui.m_inputName.text = "";
             _ui.m_txtNeed.text = string.Format("改名卡：{0}/{1}", ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.changeNameCostArr[0]), GlobalCfgArray.globalCfg.changeNameCostArr[1]);
             ItemCfg cfg = ItemCfgArray.Instance.GetCfg(GlobalCfgArray.globalCfg.changeNameCostArr[0]);
-            _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res); ;
+            _ui.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res); 
+
+            AddEffect();
         }
 
         protected override void OnHide()
         {
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             base.OnHide();
         }
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_L_up");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLeftTop, resPath1,
+                out _gameObject1, out _wrapper1);
+
+            //邊框右下角特效
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_R_Down");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRightDowm, resPath2,
+                out _gameObject2, out _wrapper2);
+        }
 
         private void OnClickBtnSureAsync()
         {

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

@@ -1,12 +1,17 @@
 using UI.RoleInfo;
 using System.Text.RegularExpressions;
-
+using UnityEngine;
+using FairyGUI;
 
 namespace GFGGame
 {
     public class SettingView : BaseWindow
     {
         private UI_SettingUI _ui;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
 
         public override void Dispose()
         {
@@ -36,13 +41,29 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            AddEffect();
         }
 
         protected override void OnHide()
         {
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
             base.OnHide();
         }
 
+        private void AddEffect()
+        {
+            //邊框左上角特效
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_L_up");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLeftTop, resPath1,
+                out _gameObject1, out _wrapper1);
+
+            //邊框右下角特效
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Com_window_R_Down");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRightDowm, resPath2,
+                out _gameObject2, out _wrapper2);
+        }
+
         private void OnClickBtnExit()
         {
             AlertSystem.Show("确认返回登录页吗？")

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta

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

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

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

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_5!a.png.meta

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

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

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