公用机提交

FGUIProject/assets/Card/components/ComStarConsume.xml

@@ -6,13 +6,12 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="20,146" size="135,30"/>
-    <text id="n38_a713" name="txtNeedCount" xy="49,144" pivot="1,0" size="34,34" fontSize="24" color="#fdf3d7" ubb="true" text="66">
-      <relation target="n41_wr9a" sidePair="right-left,top-top"/>
-    </text>
-    <text id="n39_a713" name="txtHasCount" xy="89,144" size="34,34" fontSize="24" color="#fdf3d7" text="12">
-      <relation target="n41_wr9a" sidePair="left-right,top-top"/>
-    </text>
-    <text id="n41_wr9a" name="n41" xy="75,144" size="18,34" fontSize="24" color="#fff8ea" text="/"/>
-    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" xy="124,136" pkg="eg2y0ldp"/>
+    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" pkg="eg2y0ldp" xy="124,136"/>
+    <text id="n39_a713" name="txtHasCount" xy="46,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" text="12"/>
+    <text id="n41_wr9a" name="n41" xy="76,144" size="18,34" group="n42_94m1" fontSize="24" color="#fff8ea" text="/"/>
+    <text id="n38_a713" name="txtNeedCount" xy="90,144" size="34,34" group="n42_94m1" fontSize="24" color="#fdf3d7" ubb="true" text="66"/>
+    <group id="n42_94m1" name="n42" xy="46,144" size="78,34" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ListCardItem.xml

@@ -2,9 +2,9 @@
 <component size="238,477">
   <displayList>
     <component id="n6_ojlz" name="loaCard" src="jzrr8n" fileName="components/ComCardMask.xml" xy="0,0"/>
-    <image id="n22_jzrr" name="n22" src="pq5x61" fileName="images/kp_dikuang_2.png" xy="0,0"/>
-    <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="50,50" url="ui://eg2y0ldppq5x62" autoSize="true"/>
     <image id="n20_pq5x" name="n20" src="pq5x60" fileName="images/kp_dikuang_1.png" xy="2,342"/>
+    <loader id="n23_94m1" name="loaBorder" xy="-2,0" size="242,441" url="ui://7l6lvkay94m19w" autoSize="true"/>
+    <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="50,50" url="ui://eg2y0ldppq5x62" autoSize="true"/>
     <text id="n8_ojlz" name="txtLv" xy="185,370" size="39,59" fontSize="24" color="#fff9f1" leading="-5" text="Lv.&#xA;30"/>
     <text id="n9_ojlz" name="txtName" xy="63,432" size="112,49" fontSize="36" color="#6a5d56" autoSize="none" text="赵钱孙"/>
     <component id="n18_ojlz" name="comStar" src="ojlzh" fileName="components/ComStar.xml" pkg="eg2y0ldp" xy="10,397" controller="c1,2"/>

FGUIProject/assets/Card/package.xml

@@ -99,6 +99,10 @@
     <component id="rhha9q" name="ComSkillDiscribe.xml" path="/"/>
     <component id="qgxy9r" name="ComImgCard.xml" path="/"/>
     <component id="qgxy9s" name="ComCardImgRes.xml" path="/"/>
+    <image id="94m19t" name="kp_kuang_3.png" path="/images/" exported="true"/>
+    <image id="94m19u" name="kp_kuang_2.png" path="/images/" exported="true"/>
+    <image id="94m19v" name="kp_kuang_1.png" path="/images/" exported="true"/>
+    <image id="94m19w" name="kp_kuang_4.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <graph id="n24_qyr6" name="n24" xy="0,0" size="1080,1920" alpha="0.7" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
@@ -10,7 +10,7 @@
     </image>
     <image id="n22_qyr6" name="n22" src="qyr6n" fileName="images/fzfj_erdituditu.png" xy="72,406"/>
     <image id="n23_qyr6" name="n23" src="qyr6p" fileName="images/fzfj_btbt.png" xy="0,45"/>
-    <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="125,90"/>
+    <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
     <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n1_wlc2" name="btnRule" src="wlc21" fileName="components/Button1.xml" xy="975,194"/>
     <list id="n29_ez2u" name="listTab" xy="100,343" size="880,63" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="2" colGap="12">

FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -4,7 +4,7 @@
     <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,105">
+    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,90">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
@@ -26,7 +26,7 @@
     <group id="n10_rbxq" name="n10" xy="124,207" size="773,70" advanced="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
-    <list id="n9_py5g" name="listSuit" xy="31,377" size="1016,1537" layout="flow_hz" overflow="scroll" lineGap="48" colGap="26" defaultItem="ui://uicwtr5bpy5g8" align="center" autoClearItems="true">
+    <list id="n9_py5g" name="listSuit" xy="36,377" size="1007,1537" layout="flow_hz" overflow="scroll" lineGap="48" colGap="26" defaultItem="ui://uicwtr5bpy5g8" autoClearItems="true">
       <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/SuitUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <loader id="n0_pjip" name="bg" xy="-610,-390" size="2300,2700" url="ui://eg2y0ldpbd1ca0" fill="scaleFree" autoSize="true">
@@ -26,11 +26,11 @@
     </component>
     <component id="n12_py5g" name="btnTabFoster" src="py5gm" fileName="components/Button5.xml" xy="243,1259">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button icon="ui://uicwtr5bbd1c1i" selectedIcon="ui://uicwtr5bbd1c1h" controller="c1" page="0"/>
+      <Button checked="true" icon="ui://uicwtr5bbd1c1i" selectedIcon="ui://uicwtr5bbd1c1h" controller="c1" page="0"/>
     </component>
     <component id="n13_py5g" name="btnTabRenew" src="py5gm" fileName="components/Button5.xml" xy="561,1259">
       <relation target="" sidePair="bottom-bottom"/>
-      <Button checked="true" icon="ui://uicwtr5bbd1c18" selectedIcon="ui://uicwtr5bbd1c1j" controller="c1" page="1"/>
+      <Button icon="ui://uicwtr5bbd1c18" selectedIcon="ui://uicwtr5bbd1c1j" controller="c1" page="1"/>
     </component>
     <image id="n36_bd1c" name="n36" src="bd1c1g" fileName="images/fzyc_yhditu_3.png" xy="0,1419" group="n21_nk8d"/>
     <component id="n19_nk8d" name="comFosterReward" src="nk8d13" fileName="components/ComFosterReward.xml" xy="854,1143" group="n21_nk8d"/>
@@ -41,7 +41,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n15_py5g" name="listFoster" xy="44,1592" size="992,255" group="n21_nk8d" layout="row" overflow="scroll" colGap="64" defaultItem="ui://uicwtr5bj5a512" align="center">
+    <list id="n15_py5g" name="listFoster" xy="44,1592" size="992,255" group="n21_nk8d" layout="row" overflow="hidden" colGap="64" defaultItem="ui://uicwtr5bj5a512" align="center">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ClothingFoster/components/ComReward.xml

@@ -2,7 +2,7 @@
 <component size="150,150">
   <displayList>
     <image id="n3_bd1c" name="n3" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="0,0" size="150,150" aspect="true"/>
-    <loader id="n6_bd1c" name="loaIcon" xy="15,15" size="120,120" fill="scale"/>
+    <loader id="n6_bd1c" name="loaIcon" xy="23,23" size="104,104" aspect="true" fill="scale"/>
     <image id="n5_bd1c" name="n5" src="bd1c22" fileName="images/fzjl_dik_4.png" xy="15,120"/>
     <image id="n4_bd1c" name="imgGot" src="bd1c1z" fileName="images/fzjl_dik_5.png" xy="0,0"/>
     <text id="n7_bd1c" name="txtNum" xy="51,116" pivot="0.5,0" size="47,34" fontSize="24" color="#fff8ea" text="x20"/>

FGUIProject/assets/ClothingFoster/components/ListMaterialsItem.xml

@@ -4,12 +4,12 @@
     <image id="n9_bd1c" name="n9" src="bd1c1n" fileName="images/fzyc_hxk_2.png" xy="0,0"/>
     <loader id="n5_py5g" name="loaIcon" xy="21,21" size="150,150" aspect="true" url="ui://uicwtr5bpy5ge" fill="scale"/>
     <image id="n11_l4ui" name="n11" src="bd1c1o" fileName="images/fzyc_hxk_3.png" xy="29,158"/>
-    <text id="n7_py5g" name="txtNeed" xy="57,157" pivot="1,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" align="right" ubb="true" text="10">
-      <relation target="n8_nk8d" sidePair="right-left,top-top"/>
+    <text id="n6_py5g" name="txtHas" xy="57,158" pivot="0,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="11">
+      <relation target="n8_nk8d" sidePair="left-right,top-top"/>
     </text>
     <text id="n8_nk8d" name="n8" xy="91,158" pivot="0.5,0.5" size="18,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="/"/>
-    <text id="n6_py5g" name="txtHas" xy="109,158" pivot="0,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" ubb="true" text="11">
-      <relation target="n8_nk8d" sidePair="left-right,top-top"/>
+    <text id="n7_py5g" name="txtNeed" xy="109,157" pivot="1,0.5" size="34,34" group="n10_l4ui" fontSize="24" color="#fff8ea" align="right" ubb="true" text="10">
+      <relation target="n8_nk8d" sidePair="right-left,top-top"/>
     </text>
     <group id="n10_l4ui" name="n10" xy="57,157" size="86,35" advanced="true" layout="hz" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>

FGUIProject/assets/ClothingShop/ClothingShopUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,3,,4,,5," selected="0">
+  <controller name="c1" pages="2,,3,,4,,5," selected="3">
     <remark page="1" value="服装店"/>
     <remark page="2" value="落星商店"/>
     <remark page="3" value="活动商店"/>
@@ -76,8 +76,8 @@
       </item>
     </list>
     <loader id="n45_ugdz" name="n45" xy="0,0" size="1080,199" url="ui://e5hnfx8augdz1i" fill="scaleFree"/>
-    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
-      <gearXY controller="c1" pages="2,3,4,5" values="159,90|159,90|159,107|159,107"/>
+    <component id="n2_hinb" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,105">
+      <gearXY controller="c1" pages="2,3,4,5" values="159,90|159,90|159,105|159,105"/>
     </component>
     <component id="n47_ugdz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n49_f5bl" name="n49" src="lwri5x" fileName="images/hc_btkuang_1.png" pkg="eg2y0ldp" xy="282,103" group="n51_f5bl"/>

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -6,7 +6,7 @@
     </loader>
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,319"/>
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,196"/>
+    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="36,220"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90" pivot="1,0"/>
     <image id="n3_j539" name="n3" src="j539p" fileName="images/hc_btkuang.png" pkg="eg2y0ldp" xy="259,218"/>
     <text id="n4_j539" name="txtSuitName" xy="466,223" size="148,49" fontSize="36" color="#fdf4e3" text="套装名字">
@@ -35,7 +35,7 @@
       <item/>
       <item/>
     </list>
-    <text id="n38_ja9w" name="n38" xy="194,1278" size="691,42" fontSize="30" color="#917960" text="* 系统默认保留一件衣服，余下的才能作为合成材料*"/>
+    <text id="n38_ja9w" name="n38" xy="194,1278" size="691,41" fontSize="30" color="#917960" text="* 系统默认保留一件衣服，余下的才能作为合成材料*"/>
     <image id="n39_ja9w" name="n39" src="j53911" fileName="images/hc_xiant_1.png" xy="91,1487"/>
     <image id="n41_ja9w" name="n41" src="j539t" fileName="images/hc_kuang_3.png" pkg="eg2y0ldp" xy="623,1333"/>
     <text id="n42_ja9w" name="txtCost" xy="630,1336" size="160,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">

FGUIProject/assets/CommonGame/GetSuitItemUI.xml

@@ -28,7 +28,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n9_tu96" name="item" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1712">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
+      <relation target="n6_tu96" sidePair="top-bottom"/>
     </component>
   </displayList>
 </component>

FGUIProject/assets/DailyTask/DailyTaskUI.xml

@@ -14,9 +14,9 @@
     </list>
     <image id="n3_wet2" name="n3" src="wet22h" fileName="images/mrqd_kdi.png" xy="246,494" group="n10_wet2"/>
     <text id="n7_wet2" name="txtDesc0" xy="262,501" size="214,44" group="n11_slkg" fontSize="32" color="#d5c9a5" text="今日活跃度40 "/>
-    <loader id="n9_wet2" name="loaIcon" xy="476,501" size="42,42" group="n11_slkg" url="ui://eg2y0ldply9g8m" autoSize="true"/>
-    <text id="n8_wet2" name="txtDesc1" xy="518,501" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
-    <group id="n11_slkg" name="n11" xy="262,501" size="556,44" group="n10_wet2" advanced="true" layout="hz" excludeInvisibles="true"/>
+    <loader id="n9_wet2" name="loaIcon" xy="471,501" size="46,44" group="n11_slkg" url="ui://eg2y0ldpkztethq" fill="scale"/>
+    <text id="n8_wet2" name="txtDesc1" xy="512,501" size="300,44" group="n11_slkg" fontSize="32" color="#d5c9a5" autoSize="none" text="，满40活跃度可领奖"/>
+    <group id="n11_slkg" name="n11" xy="262,501" size="550,44" group="n10_wet2" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
     <group id="n10_wet2" name="n10" xy="246,494" size="588,58" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -51,6 +51,9 @@
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <group id="n23_8xpg" name="groupTaskHint" xy="0,0" size="1080,1920" group="n38_8lqj" advanced="true"/>
+    <loader id="n42_m1l9" name="btnGuide" xy="455,875" size="170,170" group="n38_8lqj" aspect="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="27,895" size="116,106" group="n38_8lqj" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wb8xpg2n"/>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="210,235">
   <displayList>
-    <image id="n0_k6he" name="n0" src="k6he1w" fileName="images/hz_fkdikuang.png" xy="15,0"/>
+    <loader id="n9_94m1" name="loaBorder" xy="15,0" size="178,178" url="ui://mbo439wb94m1dl" autoSize="true"/>
     <loader id="n1_k6he" name="icon" xy="39,20" pivot="0.5,0.5" size="140,140" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>

FGUIProject/assets/DressUp/package.xml

@@ -176,6 +176,10 @@
     <image id="jj0m5j" name="hz_zdzddg_2.png" path="/images/"/>
     <image id="jj0m5k" name="hz_zdzddg_3.png" path="/images/"/>
     <image id="jj0m5l" name="hz_zdzddg_1.png" path="/images/"/>
+    <image id="94m1dl" name="hz_kuangk_1.png" path="/images/" exported="true"/>
+    <image id="94m1dm" name="hz_kuangk_4.png" path="/images/" exported="true"/>
+    <image id="94m1dn" name="hz_kuangk_3.png" path="/images/" exported="true"/>
+    <image id="94m1do" name="hz_kuangk_2.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -11,7 +11,7 @@
     </component>
     <text id="n4_ohun" name="txtNum" xy="380,140" size="175,46" fontSize="34" color="#a17d5f" ubb="true" text="第20/20轮"/>
     <image id="n5_ohun" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
-    <text id="n7_ohun" name="txtHas" xy="338,463" pivot="0.5,0" size="260,49" fontSize="36" color="#a17d5f" text="已拥有：38000"/>
+    <text id="n7_ohun" name="txtHas" xy="338,463" pivot="0.5,0" size="260,49" visible="false" fontSize="36" color="#a17d5f" text="已拥有：38000"/>
     <text id="n8_ohun" name="n8" xy="326,531" size="148,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="本次消耗"/>
     <loader id="n9_ohun" name="loaCost" xy="475,530" size="50,50" group="n11_ohun" url="ui://eg2y0ldpq08x4"/>
     <text id="n10_ohun" name="txtCostNum" xy="541,531" size="69,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="x16"/>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -4,13 +4,13 @@
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="2"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="0,-240" size="1080,2400" url="ui://drx9d1uso1391g" autoSize="true">
+    <loader id="n0_l5nz" name="bg" xy="0,-240" size="1080,2400" url="ui://drx9d1uso1391h" autoSize="true">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="72,76"/>
+    <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="513,889">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>

FGUIProject/assets/Mail/components/ListItem.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="874,152">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <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://y44a413eehs90" autoSize="true">
+    <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"/>
     </loader>
-    <text id="n5_ehs9" name="txtDiscribe" xy="184,18" size="423,52" fontSize="38" color="#9b7853" autoSize="none" text="周日奖励周日奖励周报...."/>
-    <text id="n6_ehs9" name="txtTime" xy="184,95" size="189,39" fontSize="28" color="#c19f7b" text="剩余时间：5天"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/MainUI.xml

@@ -5,12 +5,12 @@
     <remark page="1" value="down"/>
   </controller>
   <displayList>
-    <component id="n2_q08x" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="17,150"/>
+    <component id="n2_q08x" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="20,160"/>
     <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
     <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,170">
+    <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="522,190">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="6,790">

FGUIProject/assets/Main/RoleInfoUI.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="878,1044">
+<component size="700,1000">
   <displayList>
-    <loader id="n0_d4iw" name="bg" xy="0,0" size="877,1103" url="ui://mfvz4q8kmhyhd5" fill="scaleFree" autoSize="true"/>
-    <image id="n23_mhyh" name="n23" src="mhyhd7" fileName="images/grxx_mzk_1.png" xy="287,313"/>
-    <text id="n2_d4iw" name="txtTitle" xy="93,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="377,86"/>
-    <text id="n5_d4iw" name="txtRoleName" xy="346,313" pivot="0.5,0" size="186,61" fontSize="46" color="#a37349" align="center" text="角色名五"/>
-    <text id="n6_d4iw" name="n6" xy="130,440" size="71,46" fontSize="34" color="#aa794d" text="等级"/>
-    <text id="n7_d4iw" name="n7" xy="130,500" size="71,46" fontSize="34" color="#aa794d" text="经验"/>
-    <text id="n10_d4iw" name="n10" xy="130,560" size="71,46" fontSize="34" color="#aa794d" text="音效"/>
-    <text id="n12_d4iw" name="n12" xy="520,560" size="71,46" fontSize="34" color="#aa794d" text="音乐"/>
-    <text id="n8_d4iw" name="txtLvl" xy="235,440" size="25,46" fontSize="34" color="#c47a6c" text="1"/>
-    <component id="n9_d4iw" name="proBarExp" src="d4iw6m" fileName="components/ProgressBarExp2.xml" xy="229,508">
+    <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="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="经验"/>
+    <text id="n10_d4iw" name="n10" xy="57,560" size="71,46" fontSize="34" color="#aa794d" text="音效"/>
+    <text id="n12_d4iw" name="n12" xy="447,560" size="71,46" fontSize="34" color="#aa794d" text="音乐"/>
+    <text id="n8_d4iw" name="txtLvl" xy="162,440" size="25,46" fontSize="34" color="#c47a6c" text="1"/>
+    <component id="n9_d4iw" name="proBarExp" src="d4iw6m" fileName="components/ProgressBarExp2.xml" xy="156,508">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n11_d4iw" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="229,561"/>
-    <component id="n13_d4iw" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="609,565"/>
-    <component id="n19_ga16" name="btnLogout" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="277,786" aspect="true">
+    <component id="n11_d4iw" name="btnSound" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="156,561"/>
+    <component id="n13_d4iw" name="btnMusic" src="d4iw6o" fileName="components/ButtonToggle.xml" xy="536,565"/>
+    <component id="n19_ga16" name="btnLogout" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="204,786" aspect="true">
       <Button title="注销账户"/>
     </component>
-    <component id="n14_d4iw" name="btnExit" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="277,668" aspect="true">
+    <component id="n14_d4iw" name="btnExit" src="axdi97" fileName="components/Button12.xml" pkg="mk0fwx0x" xy="204,668" aspect="true">
       <Button title="返回登录" icon="ui://mk0fwx0xaxdi98"/>
     </component>
-    <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="704,884">
+    <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="631,884">
       <Button title="?"/>
     </component>
-    <text id="n21_bx8o" name="txtVersion" xy="539,824" size="200,42" fontSize="30" color="#cccccc" align="right" autoSize="none" autoClearText="true" text="v 1.0.0">
+    <text id="n21_bx8o" name="txtVersion" xy="466,824" size="200,42" fontSize="30" color="#cccccc" align="right" autoSize="none" autoClearText="true" text="v 1.0.0">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <loader id="n24_mhyh" name="loaChangeName" xy="586,331" size="34,36" url="ui://mfvz4q8kmhyhd8" autoSize="true"/>
-    <image id="n25_mhyh" name="n25" src="mhyhd6" fileName="images/grxx_txtx.png" xy="336,86"/>
+    <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"/>
   </displayList>
 </component>

FGUIProject/assets/Main/StoryChapterListUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <list id="n11_slb4" name="listChapter" xy="55,-102" size="1025,1693" layout="row" overflow="scroll" scroll="horizontal" lineGap="80" colGap="38" defaultItem="ui://mfvz4q8kslb41r" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
+      <relation target="" sidePair="top-top"/>
       <item/>
       <item/>
       <item/>
@@ -13,8 +13,8 @@
     </list>
     <component id="n1_slb4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n2_slb4" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
-    <image id="n7_slb4" name="bgTitle" src="slb41l" fileName="imagesStory/zhuxian_mengban.png" xy="199,90" size="764,70"/>
-    <list id="n16_ed2z" name="listTab" xy="199,90" size="764,71" layout="row" colGap="10">
+    <image id="n7_slb4" name="bgTitle" src="slb41l" fileName="imagesStory/zhuxian_mengban.png" xy="199,90" size="764,70" visible="false"/>
+    <list id="n16_ed2z" name="listTab" xy="199,90" size="764,71" visible="false" layout="row" colGap="10">
       <item url="ui://mfvz4q8kslb41q">
         <property target="imgTitle" propertyId="1" value="ui://mfvz4q8ked2z8b"/>
       </item>

FGUIProject/assets/Main/StoryChapterUI.xml

@@ -4,16 +4,16 @@
     <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="componentsLevel/CompChapter.xml" xy="-1,0" size="1080,1920">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="79,90"/>
-    <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,142"/>
-    <component id="n4_v354" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="51,258"/>
-    <image id="n5_v354" name="n5" src="v3541y" fileName="imagesStory/zx_gka_di_1.png" xy="47,374" aspect="true"/>
-    <text id="n6_v354" name="txtStarCount" xy="46,403" size="98,42" fontSize="30" color="#fff6e6" align="center" autoSize="none" text="15/18">
+    <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
+    <component id="n3_v354" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n4_v354" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
+    <image id="n5_v354" name="n5" src="v3541y" fileName="imagesStory/zx_gka_di_1.png" xy="34,375" aspect="true"/>
+    <text id="n6_v354" name="txtStarCount" xy="32,404" size="98,42" fontSize="30" color="#fff6e6" align="center" autoSize="none" text="15/18">
       <relation target="n5_v354" sidePair="center-center,middle-middle"/>
     </text>
-    <component id="n7_v354" name="bonusBox3" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="33,492"/>
-    <component id="n11_v354" name="bonusBox2" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="33,652"/>
-    <component id="n12_v354" name="bonusBox1" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="33,808"/>
+    <component id="n7_v354" name="bonusBox3" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,493"/>
+    <component id="n11_v354" name="bonusBox2" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,653"/>
+    <component id="n12_v354" name="bonusBox1" src="v3542b" fileName="componentsLevel/CompBonusBox.xml" xy="20,809"/>
     <image id="n15_ki96" name="n15" src="v35426" fileName="imagesStory/zx_gka_zshuk.png" xy="293,200">
       <relation target="" sidePair="center-center,top-top"/>
     </image>

FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kuo1t9j" designImageOffsetY="-120">
   <displayList>
-    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,80"/>
+    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n0_8xpg" name="selfScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="419,843" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -4,7 +4,7 @@
     <component id="n2_8xpg" name="btnSkip" src="nmnb2x" fileName="componentsDialog/ButtonSkip.xml" xy="867,1769" visible="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,80"/>
+    <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,80">
       <ProgressBar max="100"/>
     </component>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1160" designImageOffsetX="-750">
-  <controller name="ctrlNeed" pages="0,,1,,2," selected="1"/>
+  <controller name="ctrlNeed" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n44_yoe2" name="btnBg" xy="0,-153" size="1080,1414" touchable="false" url="ui://mfvz4q8kj48o94" autoSize="true"/>
     <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,864">
@@ -24,7 +24,8 @@
     </list>
     <text id="n15_t8o1" name="txtLevelDesc" xy="387,419" size="638,140" fontSize="32" color="#a28d77" leading="10" ubb="true" autoSize="none" autoClearText="true" text="旋律在指尖流转，在天幕中划出一道 起伏的星轨折线谱，爱与星光于此吟 唱。参与限时活动星幕下的奏鸣！"/>
     <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"/>
-    <text id="n18_t8o1" name="txtPowerDesc" xy="822,1114" size="170,42" fontSize="28" color="#b19270" align="center" vAlign="middle" vars="true" autoSize="none" text="消耗体力{power=0}"/>
+    <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="32,184"/>
     <text id="n21_t8o1" name="txtTargetName" xy="43,209" pivot="0.5,0" size="32,212" fontSize="32" color="#dcc7b3" align="center" autoSize="height" text="挑战对手">
       <relation target="n34_pal5" sidePair="top-top"/>

FGUIProject/assets/Main/components/ComponentChapterPic.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,1591">
+<component size="290,1591" opaque="false">
   <displayList>
     <loader id="n0_slb4" name="pic" xy="0,586" size="290,1006" url="ui://mfvz4q8kjvi38d" autoSize="true"/>
     <image id="n3_s17n" name="n3" src="tu967b" fileName="imagesStory/zhuxian_diban_1.png" xy="0,0"/>

FGUIProject/assets/Main/components/ComponentListChapterItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,1591">
+<component size="290,1591" opaque="false">
   <displayList>
     <component id="n0_slb4" name="compPic" src="tu966u" fileName="components/ComponentChapterPic.xml" xy="0,0"/>
     <image id="n7_tu96" name="n7" src="tu967c" fileName="imagesStory/zhuxian_diban_2.png" xy="0,805"/>

FGUIProject/assets/Main/components/ListChapterItem.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,1693">
+<component size="290,1693" opaque="false">
   <displayList>
     <component id="n0_slb4" name="content" src="slb41t" fileName="components/ComponentListChapterItem.xml" xy="0,102"/>
   </displayList>

FGUIProject/assets/Main/componentsDialog/Component1.xml

@@ -2,5 +2,6 @@
 <component size="290,408">
   <displayList>
     <loader id="n14_nmnb" name="head" xy="0,0" pivot="0.5,0" size="290,408" aspect="true" scale="-1,1" url="ui://mfvz4q8kndrd7i" align="center"/>
+    <graph id="n15_94m1" name="holder" xy="144,203" size="1,1" scale="-1,1" touchable="false"/>
   </displayList>
 </component>

FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <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">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -19,7 +19,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n16_n3xh" name="list" xy="39,516" pivot="0.5,0" size="1002,1406" overflow="scroll" scrollBarFlags="2" lineGap="63" defaultItem="ui://xz8kxrecn3xha" align="center">
+    <list id="n16_n3xh" name="list" xy="39,320" pivot="0.5,0" size="1002,1600" overflow="scroll" scrollBarFlags="2" lineGap="63" defaultItem="ui://xz8kxrecn3xha" align="center">
       <gearXY controller="c1" pages="0,1" values="39,320|39,516"/>
       <gearSize controller="c1" pages="0,1" values="1002,1600,1,1|1002,1406,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
@@ -33,10 +33,10 @@
     </list>
     <component id="n18_n3xh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n19_n3xh" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
-    <text id="n21_n3xh" name="txtNum" xy="709,460" size="243,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
-    <text id="n20_n3xh" name="txtTime" xy="476,460" size="204,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
-    <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="980,446" group="n23_fa5e"/>
-    <group id="n23_fa5e" name="n23" xy="476,446" size="572,71" advanced="true">
+    <text id="n21_n3xh" name="txtNum" xy="709,264" size="243,44" group="n23_fa5e" fontSize="32" color="#e2deb6" text="剩余次数：1/10"/>
+    <text id="n20_n3xh" name="txtTime" xy="476,264" size="204,44" group="n23_fa5e" fontSize="32" color="#979166" text="12小时候刷新"/>
+    <component id="n22_n3xh" name="btnBuy" src="hinb5s" fileName="components/ButtonPlus2.xml" pkg="eg2y0ldp" xy="980,250" group="n23_fa5e"/>
+    <group id="n23_fa5e" name="n23" xy="476,250" size="572,71" advanced="true">
       <gearXY controller="c1" pages="0" values="476,250" default="476,446"/>
     </group>
   </displayList>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -9,6 +9,7 @@ namespace GFGGame
 
         public const string SUIT_BOX_STATUS_CHANGED = "SUIT_BOX_STATUS_CHANGED";
         public const string CJ_FINISH = "CJ_FINISH";
+        public const string MAIL_REFRESH = "MAIL_REFRESH";
         public const string MAIL_CHANGE = "MAIL_CHANGE";
         public const string DRESS_FILTER = "DRESS_FILTER";
         public const string DRESS_SEARCH = "DRESS_SEARCH";

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

@@ -177,15 +177,15 @@ namespace GFGGame
             else
             {
                 MainStoryDataManager.currentChapterCfgId = 10001;
-                if (GameGlobal.isFirstEntry == true)
-                {
-                    // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, });
-                    StoryController.ShowPriorStoryDialog();
-                }
-                else
-                {
-                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, MainStoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
-                }
+                // if (GameGlobal.isFirstEntry == true)
+                // {
+                //     // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, });
+                //     StoryController.ShowPriorStoryDialog();
+                // }
+                // else
+                // {
+                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, MainStoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                // }
             }
             Timers.inst.CallLater(AfterEnterGame);
         }
@@ -205,6 +205,7 @@ namespace GFGGame
             DailyTaskSProxy.ReqDailyTaskInfos().Coroutine();
             ActivitySProxy.ReqDailyLoginInfos().Coroutine();
             NoticeSProxy.ReqSystemNoticeList().Coroutine();
+            MailSProxy.ReqMailCount().Coroutine();
             EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
             EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED) <= 1 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY_SPEED);
             GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;

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

@@ -133,6 +133,7 @@ namespace GFGGame
 
         public static void Logout()
         {
+            GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Dispose();
             GameGlobal.zoneScene.GetComponent<SessionComponent>().Session?.Dispose();
         }
 

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

@@ -15,6 +15,8 @@ namespace GFGGame
     }
     public class PhotographDataManager : SingletonBase<PhotographDataManager>
     {
+        public const int BORDERID = 3000013;
+        public const int EffectID = 3000015;
         public List<GameObject> itemGameObjs = new List<GameObject>();
 
         public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
@@ -110,9 +112,17 @@ namespace GFGGame
                     break;
                 case EnumPhotographType.BORDER:
                     _listData = PhotographDataManager.Instance.listBorderData;
+                    if (_listData.IndexOf(BORDERID) < 0)
+                    {
+                        _listData.Insert(0, BORDERID);
+                    }
                     break;
                 case EnumPhotographType.EFFECT:
                     _listData = PhotographDataManager.Instance.listEffectData;
+                    if (_listData.IndexOf(EffectID) < 0)
+                    {
+                        _listData.Insert(0, EffectID);
+                    }
                     break;
             }
             return _listData;

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

@@ -25,6 +25,7 @@ namespace GFGGame
             {
                 GameObject.Destroy(spr);
             }
+            if (itemCfg.id == PhotographDataManager.BORDERID) return;
             string resPath = ResPathUtil.GetPhotographFPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
             SceneController.SetSpriteRendererToTransform(tf, resPath);
             spr = tf.GetComponent<SpriteRenderer>();

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -154,8 +154,8 @@ namespace GFGGame
                 DressUpUtil.AddItem(value, _sceneObj, _needSetMask);
                 score += DressUpMenuItemDataManager.GetItemScore(value);
             }
-            //  int dressSuitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
-            // if (dressSuitId > 0) _suitId = dressSuitId;
+            int dressSuitId = DressUpMenuSuitDataManager.CheckCurDressIsSuit();
+            if (dressSuitId > 0) _suitId = dressSuitId;
         }
 
         private void Remove(int value)
@@ -646,5 +646,6 @@ namespace GFGGame
             }
             return 0;
         }
+
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -95,7 +95,7 @@ namespace ET
             {
                 zoneScene.AddComponent<SessionComponent>();
             }
-            zoneScene.GetComponent<SessionComponent>().Session = accountSession;
+            zoneScene.GetComponent<SessionComponent>().AccountSession = accountSession;
             accountSession.AddComponent<PingComponent>();
             accountSession.AddComponent<DisConnectedCompnent>();
             AccountInfoComponent accountInfoComponent = zoneScene.GetComponent<AccountInfoComponent>();
@@ -138,7 +138,7 @@ namespace ET
 
             try
             {
-                a2C_GetServerInfos = (A2C_GetServerInfos)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetServerInfos()
+                a2C_GetServerInfos = (A2C_GetServerInfos)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetServerInfos()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token
@@ -173,7 +173,7 @@ namespace ET
 
             try
             {
-                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetRoles()
+                a2C_GetRoles = (A2C_GetRoles)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRoles()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -208,7 +208,7 @@ namespace ET
             A2C_CreateRole a2C_CreateRole = null;
             try
             {
-                a2C_CreateRole = (A2C_CreateRole)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_CreateRole
+                a2C_CreateRole = (A2C_CreateRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_CreateRole
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -241,7 +241,7 @@ namespace ET
 
             try
             {
-                a2C_DeleteRole = (A2C_DeleteRole)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_DeleteRole()
+                a2C_DeleteRole = (A2C_DeleteRole)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_DeleteRole()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -274,7 +274,7 @@ namespace ET
 
             try
             {
-                a2C_GetRealmKey = (A2C_GetRealmKey)await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetRealmKey()
+                a2C_GetRealmKey = (A2C_GetRealmKey)await zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetRealmKey()
                 {
                     AccountId = zoneScene.GetComponent<AccountInfoComponent>().AccountId,
                     Token = zoneScene.GetComponent<AccountInfoComponent>().Token,
@@ -395,7 +395,7 @@ namespace ET
             A2C_GetLatestNotice response = null;
             try
             {
-                response = (A2C_GetLatestNotice)await GameGlobal.zoneScene.GetComponent<SessionComponent>().Session.Call(new C2A_GetLatestNotice());
+                response = (A2C_GetLatestNotice)await GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Call(new C2A_GetLatestNotice());
             }
             catch (Exception e)
             {

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Session/SessionComponentSystem.cs

@@ -4,14 +4,17 @@
 	{
 		public override void Destroy(SessionComponent self)
 		{
-			self.Session.Dispose();
+			self.AccountSession?.Dispose();
+			self.Session?.Dispose();
 		}
 	}
 
 	public static class SessionComponentComponent
     {
 		public static void Disconnect(this SessionComponent self)
-        {
+		{
+			self.AccountSession?.GetComponent<DisConnectedCompnent>()?.CancelAlert();
+			self.AccountSession?.Dispose();
 			self.Session?.GetComponent<DisConnectedCompnent>()?.CancelAlert();
 			self.Session?.Dispose();
 		}

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/Session/SessionComponent.cs

@@ -2,6 +2,9 @@
 {
 	public class SessionComponent: Entity, IAwake, IDestroy
 	{
+		//登录会话
+		public Session AccountSession;
+		//游戏会话
 		public Session Session;
 	}
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComStarConsume.cs

@@ -8,9 +8,9 @@ namespace UI.Card
     {
         public GComponent target;
         public GLoader m_loaItem;
-        public GTextField m_txtNeedCount;
-        public GTextField m_txtHasCount;
         public GButton m_btnPlus;
+        public GTextField m_txtHasCount;
+        public GTextField m_txtNeedCount;
         public const string URL = "ui://7l6lvkaywr9a82";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ComStarConsume";
@@ -59,16 +59,16 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_loaItem = (GLoader)comp.GetChild("loaItem");
-            m_txtNeedCount = (GTextField)comp.GetChild("txtNeedCount");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_btnPlus = (GButton)comp.GetChild("btnPlus");
+            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
+            m_txtNeedCount = (GTextField)comp.GetChild("txtNeedCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaItem = null;
-            m_txtNeedCount = null;
-            m_txtHasCount = null;
             m_btnPlus = null;
+            m_txtHasCount = null;
+            m_txtNeedCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListCardItem.cs

@@ -8,6 +8,7 @@ namespace UI.Card
     {
         public GComponent target;
         public UI_ComCardMask m_loaCard;
+        public GLoader m_loaBorder;
         public GLoader m_loaRarity;
         public GTextField m_txtLv;
         public GTextField m_txtName;
@@ -60,6 +61,7 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_loaCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("loaCard"));
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
@@ -69,6 +71,7 @@ namespace UI.Card
         {
             m_loaCard.Dispose();
             m_loaCard = null;
+            m_loaBorder = null;
             m_loaRarity = null;
             m_txtLv = null;
             m_txtName = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListMaterialsItem.cs

@@ -8,8 +8,8 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GLoader m_loaIcon;
-        public GTextField m_txtNeed;
         public GTextField m_txtHas;
+        public GTextField m_txtNeed;
         public const string URL = "ui://uicwtr5bpy5gu";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "ListMaterialsItem";
@@ -58,14 +58,14 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
             m_txtHas = (GTextField)comp.GetChild("txtHas");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaIcon = null;
-            m_txtNeed = null;
             m_txtHas = null;
+            m_txtNeed = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -23,6 +23,7 @@ namespace UI.DressUp
         public GGraph m_btnClose;
         public GTextField m_txtHint;
         public GGroup m_groupTaskHint;
+        public GLoader m_btnGuide;
         public GButton m_btnClothingShop;
         public GButton m_btnRepeal;
         public GButton m_btnRenewal;
@@ -96,6 +97,7 @@ namespace UI.DressUp
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
             m_groupTaskHint = (GGroup)comp.GetChild("groupTaskHint");
+            m_btnGuide = (GLoader)comp.GetChild("btnGuide");
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
@@ -130,6 +132,7 @@ namespace UI.DressUp
             m_btnClose = null;
             m_txtHint = null;
             m_groupTaskHint = null;
+            m_btnGuide = null;
             m_btnClothingShop = null;
             m_btnRepeal = null;
             m_btnRenewal = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_PartsListItem
     {
         public GComponent target;
+        public GLoader m_loaBorder;
         public GLoader m_icon;
         public GTextField m_txtTitle;
         public GImage m_iconSelected;
@@ -61,6 +62,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_icon = (GLoader)comp.GetChild("icon");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_iconSelected = (GImage)comp.GetChild("iconSelected");
@@ -71,6 +73,7 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBorder = null;
             m_icon = null;
             m_txtTitle = null;
             m_iconSelected = null;

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

@@ -7,9 +7,7 @@ namespace UI.Mail
     public partial class UI_ComContent
     {
         public GComponent target;
-        public GTextField m_txtTo;
-        public GTextField m_txtContent;
-        public GTextField m_txtFrom;
+        public GRichTextField m_txtContent;
         public const string URL = "ui://y44a413eehs9g";
         public const string PACKAGE_NAME = "Mail";
         public const string RES_NAME = "ComContent";
@@ -57,15 +55,11 @@ namespace UI.Mail
 
         private void Init(GComponent comp)
         {
-            m_txtTo = (GTextField)comp.GetChild("txtTo");
-            m_txtContent = (GTextField)comp.GetChild("txtContent");
-            m_txtFrom = (GTextField)comp.GetChild("txtFrom");
+            m_txtContent = (GRichTextField)comp.GetChild("txtContent");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtTo = null;
             m_txtContent = null;
-            m_txtFrom = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,7 +10,7 @@ namespace UI.Mail
         public Controller m_c1;
         public GImage m_bg;
         public GLoader m_loaIcon;
-        public GTextField m_txtDiscribe;
+        public GTextField m_txtTitle;
         public GTextField m_txtTime;
         public GButton m_btnLook;
         public const string URL = "ui://y44a413eehs9d";
@@ -63,7 +63,7 @@ namespace UI.Mail
             m_c1 = comp.GetController("c1");
             m_bg = (GImage)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnLook = (GButton)comp.GetChild("btnLook");
         }
@@ -72,7 +72,7 @@ namespace UI.Mail
             m_c1 = null;
             m_bg = null;
             m_loaIcon = null;
-            m_txtDiscribe = null;
+            m_txtTitle = null;
             m_txtTime = null;
             m_btnLook = null;
             if(disposeTarget && target != null)

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

@@ -8,6 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public GLoader m_head;
+        public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kndrd7j";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "Component1";
@@ -56,10 +57,12 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_head = (GLoader)comp.GetChild("head");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_head = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -16,6 +16,7 @@ namespace UI.Main
         public GList m_listTag;
         public GTextField m_txtLevelDesc;
         public GLoader m_loaderHead;
+        public GLoader m_loaCost;
         public GTextField m_txtPowerDesc;
         public GTextField m_txtTargetName;
         public GButton m_btnFightOnce;
@@ -83,6 +84,7 @@ namespace UI.Main
             m_listTag = (GList)comp.GetChild("listTag");
             m_txtLevelDesc = (GTextField)comp.GetChild("txtLevelDesc");
             m_loaderHead = (GLoader)comp.GetChild("loaderHead");
+            m_loaCost = (GLoader)comp.GetChild("loaCost");
             m_txtPowerDesc = (GTextField)comp.GetChild("txtPowerDesc");
             m_txtTargetName = (GTextField)comp.GetChild("txtTargetName");
             m_btnFightOnce = (GButton)comp.GetChild("btnFightOnce");
@@ -106,6 +108,7 @@ namespace UI.Main
             m_listTag = null;
             m_txtLevelDesc = null;
             m_loaderHead = null;
+            m_loaCost = null;
             m_txtPowerDesc = null;
             m_txtTargetName = null;
             m_btnFightOnce = null;

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -56,9 +56,11 @@ namespace GFGGame
                 comHolder = UI_ComHolder.Create();
                 comHolder.target.touchable = false;
                 ViewManager.AddChildToTopLayer(comHolder.target);
+                comHolder.target.SetPosition(-100, -100, 0);
 
                 string resPath = ResPathUtil.GetViewEffectPath("ui_dj", "ui_dj");
                 SceneController.AddObjectToView(_gameObj, _wrapper, comHolder.m_holder, resPath, out _gameObj, out _wrapper);
+
                 GRoot.inst.onTouchBegin.Add(SetClickPos);
             }
         }

GameClient/Assets/Game/HotUpdate/HotUpdateEntry.cs

@@ -40,6 +40,8 @@ namespace GFGGame.HotUpdate
             //开始游戏
             GameController.Start().Coroutine();
             Debug.Log("HotUpdateEntry Start completed");
+            ViewManager.SetMaskAlpha(0.6f);
+
         }
 
     }

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

@@ -0,0 +1,159 @@
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+namespace ET
+{
+
+    public class NoticeMailCountChanged : AMHandler<Mail2C_MailCountChanged>
+    {
+        protected override async ETTask Run(Session session, Mail2C_MailCountChanged message)
+        {
+            MailDataManager.Instance.TotolCount = message.TotolCount;
+            MailDataManager.Instance.UnreadCount = message.UnreadCount;
+            await ETTask.CompletedTask;
+        }
+    }
+
+}
+namespace GFGGame
+{
+    public static class MailSProxy
+    {
+        public static async ETTask<bool> ReqMailCount()
+        {
+            Mail2C_GetMailCount response = null;
+            response = (Mail2C_GetMailCount)await MessageHelper.SendToServer(new C2Mail_GetMailCount());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    MailDataManager.Instance.TotolCount = response.TotolCount;
+                    MailDataManager.Instance.UnreadCount = response.UnreadCount;
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static async ETTask<bool> ReqMailList(int index, int count, bool sort)
+        {
+            Mail2C_GetMailList response = null;
+            response = (Mail2C_GetMailList)await MessageHelper.SendToServer(new C2Mail_GetMailList() { StartIndex = index, Count = count, NeedSort = sort });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    List<MailInfo> mailInfos = new List<MailInfo>();
+                    for (int i = 0; i < response.mailList.Count; i++)
+                    {
+                        MailInfo mailInfo = new MailInfo();
+                        mailInfo.mailId = response.mailList[i].MailId;
+                        mailInfo.title = response.mailList[i].Tile;
+                        mailInfo.timeSec = response.mailList[i].TimeSec;
+                        mailInfo.state = response.mailList[i].Status;
+                        mailInfo.hasItem = response.mailList[i].HasItem;
+                        mailInfos.Add(mailInfo);
+                    }
+                    MailDataManager.Instance.UpdateMailInfoList(mailInfos);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public static async ETTask<bool> ReqMailContent(long mailId)
+        {
+            Mail2C_GetMailData response = null;
+            response = (Mail2C_GetMailData)await MessageHelper.SendToServer(new C2Mail_GetMailData() { RoleId = mailId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    MailDataManager.Instance.UnreadCount = response.UnreadCount;
+
+                    int state = response.Status;
+                    string content = response.MailDetail.Content;
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.MailDetail.ItemList);
+                    MailDataManager.Instance.UpdateMailContent(response.MailId, state, content, itemDatas);
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqMailReward(long mailId)
+        {
+            M2C_GetMailItems response = null;
+            response = (M2C_GetMailItems)await MessageHelper.SendToServer(new C2M_GetMailItems() { MailId = mailId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    MailDataManager.Instance.UpdateMailContent(response.MailId, response.Status);
+                    List<ItemData> itemDatas = MailDataManager.Instance.GetMailInfoById(response.MailId).rewards;
+                    BonusController.TryShowBonusList(itemDatas);
+
+                    EventAgent.DispatchEvent(ConstMessage.MAIL_REFRESH);
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqDeleteMail(long mailId)
+        {
+            Mail2C_DeleteMail response = null;
+            response = (Mail2C_DeleteMail)await MessageHelper.SendToServer(new C2Mail_DeleteMail() { MailId = mailId });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    MailDataManager.Instance.TotolCount = response.TotolCount;
+                    EventAgent.DispatchEvent(ConstMessage.MAIL_CHANGE);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqAllMailRewards()
+        {
+            M2C_GetAllMailItems response = null;
+            response = (M2C_GetAllMailItems)await MessageHelper.SendToServer(new C2M_GetAllMailItems());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(response.ItemList);
+                    BonusController.TryShowBonusList(itemDatas);
+                    EventAgent.DispatchEvent(ConstMessage.MAIL_REFRESH);
+
+                    return true;
+                }
+            }
+            return false;
+        }
+        public static async ETTask<bool> ReqDeleteAllMails()
+        {
+            Mail2C_DeleteAllMails response = null;
+            response = (Mail2C_DeleteAllMails)await MessageHelper.SendToServer(new C2Mail_DeleteAllMails());
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    if (response.DeleteCount > 0)
+                    {
+                        MailDataManager.Instance.TotolCount = MailDataManager.Instance.TotolCount - response.DeleteCount;
+                        EventAgent.DispatchEvent(ConstMessage.MAIL_CHANGE);
+
+                    }
+
+                    return true;
+                }
+            }
+            return false;
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/MailSProxy.cs.meta

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

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

@@ -5,7 +5,7 @@ namespace GFGGame
 {
     public static class MessageHelper
     {
-        public static async ETTask<IResponse> SendToServer(IActorLocationRequest request, bool showError = true)
+        public static async ETTask<IResponse> SendToServer(IRequest request, bool showError = true)
         {
             IResponse response = null;
             Session session = GameGlobal.zoneScene.GetComponent<SessionComponent>().Session;
@@ -21,7 +21,7 @@ namespace GFGGame
                 }
                 return response;
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 Log.Error(e.ToString());
                 return null;

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -79,6 +79,7 @@ namespace GFGGame
             listItem.target.data = data;
             listItem.m_loaCard.m_loaCard.url = ResPathUtil.GetCardSmallPath(data.resources[data.resIndex]);
             listItem.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
+            listItem.m_loaBorder.url = "ui://Card/kp_kuang_" + data.itemCfg.rarity;//ResPathUtil.GetCommonGameResPath("kp_sxing_x_" + data.itemCfg.rarity);
             listItem.m_txtLv.text = "Lv.\n" + data.lv;
             listItem.m_txtName.text = data.itemCfg.name;
 

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -370,7 +370,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 4, "点击返回，回到换装", -1, true, 140);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 4, "回到换装", -1, true, 140);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -35,6 +35,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            ViewManager.SetMaskAlpha(0.8f);
 
             _cfgs = DailyLoginCfgArray.Instance.GetCfgs("1");
             _ui.m_list.numItems = _cfgs.Count;
@@ -45,6 +46,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            ViewManager.SetMaskAlpha(0.6f);
         }
         private void ListItemRender(int index, GObject obj)
         {

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

@@ -28,10 +28,10 @@ namespace GFGGame
         private const int SORT_BY_LOW_SCORE = 1;
         private int _scoreIndex = SORT_BY_HIGH_SCORE;
 
-
         private bool _guideMenu;
 
-        private UI_TypeItem listTypeItem_SingleFight;
+        private UI_TypeItem listTypeItem_SingleFight_Sy;
+        private UI_TypeItem listTypeItem_SingleFight_Xz;
         private UI_TypeItem listTypeItem_BuyClothing;
 
 
@@ -82,6 +82,7 @@ namespace GFGGame
             _ui.m_partsList2.m_list.onClickItem.Add(OnClickSuitPartsListItem);
             _ui.m_touchPad.onClick.Add(OnTouchPad);
             _ui.m_btnHint.onClick.Add(OnClickBtnHint);
+            _ui.m_btnGuide.onClick.Add(OnTouchPad);
             _ui.m_btnClose.onClick.Add(OnClickBtnClose);
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
@@ -181,6 +182,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+
             if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
@@ -189,8 +191,10 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
             _fightCfg = null;
             _levelCfg = null;
-            listTypeItem_SingleFight = null;
+            listTypeItem_SingleFight_Sy = null;
             listTypeItem_BuyClothing = null;
+
+
         }
 
         private void OnClickBtnBack()
@@ -208,11 +212,15 @@ namespace GFGGame
             {
                 ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
             }
+            EquipDataCache.cacher.TakeOffAll();
+
             this.Hide();
         }
 
         private void OnClickBtnHome()
         {
+            EquipDataCache.cacher.TakeOffAll();
+
             GameController.GoBackToMainView();
         }
 
@@ -665,6 +673,8 @@ namespace GFGGame
                 listItem.m_iconSelected.visible = false;
                 listItem.m_txtScore.text = "" + SuitUtil.GetSuitScore(id);
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, true);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
+
             }
             else
             {
@@ -673,6 +683,8 @@ namespace GFGGame
                 partName = itemCfg.name;
                 listItem.m_iconSelected.visible = EquipDataCache.cacher.CheckDressUpItemIsOn(id);
                 listItem.m_txtScore.text = "" + DressUpMenuItemDataManager.GetItemScore(id);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
+
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
                 ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
             }
@@ -694,6 +706,7 @@ namespace GFGGame
             iconRes = itemCfg.res;
             partName = itemCfg.name;
             listItem.m_iconSelected.visible = EquipDataCache.cacher.CheckDressUpItemIsOn(id);
+            listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
             ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
 
@@ -851,27 +864,41 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (listTypeItem_SingleFight == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_BuyClothing == null && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+
+
+            if (listTypeItem_SingleFight_Sy == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_SingleFight_Xz == null && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 || listTypeItem_BuyClothing == null && GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
             {
-                int len = _ui.m_comListType1.m_listType.numChildren;
-                for (int i = 0; i < len; i++)
+                // int len = _ui.m_comListType1.m_listType.numChildren;
+                for (int i = 0; i < _ui.m_comListType1.m_listType.numChildren; i++)
                 {
                     UI_TypeItem item = UI_TypeItem.Proxy(_ui.m_comListType1.m_listType.GetChildAt(i));
                     if (item != null)
                     {
                         int menuID = (int)item.target.data;
                         DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
-                        if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
-                        {
 
-                            if (dressUpMenuItemCfg1.type == ConstDressUpItemType.LIAN_YI_QUN)
-                            {
-                                listTypeItem_SingleFight = item;
-                                // _ui.m_comListType1.m_listType.ScrollToView(i);
-                                break;
-                            }
-                        }
-                        else if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
+                        // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
+                        // {
+
+                        //     if (dressUpMenuItemCfg1.type == ConstDressUpItemType.SHANG_YI)
+                        //     {
+                        //         listTypeItem_SingleFight_Sy = item;
+                        //         // _ui.m_comListType1.m_listType.ScrollToView(i);
+                        //         // break;
+                        //         syIndex = i;
+                        //     }
+                        //     if (dressUpMenuItemCfg1.type == ConstDressUpItemType.XIA_ZHUANG)
+                        //     {
+                        //         listTypeItem_SingleFight_Xz = item;
+                        //         // _ui.m_comListType1.m_listType.ScrollToView(i);
+                        //         // break;
+                        //         xzIndex = i;
+
+                        //     }
+                        // }
+                        // else 
+
+                        if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
                         {
                             int type = 0;
                             if (_fightCfg.needItemId > 0) type = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
@@ -879,7 +906,7 @@ namespace GFGGame
                             if (_fightCfg.needSuitId > 0) type = ConstDressUpItemType.TAO_ZHUANG;
 
 
-                            if (dressUpMenuItemCfg1.type == type)
+                            if (listTypeItem_BuyClothing == null && dressUpMenuItemCfg1.type == type)
                             {
                                 listTypeItem_BuyClothing = item;
                                 // _ui.m_comListType1.m_listType.ScrollToView(i);
@@ -890,13 +917,61 @@ namespace GFGGame
                 }
             }
 
-            if (listTypeItem_SingleFight != null) GuideController.TryGuide(listTypeItem_SingleFight.target, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类，可以快速找到服饰", -1, true, (int)listTypeItem_SingleFight.target.y);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "找到这条裙子了，换上看看吧", -1, true, (int)_ui.m_partsList.m_list.y);
-            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 5, "接下来验证一下，换上的服饰是否符合需求");
+            int syIndex = 0;
+            int xzIndex = 0;
+            int buyClothingIndex = 0;
+
+            int len = _ui.m_comListType1.m_listType.numChildren;
+            for (int i = 0; i < len; i++)
+            {
+                UI_TypeItem item = UI_TypeItem.Proxy(_ui.m_comListType1.m_listType.GetChildAt(i));
+                if (item != null)
+                {
+                    int menuID = (int)item.target.data;
+                    DressUpMenuItemCfg1 dressUpMenuItemCfg1 = DressUpMenuItemCfg1Array.Instance.GetCfg(menuID);
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.SHANG_YI)
+                    {
+                        syIndex = i;
+                    }
+                    if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0 && dressUpMenuItemCfg1.type == ConstDressUpItemType.XIA_ZHUANG)
+                    {
+                        xzIndex = i;
+                    }
+                    if (_fightCfg.needItemId > 0)
+                    {
+                        int type = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
+                        if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0 && dressUpMenuItemCfg1.type == type)
+                        {
+                            buyClothingIndex = i;
+                        }
+                    }
+                }
+            }
+            int djcId = 10476;//点绛唇Id
+            int djcIndex = 0;
+            int buyClothingIdIndex = 0;
+
+            for (int i = 0; i < _currentList3.Count; i++)
+            {
+                if (_currentList3[i] == djcId)
+                {
+                    djcIndex = i;
+                }
+                if (_fightCfg.needItemId > 0 && _currentList3[i] == _fightCfg.needItemId)
+                {
+                    buyClothingIdIndex = i;
+                }
+            }
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类，可以快速找到服饰", syIndex);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "", 0, true, (int)_ui.m_partsList.m_list.y);
+            GuideController.TryGuide(_ui.m_btnGuide, ConstGuideId.SINGLE_FIGHT, 5, "", -1, true, 0, 0, 0, false);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 6, "接下来把裙子也换上", xzIndex);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 7, "", 0, true, (int)_ui.m_partsList.m_list.y);
+            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕，来验证一下，换上的服饰是否符合需求");
 
             GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 1, "当提示有“必需品”时，需要穿上对应物品才能通关", -1, true, 170);
-            if (listTypeItem_BuyClothing != null) GuideController.TryGuide(listTypeItem_BuyClothing.target, ConstGuideId.BUY_CLOTHING, 5, "在相应分类里就可以找到必需品啦", -1, true, (int)listTypeItem_BuyClothing.target.y);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 6, "点击换上吧", 0, true, 170);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 5, "按照指示就可以找到必需品啦", buyClothingIndex, true, (int)listTypeItem_BuyClothing.target.y);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 6, "点击换上吧", buyClothingIdIndex, true, 170);
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 6);
 
             GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.TARGET_FIGHT, 1, "这次换装需要获得别人的认可呢");

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

@@ -112,6 +112,8 @@ namespace GFGGame
             base.OnHide();
             listTypeItem_FreedomDress = null;
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
+            EquipDataCache.cacher.TakeOffAll();
+
             if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
@@ -482,6 +484,8 @@ namespace GFGGame
                 partName = suitCfg.name;
                 listItem.m_iconSelected.visible = false;
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, true);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
+
                 listItem.m_ScoreType.visible = false;
 
             }
@@ -491,6 +495,8 @@ namespace GFGGame
                 iconRes = itemCfg.res;
                 partName = itemCfg.name;
                 listItem.m_iconSelected.visible = EquipDataCache.cacher.CheckDressUpItemIsOn(id);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
+
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
                 ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
 
@@ -523,6 +529,7 @@ namespace GFGGame
             iconRes = itemCfg.res;
             partName = itemCfg.name;
             listItem.m_iconSelected.visible = EquipDataCache.cacher.CheckDressUpItemIsOn(id);
+            listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
             ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
 

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

@@ -145,6 +145,10 @@ namespace GFGGame
 
             _listData = PhotographDataManager.Instance.GetListData(index);
             _ui.m_ComSelectRes.m_list.numItems = _listData.Count;
+            if (index == EnumPhotographType.BORDER || index == EnumPhotographType.EFFECT)
+            {
+                _ui.m_ComSelectRes.m_list.selectedIndex = 0;
+            }
         }
         private void RenderListItem(int index, GObject obj)
         {

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -89,6 +89,8 @@ namespace GFGGame
             _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
             _ui.m_rectFrameTemp.x = 0;
             _ui.m_rectFrameTemp.y = 0;
+
+            _ui.m_rectFrameTemp.visible = showAni;
             if (guideTarget != null)
             {
 
@@ -155,7 +157,7 @@ namespace GFGGame
 
                     if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) > targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) > targetWidth)
                     {
-                        _ui.m_rectFrameTemp.visible = true;
+                        // _ui.m_rectFrameTemp.visible = showAni;
                         float duration = 0.5f;
                         _ui.m_rectFrameTemp.TweenResize(new Vector2(_ui.m_rectFrame.target.width, _ui.m_rectFrame.target.height), duration);
                         _ui.m_rectFrameTemp.TweenMove(new Vector2(_ui.m_rectFrame.target.x, _ui.m_rectFrame.target.y), duration);

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -91,9 +91,10 @@ namespace GFGGame
             _valueBarController.OnShown();
             _valueBarController.Controller(4);
 
-            onClickChange(0);
+            // onClickChange(0);
+            // UpdateNormal();
+            OnListBgScroll();
             updateBoxEffect();
-            UpdateNormal();
         }
 
         private void RenderListBgItem(int index, GObject obj)

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

@@ -9,8 +9,8 @@ namespace GFGGame
     {
 
         private UI_MailContentUI _ui;
-        private int _index;
-
+        private int _childIndex;
+        private MailInfo mailInfo;
         public override void Dispose()
         {
             base.Dispose();
@@ -26,8 +26,6 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_listReward.itemRenderer = RenderListRewardItem;
-            // _ui.m_listReward.onClickItem.Add(OnClickListRewardItem);
-
             _ui.m_btnGet.onClick.Add(OnClickBtnGet);
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
 
@@ -35,58 +33,59 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            EventAgent.AddEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
+            // EventAgent.AddEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
 
-            _index = (int)this.viewData;
-            MailDataManager.Instance.ChangeMailReadState(_index);
-            MailData data = MailDataManager.Instance.mailListData[_index];
-            _ui.m_c1.selectedIndex = data.rewards.Count == 0 ? 0 : 1;
-            _ui.m_txtTitle.text = data.title;
+            _childIndex = (int)this.viewData;
+            mailInfo = MailDataManager.Instance.mailInfos[_childIndex];
+            _ui.m_c1.selectedIndex = mailInfo.rewards.Count == 0 ? 0 : 1;
+            _ui.m_txtTitle.text = mailInfo.title;
             _ui.m_ComContent.target.scrollPane.ScrollTop();
-            _ui.m_ComContent.m_txtTo.text = data.toName;
-            _ui.m_ComContent.m_txtFrom.text = data.fromName;
-            _ui.m_ComContent.m_txtContent.text = data.content;
+            _ui.m_ComContent.m_txtContent.text = mailInfo.content;
 
             UpdateNormal();
         }
         private void UpdateNormal()
         {
-            MailData data = MailDataManager.Instance.mailListData[_index];
-
-            _ui.m_btnGet.visible = data.rewards.Count > 0 && data.isGet == 0 ? true : false;
+            _ui.m_btnGet.visible = (ConstMailStatus)mailInfo.state == ConstMailStatus.ReadedButNotGet ? true : false;
             _ui.m_btnDelete.visible = _ui.m_btnGet.visible == true ? false : true;
-
-            _ui.m_listReward.numItems = data.rewards.Count;
+            _ui.m_listReward.numItems = mailInfo.rewards.Count;
         }
 
         private void RenderListRewardItem(int index, GObject obj)
         {
-            MailData data = MailDataManager.Instance.mailListData[_index];
-            ItemData reward = data.rewards[index];
+            ItemData reward = mailInfo.rewards[index];
             if (obj.data == null)
             {
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(reward);
-            (obj.data as ItemView).ImgGotVisible = data.isGet == 1 ? true : false;
+            (obj.data as ItemView).ImgGotVisible = (ConstMailStatus)mailInfo.state == ConstMailStatus.ReadedAndGot ? true : false;
         }
 
-        private void OnClickBtnGet()
+        private async void OnClickBtnGet()
         {
-            MailDataManager.Instance.GetRewards(_index);
+            bool result = await MailSProxy.ReqMailReward(mailInfo.mailId);
+            if (result)
+            {
+                mailInfo = MailDataManager.Instance.GetMailInfoById(mailInfo.mailId);
+                UpdateNormal();
+            }
         }
 
-        private void OnClickBtnDelete()
+        private async void OnClickBtnDelete()
         {
-            MailDataManager.Instance.DeleteMail(_index);
-            this.Hide();
+            bool result = await MailSProxy.ReqDeleteMail(mailInfo.mailId);
+            if (result)
+            {
+                this.Hide();
+            }
         }
 
-        protected override void OnHide()
-        {
-            base.OnHide();
-            EventAgent.RemoveEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
+        // protected override void OnHide()
+        // {
+        //     base.OnHide();
+        //     // EventAgent.RemoveEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
 
-        }
+        // }
     }
 }

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UI.Mail;
 using FairyGUI;
+using ET;
 
 namespace GFGGame
 {
@@ -12,7 +13,11 @@ namespace GFGGame
         private UI_MailUI _ui;
         private MailDataManager mailDataMgr;
         private const int _maxMailCount = 300;
+        private const int _retainDay = 30;//邮件保存时间
+        private const int _showCount = 5;//列表展示数量
+        private int _firstChildIndex = 0;//列表显示内容得一个项的显示对象索引
 
+        public bool _canShowContent = false;//获取内容数据返回前不可查看
         public override void Dispose()
         {
             base.Dispose();
@@ -29,12 +34,19 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.scrollPane.onScrollEnd.Add(OnListScrollEnd);
+            _ui.m_list.scrollPane.onScroll.Add(OnListScroll);
             _ui.m_list.SetVirtual();
 
             _ui.m_btnGet.onClick.Add(OnClickBtnGet);
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
+            EventAgent.AddEventListener(ConstMessage.MAIL_REFRESH, () =>
+            {
+                _ui.m_list.RefreshVirtualList();
+            });
+
+            EventAgent.AddEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
 
-            MailDataManager.Instance.GMSetList(20);
             mailDataMgr = MailDataManager.Instance;
         }
 
@@ -42,58 +54,96 @@ namespace GFGGame
         {
             base.OnShown();
 
-            EventAgent.AddEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
-
+            _firstChildIndex = 0;
             UpdateNormal();
-
         }
         private void UpdateNormal()
         {
-            int count = mailDataMgr.mailListData.Count;
-            _ui.m_list.numItems = count;
-            _ui.m_txtTips.visible = count == 0 ? true : false;
-            _ui.m_txtCount.text = string.Format("当前邮件：{0}/{1}", StringUtil.GetColorText(count.ToString(), count >= _maxMailCount ? "#B19977" : "#E27D78"), _maxMailCount);
+            _ui.m_list.numItems = mailDataMgr.TotolCount;
+            _ui.m_txtTips.visible = mailDataMgr.TotolCount == 0 ? true : false;
+            _ui.m_txtCount.text = string.Format("当前邮件：{0}/{1}", StringUtil.GetColorText(mailDataMgr.TotolCount.ToString(), mailDataMgr.TotolCount >= _maxMailCount ? "#B19977" : "#E27D78"), _maxMailCount);
             _ui.m_txtMaxCount.text = string.Format("最高可储存{0}封邮箱，请及时查看", _maxMailCount);
+            RefreshMailInfo(0, true);
         }
 
         private void RenderListItem(int index, GObject obj)
         {
+            int childIndex = _ui.m_list.ItemIndexToChildIndex(index);
             UI_ListItem item = UI_ListItem.Proxy(obj);
-            MailData data = mailDataMgr.mailListData[index];
+            if (mailDataMgr.mailInfos.Count == 0) return;
+            MailInfo data = mailDataMgr.mailInfos[childIndex];
             item.m_c1.selectedIndex = mailDataMgr.GetMailState(data);
-            item.m_txtDiscribe.text = string.Format("{0}...", data.content.Length > 10 ? data.content.Substring(0, 10) : data.content);
-            item.m_txtTime.text = string.Format("剩余时间：{0}天", data.remainingTime);
-            item.m_btnLook.onClick.Clear();
-            item.m_btnLook.onClick.Add(OnClickBtnLook);
-            item.m_btnLook.data = index;
+            item.m_txtTitle.text = data.title;// string.Format("{0}...", data.content.Length > 10 ? data.content.Substring(0, 10) : data.content);
+            string str = TimeUtil.FormattingTime(TimeHelper.ServerNowSecs, ((int)data.timeSec + _retainDay * TimeUtil.SECOND_PER_DAY));
+            item.m_txtTime.text = string.Format("剩余时间：{0}", str);
+            if (item.target.data == null)
+            {
+                item.m_btnLook.onClick.Add(OnClickBtnLook);
+            }
+            item.target.data = index;
+
+        }
+        private async void OnClickBtnLook(EventContext context)
+        {
+            if (!_canShowContent) return;
+            int index = (int)(context.data as GObject).data;
+            int childIndex = (int)_ui.m_list.ItemIndexToChildIndex(index);
+            bool result = await MailSProxy.ReqMailContent(mailDataMgr.mailInfos[childIndex].mailId);
+            if (result)
+            {
+                ViewManager.Show<MailContentView>(childIndex);
+            }
+        }
 
+
+        private void OnListScroll()
+        {
+            _canShowContent = false;
         }
-        private void OnClickBtnLook(EventContext context)
+        private void OnListScrollEnd()
         {
-            GButton btn = context.sender as GButton;
-            int data = (int)btn.data;
-            ViewManager.Show<MailContentView>(data);
+            _firstChildIndex = (int)_ui.m_list.GetChildAt(0).data;
+            RefreshMailInfo(_firstChildIndex, false);
         }
-        private void OnClickBtnGet()
+
+        private async void RefreshMailInfo(int index, bool needSort)
         {
-            mailDataMgr.GetAllRewards();
-            _ui.m_list.scrollPane.ScrollTop();
+            bool result = await MailSProxy.ReqMailList(index, _showCount, needSort);
+            if (result)
+            {
+                _ui.m_list.RefreshVirtualList();
+                _canShowContent = true;
+            }
+        }
+
+        private async void OnClickBtnGet()
+        {
+            bool result = await MailSProxy.ReqAllMailRewards();
+            if (result)
+            {
+                RefreshMailInfo(_firstChildIndex, false);
+            }
         }
 
         private void OnClickBtnDelete()
         {
             Alert.Show("是否删除所有已读文件？").SetLeftButton(true).SetRightButton(true, "确认", (object data) =>
             {
-                mailDataMgr.DeleteAllMail();
-                _ui.m_list.scrollPane.ScrollTop();
+                SendDeleteAll();
             });
-
+        }
+        private async void SendDeleteAll()
+        {
+            bool result = await MailSProxy.ReqDeleteAllMails();
+            if (result)
+            {
+                _ui.m_list.ScrollToView(0);
+                RefreshMailInfo(0, true);
+            }
         }
         protected override void OnHide()
         {
             base.OnHide();
-            EventAgent.RemoveEventListener(ConstMessage.MAIL_CHANGE, UpdateNormal);
-
         }
     }
 }

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

@@ -23,7 +23,6 @@ namespace GFGGame
             if (levelCfg.fightID.Length > 0)
             {
                 ViewManager.Show(ViewName.STORY_LEVEL_INFO_VIEW, levelCfgId);
-                ViewManager.SetMaskAlpha(0.8f);
             }
             else if (!string.IsNullOrEmpty(levelCfg.storyStartID))
             {

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

@@ -32,7 +32,7 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_listChapter.onClickItem.Add(OnClickListChapterItem);
+            // _ui.m_listChapter.onClickItem.Add(OnClickListChapterItem);
             _ui.m_listTab.onClickItem.Add(OnClickListTabItem);
             _ui.m_listType.onClickItem.Add(OnClickListTypeItem);
 
@@ -77,7 +77,7 @@ namespace GFGGame
         private void OnClickListChapterItem(EventContext context)
         {
             // GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_STORY);
-            GObject chapterItem = context.data as GObject;
+            GObject chapterItem = context.sender as GObject;
             int chapterID = (int)chapterItem.data;
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
@@ -106,7 +106,12 @@ namespace GFGGame
             listItem.m_content.m_txtLv.text = StoryUtil.GetChapterOrder(chapterCfg.id).ToString();
             listItem.m_content.m_txtTitle.text = chapterCfg.name;
             listItem.m_content.m_compPic.m_pic.url = "ui://Main/" + chapterCfg.res;
+            if (listItem.m_content.target.data == null)
+            {
+                listItem.m_content.target.onClick.Add(OnClickListChapterItem);
+            }
             listItem.target.data = chapterCfg.id;
+            listItem.m_content.target.data = chapterCfg.id;
         }
 
         private void UpdateList()

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

@@ -15,6 +15,8 @@ namespace GFGGame
         private UI_CompArrow _arrow;
         private GameObject _sceneObject;
         private GameObject _scenePrefab;
+        private GameObject _npcHead;
+        private GoWrapper _npcWrapper;
         private GTextField _wordTextField;
         //žçÇéÍęłÉťŘľ÷
         private OnCompleteStoryDialogCall _onCompleteStoryDialogCall;
@@ -46,7 +48,10 @@ namespace GFGGame
             _wordTextField = null;
             _arrow = null;
             _isShowLetters = false;
+            SceneController.DestroyObjectFromView(_npcHead);
+
             Timers.inst.Remove(UpdateLetters);
+
         }
 
         protected override void Init()
@@ -310,6 +315,7 @@ namespace GFGGame
             string words = content;
             string roleName = storyDialogCfg.name;
             string headRes = storyDialogCfg.head;
+            string headAniRes = storyDialogCfg.headAni;
             if (roleName == "self")
             {
                 roleName = RoleDataManager.roleName;
@@ -319,12 +325,29 @@ namespace GFGGame
             {
                 _dialogListLookBack.Add("[color=#FDA2B1]" + roleName + "[/color]");
             }
-            if (!string.IsNullOrEmpty(headRes))
+            if (!string.IsNullOrEmpty(headAniRes))
             {
                 _ui.m_dialogText.target.visible = false;
                 _ui.m_dialogName.target.visible = false;
                 _ui.m_dialogHead.target.visible = true;
                 _ui.m_dialogHead.m_txtName.text = roleName;
+                _ui.m_dialogHead.m_comphead.m_head.visible = false;
+                _ui.m_dialogHead.m_comphead.m_holder.visible = true;
+                string resPath = ResPathUtil.GetViewEffectPath("ui_nzbq", headAniRes);
+                SceneController.AddObjectToView(_npcHead, _npcWrapper, _ui.m_dialogHead.m_comphead.m_holder, resPath, out _npcHead, out _npcWrapper);
+                _npcHead.transform.localScale = new Vector3(-100, 100, 100);
+                _wordTextField = _ui.m_dialogHead.m_txtContent;
+                _arrow = _ui.m_dialogHead.m_iconNext;
+            }
+            else if (!string.IsNullOrEmpty(headRes))
+            {
+                _ui.m_dialogText.target.visible = false;
+                _ui.m_dialogName.target.visible = false;
+                _ui.m_dialogHead.target.visible = true;
+                _ui.m_dialogHead.m_txtName.text = roleName;
+                _ui.m_dialogHead.m_comphead.m_head.visible = true;
+                _ui.m_dialogHead.m_comphead.m_holder.visible = false;
+
                 _ui.m_dialogHead.m_comphead.m_head.url = ResPathUtil.GetNpcHeadPath(headRes);
                 _wordTextField = _ui.m_dialogHead.m_txtContent;
                 _arrow = _ui.m_dialogHead.m_iconNext;

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

@@ -21,7 +21,7 @@ namespace GFGGame
         private const float _prefectScale = 60f;//完美缩放比
         private float _time = 0;// 登峰造极按住的时间
 
-        private float _playTime = 2.3f;
+        private float _playTime = 2.3f / 2;
         private bool _stopFight = false;
 
         private GameObject _gameObject0;
@@ -264,6 +264,10 @@ namespace GFGGame
             {
                 allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
             }
+            else
+            {
+                Timers.inst.Add(1f, 1, Skip);
+            }
 
             _ui.m_comAllCircle.m_txtCount.text = ((int)Math.Round(allCircleScore)).ToString();
 
@@ -417,13 +421,13 @@ namespace GFGGame
             float scaleX = _gameObject7.transform.localScale.x;
             if (scaleX == _prefectScale)
             {
-                bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 6, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧");
+                bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧");
                 if (isGuide)
                 {
                     _ui.m_comClickCircle.target.touchable = true;
                 }
             }
-            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 6);
+            GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 9);
         }
     }
 }

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

@@ -42,6 +42,12 @@ namespace GFGGame
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
             SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            if (!string.IsNullOrEmpty(fightCfg.music))
+            {
+                MusicManager.Instance.Play(ResPathUtil.GetMusicPath(fightCfg.music, "mp3"));
+            }
             _ui.m_roleName.m_txtName.text = RoleDataManager.roleName;
             Timers.inst.Add(0.9f, 1, (object param) =>
             {

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

@@ -297,15 +297,15 @@ namespace GFGGame
             double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
             _ui.m_comMineCircle.m_txtCount.text = ((int)partScore).ToString();
             _score += (partScore + _skillScore);
-            Debug.Log("zoya: " + "partScore:" + partScore + "_skillScore: " + _skillScore + " _score:" + _score);
-            Debug.Log("zoya: " + (int)Math.Round(_score));
+            // Debug.Log("zoya: " + "partScore:" + partScore + "_skillScore: " + _skillScore + " _score:" + _score);
+            // Debug.Log("zoya: " + (int)Math.Round(_score));
             EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
-            Debug.Log("zoya: " + EquipDataCache.cacher.totalScore);
+            // Debug.Log("zoya: " + EquipDataCache.cacher.totalScore);
 
 
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
             double targetScore = fightCfg.targetPartsScoreArr[_index] * ConstScoreSystem.PART_SCORE;
-            Debug.Log("targetScore:" + targetScore);
+            // Debug.Log("targetScore:" + targetScore);
             _ui.m_comTargetCircle.m_txtCount.text = ((int)targetScore).ToString();
             _targetScore += targetScore;
             EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);

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

@@ -11,7 +11,7 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if(_scenePrefab != null)
+            if (_scenePrefab != null)
             {
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
@@ -37,7 +37,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            if(_sceneObject == null)
+
+            if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
             }
@@ -45,9 +46,14 @@ namespace GFGGame
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);
+            if (!string.IsNullOrEmpty(fightCfg.music))
+            {
+                MusicManager.Instance.Play(ResPathUtil.GetMusicPath(fightCfg.music, "mp3"));
+            }
             _ui.m_roleName.m_txtName.text = RoleDataManager.roleName;
             _ui.m_targetName.m_txtName.text = fightCfg.targetName;
-            Timers.inst.Add(1.1f, 1, (object param) => {
+            Timers.inst.Add(1.1f, 1, (object param) =>
+            {
                 this.Hide();
                 ViewManager.Show(ViewName.STORY_FIGHT_TARGET_SCORE_VIEW);
             });
@@ -56,7 +62,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            if(_sceneObject != null)
+            if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;

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

@@ -40,6 +40,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            ViewManager.SetMaskAlpha(0.8f);
+
             _levelID = (int)viewData;
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             _type = levelCfg.type;
@@ -55,7 +57,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
+            ViewManager.SetMaskAlpha(0.6f);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBtnFightTimes);
         }
 

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

@@ -77,6 +77,7 @@ namespace GFGGame
             }
             InstanceZonesDataManager.usedRecommend = false;
             SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
+            MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
 
             _ui.m_txtScore.text = "" + _resultData.Score;
             _ui.m_expBar.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);

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

@@ -242,7 +242,6 @@ namespace GFGGame
             // {
             //     _ui.m_btnDailyLogin.m_holder.visible = false;
             ViewManager.Show<DailyLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
-            ViewManager.SetMaskAlpha(0.8f);
             //     isOpen = false;
             // });
         }