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

FGUIProject/assets/Arena/ArenaUI.xml

@@ -12,13 +12,7 @@
     <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n28_psph" controller="c1,12"/>
     <image id="n37_jcej" name="n37" src="jcej3d" fileName="images/jzsjzs_bzztzt.png" xy="358,154" group="n28_psph"/>
-    <component id="n25_psph" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="354,282" size="102,38" group="n38_jcej"/>
-    <loader id="n22_psph" name="loaScore0" xy="466,276" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <image id="n39_jcej" name="n39" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="520,287" group="n38_jcej"/>
-    <loader id="n23_psph" name="loaScore1" xy="556,276" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <image id="n40_jcej" name="n40" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="610,287" group="n38_jcej"/>
-    <loader id="n24_psph" name="loaScore2" xy="646,276" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
-    <group id="n38_jcej" name="grpTheme" xy="354,276" size="336,44" group="n28_psph" advanced="true" layout="hz" colGap="10" excludeInvisibles="true"/>
+    <component id="n25_psph" name="comTheme" src="t6j15b" fileName="components/ComTheme.xml" xy="354,276" group="n28_psph"/>
     <image id="n41_jcej" name="n41" src="jcej36" fileName="images/jzsjzs_sjsjdi.png" xy="659,353" group="n42_jcej"/>
     <text id="n27_psph" name="txtTime" xy="728,359" size="313,41" group="n42_jcej" fontSize="30" color="#fbf6ed" text="赛季时间：01/05-05/21"/>
     <component id="n21_psph" name="btnRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="693,366" size="29,29" group="n42_jcej">

FGUIProject/assets/Arena/components/ComTheme.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="336,75">
+  <displayList>
+    <component id="n25_psph" name="comTag" src="ih7566" fileName="components/ComTag.xml" pkg="eg2y0ldp" xy="0,21" size="102,38" group="n38_jcej"/>
+    <loader id="n22_psph" name="loaScore0" xy="112,15" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <image id="n39_jcej" name="n39" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="166,26" group="n38_jcej"/>
+    <loader id="n23_psph" name="loaScore1" xy="202,15" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <image id="n40_jcej" name="n40" src="jcej3c" fileName="images/jzsjzs_dian.png" xy="256,26" group="n38_jcej"/>
+    <loader id="n24_psph" name="loaScore2" xy="292,15" size="44,44" group="n38_jcej" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <group id="n38_jcej" name="grpTheme" xy="0,15" size="336,44" advanced="true" layout="hz" colGap="10" excludeInvisibles="true"/>
+  </displayList>
+</component>

FGUIProject/assets/Arena/package.xml

@@ -171,6 +171,7 @@
     <image id="rv0958" name="dljm_jdq_5.png" path="/images/"/>
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
+    <component id="t6j15b" name="ComTheme.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/LimitChargeUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" overflow="hidden">
   <displayList>
-    <loader id="n11_idkd" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    <loader id="n11_idkd" name="loaBg" xy="540,0" pivot="0.5,0" anchor="true" size="1080,716" fill="scaleMatchWidth" autoSize="true">
+      <relation target="" sidePair="top-top"/>
     </loader>
     <component id="n10_idkd" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <image id="n7_idkd" name="n7" src="nyhm5" fileName="imagesNew/sj_db.png" pkg="eg2y0ldp" xy="736,59" group="n6_idkd"/>

FGUIProject/assets/EnduringGiftBox/EnduringGiftBoxUI.xml

@@ -73,4 +73,7 @@
     <item time="0" type="Alpha" target="n31_qqhz" tween="true" startValue="0" endValue="1" duration="19"/>
     <item time="19" type="Alpha" target="n31_qqhz" tween="true" startValue="1" endValue="0" duration="23"/>
   </transition>
+  <transition name="t3">
+    <item time="18" type="Visible" target="n36_qqhz" value="true"/>
+  </transition>
 </component>

FGUIProject/assets/Friend/FriendUI.xml

@@ -32,5 +32,6 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="一键领取"/>
     </component>
+    <text id="n22_duuf" name="txtPowerCount" xy="694,1860" pivot="0.5,0" size="339,44" fontSize="32" color="#f8e7e7" align="center" letterSpacing="-2" vars="true" autoSize="none" text="今日剩余领取体力：{value=0}/{maxValue=20}"/>
   </displayList>
 </component>

FGUIProject/assets/League/LeagueConstructUI.xml

@@ -5,11 +5,11 @@
     <image id="n46_o9gh" name="n46" src="o9gh4q" fileName="images/biaotizi_8.png" xy="207,102"/>
     <component id="n73_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="913,51"/>
     <image id="n43_o9gh" name="n43" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="118,187" group="n7_rv09"/>
-    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="150,223" group="n7_rv09" pkg="eg2y0ldp"/>
+    <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="150,223" group="n7_rv09"/>
     <loader id="n0_rv09" name="loaIcon" xy="197,267" size="127,127" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n42_o9gh" name="n42" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="135,435" group="n7_rv09"/>
-    <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,48" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
-    <image id="n40_o9gh" name="n40" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="300,382" group="n44_o9gh" pkg="eg2y0ldp"/>
+    <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,47" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
+    <image id="n40_o9gh" name="n40" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="300,382" group="n44_o9gh"/>
     <text id="n41_o9gh" name="txtLv0" xy="301,376" pivot="0.5,0" size="35,44" group="n44_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffcf2" text="10"/>
     <group id="n44_o9gh" name="n44" xy="300,376" size="39,45" group="n7_rv09"/>
     <group id="n7_rv09" name="n7" xy="118,187" size="274,736" group="n10_rv09"/>
@@ -23,11 +23,11 @@
     <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="160,792" group="n10_rv09"/>
     <group id="n10_rv09" name="n10" xy="118,187" size="274,736" group="n67_o9gh"/>
     <image id="n47_o9gh" name="n47" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="412,187" group="n55_o9gh"/>
-    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="444,223" group="n55_o9gh" pkg="eg2y0ldp"/>
+    <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="444,223" group="n55_o9gh"/>
     <loader id="n49_o9gh" name="loaIcon1" xy="491,267" size="127,127" group="n55_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n50_o9gh" name="n50" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="429,435" group="n55_o9gh"/>
-    <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,48" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
-    <image id="n52_o9gh" name="n52" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="594,382" group="n54_o9gh" pkg="eg2y0ldp"/>
+    <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,47" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
+    <image id="n52_o9gh" name="n52" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="594,382" group="n54_o9gh"/>
     <text id="n53_o9gh" name="txtLv1" xy="595,376" pivot="0.5,0" size="35,44" group="n54_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffcf2" text="10"/>
     <group id="n54_o9gh" name="n54" xy="594,376" size="39,45" group="n55_o9gh"/>
     <group id="n55_o9gh" name="n55" xy="412,187" size="274,736" group="n17_rv09"/>
@@ -50,11 +50,11 @@
     </component>
     <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
     <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
-    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="images/lm_kuang_icon.png" xy="749,223" group="n65_o9gh" pkg="eg2y0ldp"/>
+    <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="749,223" group="n65_o9gh"/>
     <loader id="n59_o9gh" name="loaIcon2" xy="796,267" size="127,127" group="n65_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
     <image id="n60_o9gh" name="n60" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="734,435" group="n65_o9gh"/>
-    <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,48" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>
-    <image id="n62_o9gh" name="n62" src="a0cf2k" fileName="images/lm_db_lvl.png" xy="899,382" group="n64_o9gh" pkg="eg2y0ldp"/>
+    <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,47" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>
+    <image id="n62_o9gh" name="n62" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="899,382" group="n64_o9gh"/>
     <text id="n63_o9gh" name="txtLv2" xy="900,376" pivot="0.5,0" size="35,44" group="n64_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffcf2" text="10"/>
     <group id="n64_o9gh" name="n64" xy="899,376" size="39,45" group="n65_o9gh"/>
     <group id="n65_o9gh" name="n65" xy="717,187" size="274,736" group="n28_rv09"/>

FGUIProject/assets/League/LeagueMemberUI.xml

@@ -43,7 +43,9 @@
     <component id="n24_rv09" name="btnMemberLog" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="544,1564" group="n25_rv09">
       <Button title="雅集信息"/>
     </component>
-    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="771,1562" group="n25_rv09"/>
+    <component id="n21_rv09" name="btnExit" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="771,1562" group="n25_rv09">
+      <Button title="退出雅集"/>
+    </component>
     <group id="n25_rv09" name="n25" xy="90,1562" size="900,61" advanced="true" layout="hz" colGap="40" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/League/LeagueUI.xml

@@ -16,7 +16,9 @@
     <component id="n19_u2u3" name="btnConstruct" src="u2u31b" fileName="components/Button3.xml" xy="346,81" controller="c1,0">
       <Button title="雅集建设"/>
     </component>
-    <text id="n30_gfx4" name="txtLowKeep" xy="771,32" pivot="1,0" size="255,41" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#ff0000" align="right" text="已连续低维护：1天"/>
+    <image id="n32_duuf" name="n32" src="duuf82" fileName="images/lm_zjm_lxdwh_db.png" xy="125,219" group="n33_duuf"/>
+    <text id="n30_gfx4" name="txtLowKeep" xy="171,215" pivot="0.5,0" size="242,39" group="n33_duuf" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#68430f" align="right" text="已连续低维护：1天"/>
+    <group id="n33_duuf" name="grpLowKeep" xy="125,215" size="345,39" advanced="true"/>
     <image id="n23_o9gh" name="n23" src="o9gh45" fileName="images/lm_zjm_lmmzkuang.png" xy="139,261" group="n31_fqor"/>
     <text id="n10_u2u3" name="txtUnionName" xy="185,263" pivot="0.5,0" size="212,44" group="n31_fqor" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fff6dc" align="center" autoClearText="true" text="雅集名字7个字"/>
     <component id="n20_a0cf" name="comLeagueHead" src="a0cf30" fileName="components/ComLeagueHead.xml" xy="44,213" group="n31_fqor"/>

FGUIProject/assets/League/components/Button20.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="189,58" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="3"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver,4,disabled" selected="0"/>
   <displayList>
-    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="images/lm_an__weixuan_qifu.png" xy="0,0" pkg="eg2y0ldp">
+    <image id="n7_o9gh" name="n7" src="o9gh4l" fileName="imagesNew/an__weixuan_qifu.png" pkg="eg2y0ldp" xy="0,0">
       <gearDisplay controller="button" pages="4"/>
     </image>
-    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://eg2y0ldpo9gh4k" fill="scale" autoSize="true">
+    <loader id="n4_u2u3" name="icon" xy="0,0" size="189,58" aspect="true" url="ui://eg2y0ldpmbf1tn8" fill="scale" autoSize="true">
       <gearDisplay controller="button" pages="0,1,2,3"/>
     </loader>
     <text id="n3_u2u3" name="title" xy="64,9" pivot="0.5,0" size="60,39" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#683c28" align="center" vars="true" text="升级">

FGUIProject/assets/League/package.xml

@@ -201,6 +201,7 @@
     <image id="l5007z" name="yj_zz.png" path="/images/"/>
     <component id="idkd80" name="ComSkillUp.xml" path="/"/>
     <component id="vols81" name="ComLine.xml" path="/components/"/>
+    <image id="duuf82" name="lm_zjm_lxdwh_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/MainUI.xml

@@ -80,41 +80,41 @@
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
-    <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
+    <component id="n73_mzf8" name="btnArena" src="mzf8it" fileName="components/ButtonModle6.xml" xy="70,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv461j7"/>
     </component>
-    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="616,1195" group="n58_oju1">
+    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="615,1195" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8ik"/>
       <property target="loaLockIcon" propertyId="1" value=""/>
       <property target="icon1" propertyId="1" value=""/>
     </component>
-    <component id="n44_n3xh" name="btnStudio" src="mzf8ip" fileName="components/ButtonModle2.xml" xy="344,673" group="n58_oju1">
+    <component id="n44_n3xh" name="btnStudio" src="mzf8ip" fileName="components/ButtonModle2.xml" xy="343,673" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8im"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482ft"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="754,893" group="n58_oju1">
+    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="753,893" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8il"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kwonohg"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="119,1487" group="n58_oju1">
+    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="118,1487" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8ij"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fr"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="664,1584" group="n58_oju1">
+    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="663,1584" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8io"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
       <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fv"/>
     </component>
-    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="150,1447" size="200,234" group="n58_oju1" scale="-1,1"/>
-    <group id="n58_oju1" name="grpRight" xy="71,447" size="1010,1497" group="n59_oju1" advanced="true">
+    <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="-46,1447" size="200,234" group="n58_oju1" controller="c1,1"/>
+    <group id="n58_oju1" name="grpRight" xy="-46,447" size="1126,1497" group="n59_oju1" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <group id="n59_oju1" name="grpMove" xy="0,85" size="1130,1859" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="-46,85" size="1176,1859" advanced="true"/>
     <loader id="n66_v95q" name="loaGuidestudio" xy="0,0" size="1080,1920" visible="false"/>
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>

FGUIProject/assets/Main/components/Component7.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,234">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n69_weok" name="loaRight" xy="100,117" pivot="0.5,0.5" anchor="true" size="200,234" scale="0.8,0.8" url="ui://mfvz4q8kv95qhx" autoSize="true"/>
-    <graph id="n70_weok" name="holder" xy="90,120" size="1,1">
+    <loader id="n69_weok" name="loaRight" xy="100,117" pivot="0.5,0.5" anchor="true" size="200,234" scale="-0.8,0.8" url="ui://mfvz4q8kv95qhx" autoSize="true">
+      <gearSize controller="c1" pages="1" values="200,234,-0.8,0.8" default="200,234,0.8,0.8"/>
+    </loader>
+    <graph id="n70_weok" name="holder" xy="90,120" size="1,1" scale="-1,1">
+      <gearSize controller="c1" pages="1" values="1,1,-1,1" default="1,1,1,1"/>
       <relation target="n69_weok" sidePair="right-right"/>
     </graph>
   </displayList>

FGUIProject/assets/RoleInfo/RoleInfoUI.xml

@@ -10,14 +10,14 @@
     <component id="n18_d4iw" name="btnHelp" src="d4iw6p" fileName="components/ButtonHelp.xml" xy="983,129">
       <Button title="?" titleColor="#000000"/>
     </component>
-    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n52_r9ri" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n33_r9ri" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="96,147" group="n53_oqa1" scale="1.3,1.3"/>
     <image id="n29_r9ri" name="n29" src="ysx9gg" fileName="images/zjm_dj_1.png" xy="305,329" group="n53_oqa1"/>
-    <text id="n30_r9ri" name="txtLvl" xy="314,336" size="31,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
+    <text id="n30_r9ri" name="txtLvl" xy="314,336" size="27,34" group="n53_oqa1" fontSize="24" color="#ffffff" align="center" text="99">
       <relation target="n29_r9ri" sidePair="center-center,middle-middle"/>
     </text>
     <image id="n32_r9ri" name="n32" src="r9ri16" fileName="images/grxx_zyshul.png" xy="158,375" group="n53_oqa1"/>
-    <text id="n36_r9ri" name="txtExp" xy="220,373" pivot="0.5,0" size="33,34" group="n53_oqa1" fontSize="24" color="#fbedda" letterSpacing="-2" text="0/1"/>
+    <text id="n36_r9ri" name="txtExp" xy="219,373" pivot="0.5,0" size="34,34" group="n53_oqa1" fontSize="24" color="#fbedda" letterSpacing="-2" text="0/1"/>
     <group id="n53_oqa1" name="n53" xy="96,147" size="259,260" group="n37_r9ri"/>
     <image id="n50_r9ri" name="n50" src="r9rim" fileName="images/grxx_xtxtx.png" xy="417,297" size="576,6" group="n54_oqa1"/>
     <text id="n5_d4iw" name="txtRoleName" xy="428,214" size="328,64" group="n54_oqa1" fontSize="48" color="#927346" align="center" letterSpacing="-2" text="玩家名称七个字"/>
@@ -43,7 +43,7 @@
       <relation target="" sidePair="top-top"/>
     </group>
     <image id="n42_r9ri" name="n42" src="r9ri13" fileName="images/grxx_zydik.png" xy="0,1780" group="n46_r9ri"/>
-    <component id="n44_r9ri" name="btnSkill" src="r9ri1k" fileName="components/Button3.xml" xy="805,1807" group="n46_r9ri"/>
+    <component id="n44_r9ri" name="btnSkill" src="r9ri1k" fileName="components/Button3.xml" xy="805,1807" group="n46_r9ri" visible="false"/>
     <component id="n45_r9ri" name="btnSetting" src="r9ri1l" fileName="components/Button4.xml" xy="935,1807" group="n46_r9ri"/>
     <group id="n46_r9ri" name="n46" xy="0,1780" size="1080,140" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Studio/StudioUI.xml

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

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -55,7 +55,7 @@ namespace GFGEditor
         public static string PicSMd5FileSaveName = "PicSMd5";
 
 
-        public static string[] BgSrcPaths { get { return new string[] { ResRootPathDressUp + "scene/" }; } }
+        public static string[] BgSrcPaths { get { return new string[] { ResRootPath + "scene/" }; } }
         public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string BgMd5FileSaveName = "BgMd5";
 
@@ -109,8 +109,8 @@ namespace GFGEditor
         public static string ModelMd5FileSaveName = "ModelMd5";
 
 
-        public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Texture_DIR_PATH}/Effect/" }; } }
-        public static string TextureTargetPath = $"{ResPathUtil.Texture_DIR_PATH}/Effect/";
+        public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.TEXTURE_DIR_PATH}/Effect/" }; } }
+        public static string TextureTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Effect/";
         public static string EffectTextureMd5FileSaveName = "EffectTextureMd5";
 
 

GameClient/Assets/Editor/Excel/ExcelChecker.cs

@@ -260,7 +260,7 @@ namespace GFGEditor
 
         private static void CheckClothingSyntheticCfgExist(ItemCfg itemCfg)
         {
-            if (itemCfg.suitId > 0)
+            if (itemCfg.itemType == ConstItemType.DRESS_UP && itemCfg.suitId > 0)
             {
                 var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
                 if (suitCfg != null && suitCfg.syntheticType > 0)

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -24,7 +24,7 @@ namespace GFGEditor
             int suitPartTotalCount = 0;
             foreach (ItemCfg cfg in dataArray)
             {
-                HandleSuitTable(cfg, suitDic);
+                HandleItemAndSuitTable(cfg, suitDic);
                 HandleItemApproch(cfg, actions);
             }
             var globalCfg = GlobalCfgArray.globalCfg;
@@ -34,8 +34,8 @@ namespace GFGEditor
                 //物品
                 foreach (ItemCfg cfg in dataArray)
                 {
-                    var names = new string[] { nameof(cfg.subType), nameof(cfg.itemType), nameof(cfg.approach) };
-                    var values = new string[] { "" + cfg.subType, "" + cfg.itemType, "" + cfg.approach };
+                    var names = new string[] { nameof(cfg.subType), nameof(cfg.itemType), nameof(cfg.approach), nameof(cfg.isHide) };
+                    var values = new string[] { "" + cfg.subType, "" + cfg.itemType, "" + cfg.approach, "" + cfg.isHide };
                     SQLiteHelper.Instance.UpdateValues(nameof(ItemCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
                 }
                 //套装
@@ -69,7 +69,7 @@ namespace GFGEditor
             SQLiteHelper.Instance.UpdateValues(nameof(GlobalCfgArray), names, values, nameof(globalCfg.id), globalCfg.id.ToString());
         }
 
-        private static void HandleSuitTable(ItemCfg itemCfg, Dictionary<SuitCfg, List<int>> suitDic)
+        private static void HandleItemAndSuitTable(ItemCfg itemCfg, Dictionary<SuitCfg, List<int>> suitDic)
         {
             if (itemCfg.suitId <= 0)
             {
@@ -80,13 +80,17 @@ namespace GFGEditor
             {
                 return;
             }
-            suitDic.TryGetValue(suitCfg, out var partsList);
-            if (partsList == null)
+            if(itemCfg.itemType == ConstItemType.DRESS_UP)
             {
-                partsList = new List<int>();
-                suitDic[suitCfg] = partsList;
+                suitDic.TryGetValue(suitCfg, out var partsList);
+                if (partsList == null)
+                {
+                    partsList = new List<int>();
+                    suitDic[suitCfg] = partsList;
+                }
+                partsList.Add(itemCfg.id);
             }
-            partsList.Add(itemCfg.id);
+            itemCfg.isHide = suitCfg.isHide;
         }
 
         private static void HandleItemApproch(ItemCfg cfg, GetApproachCall[] actions)
@@ -261,6 +265,10 @@ namespace GFGEditor
             {
                 return null;
             }
+            if(itemCfg.itemType != ConstItemType.DRESS_UP)
+            {
+                return null;
+            }
             if (itemCfg.suitId <= 0)
             {
                 return null;
@@ -300,6 +308,10 @@ namespace GFGEditor
             {
                 return null;
             }
+            if (itemCfg.itemType != ConstItemType.DRESS_UP)
+            {
+                return null;
+            }
             if (itemCfg.suitId <= 0)
             {
                 return null;

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

@@ -25,18 +25,29 @@ namespace GFGGame
         public const string TARGET_FIGHT = "TARGET_FIGHT";
         public const string SKILL_CARD_FIGHT = "SKILL_CARD_FIGHT";
         public const string UP_CARD_LV = "UP_CARD_LV";
+        public const string ENTER_CHAPTER_1 = "ENTER_CHAPTER_1";
         public const string AUTOPLAY_FIGHT = "AUTOPLAY_FIGHT";
-        public const string STUDIO_METAL = "STUDIO_METAL";
+        public const string STUDIO_PORCELAIN = "STUDIO_PORCELAIN";
+        public const string ENTER_CHAPTER_2 = "ENTER_CHAPTER_2";
         public const string CLOTHING_DECOMPOSE = "CLOTHING_DECOMPOSE";
         public const string CLOTHING_SYNTHETIC = "CLOTHING_SYNTHETIC";
+
+        public const string ENTER_CHAPTER_3 = "ENTER_CHAPTER_3";
+        public const string UP_CARD_STAR = "UP_CARD_STAR";
+        public const string STUDIO_PROPERTY = "STUDIO_PROPERTY";
+        public const string ENTER_CHAPTER_4 = "ENTER_CHAPTER_4";
+        public const string ARENA_OPEN = "ARENA_OPEN";
+        public const string ENTER_CHAPTER_5 = "ENTER_CHAPTER_5";
+
         public const string STUDIO_FILING = "STUDIO_FILING";
-        public const string OPEN_TAGS = "OPEN_TAGS";
+        // public const string OPEN_TAGS = "OPEN_TAGS";
         public const string POEM = "POEM";
         public const string TRAVEL = "TRAVEL";
         public const string SUIT_LIST_VIEW = "SUIT_LIST_VIEW";
         public const string FIELD = "FIELD";
         public const string LUCKY_BOX = "LUCKY_BOX";
         public const string LUCKY_BOX_LINE = "LUCKY_BOX_LINE";
+        public const string BUY_POWER = "BUY_POWER";
 
     }
 }

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

@@ -189,22 +189,26 @@ namespace GFGGame
             GameGlobal.zoneScene.GetComponent<AccountInfoComponent>()?.Clear();
             if (logout)
             {
-                Logout();
+                QDManager.Logout();
+                PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
             }
-            LoginController.OnLogout();
             ViewManager.Hide<GuideView>();
             ViewManager.Show<LoginView>(null, null, true);
         }
 
-        //注销
-        public static void Logout()
+        //断线重连后需要处理的事情
+        public static void OnReconnected()
         {
-            QDManager.Logout();
-            PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
+            //重连成功请求邮件和公告等离线后会变更的数据
+            NoticeSProxy.ReqSystemNoticeList().Coroutine();
+            MailSProxy.ReqMailCount().Coroutine();
+            FriendSProxy.ReqAllFriendInfos().Coroutine();
+            PoemGallerySProxy.ReqGalleryTheme().Coroutine();
         }
 
         public static void GoBackToMainView()
         {
+            MainDataManager.Instance.ViewType = 0;
             ViewManager.Show(ViewName.MAINUI_VIEW, null, null, true);
         }
 

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

@@ -65,7 +65,7 @@ namespace GFGGame
         private static GList targetList = null;
         public static bool TryGuide(GComponent target, string guideKey, int index, string guideStr = null, int listIndex = -1, bool checkPriorIndex = true, float yTxt = 0, bool justHint = false)
         {
-            if(!GameGlobal.DataInited)
+            if (!GameGlobal.DataInited)
             {
                 return false;
             }
@@ -121,7 +121,7 @@ namespace GFGGame
                         return false;
                     }
                 }
-                ShowGuideByIndex(target, guideStr, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, yTxt, justHint);
+                ShowGuideByIndex(target, guideKey, guideStr, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex, yTxt, justHint);
                 if (!checkPriorIndex)
                 {
                     for (int i = 1; i < index; i++)
@@ -136,7 +136,7 @@ namespace GFGGame
 
             return false;
         }
-        private static void ShowGuideByIndex(GObject target, string guideStr = null, int guideId = 0, int index = 0, float yTxt = 0, bool justHint = false)
+        private static void ShowGuideByIndex(GObject target, string guideKey, string guideStr = null, int guideId = 0, int index = 0, float yTxt = 0, bool justHint = false)
         {
             HideGuide();
             if (GameGlobal.skipGuide)
@@ -144,13 +144,13 @@ namespace GFGGame
                 return;
             }
             LogServerHelper.SendNodeLog(GuideDataManager.currentGuideId * 100 + 1);
-            ViewManager.Show(ViewName.GUIDE_VIEW, new List<object> { target, guideStr, guideId, index, yTxt, justHint });
+            ViewManager.Show(ViewName.GUIDE_VIEW, new List<object> { target, guideKey, guideStr, guideId, index, yTxt, justHint });
         }
-        public static bool TryCompleteGuideIndex(int guideId, int index)
+        public static bool TryCompleteGuideIndex(string guideKey, int index)
         {
-
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             HideGuide();
-            if (GuideDataManager.TryCompleteGuideIndex(guideId, index))
+            if (GuideDataManager.TryCompleteGuideIndex(cfg.id, index))
             {
                 if (targetList != null && targetList.scrollPane != null)
                 {

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

@@ -135,12 +135,6 @@ namespace GFGGame
             EventAgent.DispatchEvent(ConstMessage.LOGIN_FAIL);
         }
 
-        public static void OnLogout()
-        {
-            GameGlobal.zoneScene.GetComponent<SessionComponent>().AccountSession?.Dispose();
-            GameGlobal.zoneScene.GetComponent<SessionComponent>().GateSession?.Dispose();
-        }
-
         public static async ETTask Register(string account, string password, string name, string identityNum, string code)
         {
             ViewManager.Show<ModalStatusView>("注册中...");
@@ -274,11 +268,7 @@ namespace GFGGame
                 return;
             }
             EventAgent.DispatchEvent(ConstMessage.NUMERIC_CHANGE, NumericType.All);
-            //重连成功请求邮件和公告等离线后会变更的数据
-            NoticeSProxy.ReqSystemNoticeList().Coroutine();
-            MailSProxy.ReqMailCount().Coroutine();
-            FriendSProxy.ReqAllFriendInfos().Coroutine();
-            PoemGallerySProxy.ReqGalleryTheme().Coroutine();
+            GameController.OnReconnected();
             ViewManager.Hide<ModalStatusView>();
         }
     }

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

@@ -8,7 +8,7 @@ namespace GFGGame
         {
             //获取7日任务活动
             var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.Day7);
-            return activityInfo == null ? 0 : TimeUtil.GetDayByTime(activityInfo.StartTime, activityInfo.EndTime);
+            return activityInfo == null ? 0 : TimeUtil.GetDayByTime(activityInfo.StartTime, TimeHelper.ServerNow());
         }
 
         public long GetScore()

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

@@ -101,7 +101,7 @@ namespace GFGGame
         {
             var activityInfoIds = GetActivityInfoIdsByType(activityType);
             return activityInfoIds.Select(GetActivityInfo).FirstOrDefault(activityInfo =>
-                activityInfo != null && activityInfo.EndTime <= TimeHelper.ServerNow());
+                activityInfo != null && activityInfo.EndTime >TimeHelper.ServerNow());
         }
 
         //添加活动奖励获取数据

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

@@ -114,16 +114,19 @@ namespace GFGGame
             return arrayList;
         }
 
-        public static List<int> SortItemListByHighScore(List<int> arrayList)
+        public static List<int> SortItemListByHighScore(List<int> arrayList, bool checkNew = false)
         {
             arrayList.Sort((int a, int b) =>
             {
-                bool isNewA = CheckIsDressUpItemNew(a);
-                bool isNewB = CheckIsDressUpItemNew(b);
-                if (isNewA != isNewB)
+                if (checkNew)
                 {
-                    if (isNewA) return -1;
-                    if (isNewB) return 1;
+                    bool isNewA = CheckIsDressUpItemNew(a);
+                    bool isNewB = CheckIsDressUpItemNew(b);
+                    if (isNewA != isNewB)
+                    {
+                        if (isNewA) return -1;
+                        if (isNewB) return 1;
+                    }
                 }
                 int scoreA = ItemDataManager.GetItemAdditionScore(a, InstanceZonesDataManager.currentScoreType, InstanceZonesDataManager.currentFightTags); ;
                 int scoreB = ItemDataManager.GetItemAdditionScore(b, InstanceZonesDataManager.currentScoreType, InstanceZonesDataManager.currentFightTags); ;
@@ -134,16 +137,19 @@ namespace GFGGame
             });
             return arrayList;
         }
-        public static List<int> SortItemListByLowScore(List<int> arrayList)
+        public static List<int> SortItemListByLowScore(List<int> arrayList, bool checkNew = false)
         {
             arrayList.Sort((int a, int b) =>
             {
-                bool isNewA = CheckIsDressUpItemNew(a);
-                bool isNewB = CheckIsDressUpItemNew(b);
-                if (isNewA != isNewB)
+                if (checkNew)
                 {
-                    if (isNewA) return -1;
-                    if (isNewB) return 1;
+                    bool isNewA = CheckIsDressUpItemNew(a);
+                    bool isNewB = CheckIsDressUpItemNew(b);
+                    if (isNewA != isNewB)
+                    {
+                        if (isNewA) return -1;
+                        if (isNewB) return 1;
+                    }
                 }
                 int scoreA = ItemDataManager.GetItemAdditionScore(a, InstanceZonesDataManager.currentScoreType, InstanceZonesDataManager.currentFightTags); ;
                 int scoreB = ItemDataManager.GetItemAdditionScore(b, InstanceZonesDataManager.currentScoreType, InstanceZonesDataManager.currentFightTags); ;

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

@@ -107,11 +107,11 @@ namespace GFGGame
                     if (cfg.group <= 0)
                     {
                         ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.item);
-                        if (itemCfg == null || itemCfg.suitId <= 0 && itemCfg.showSuitId <= 0)
+                        if (itemCfg == null || itemCfg.suitId <= 0)
                         {
                             continue;
                         }
-                        group = itemCfg.suitId == 0 ? itemCfg.showSuitId : itemCfg.suitId;
+                        group = itemCfg.suitId;
                     }
                     LuckyBoxBonusData luckyBoxBonusData = GetBonusData(group, dic);
                     if (luckyBoxBonusData == null)

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

@@ -177,7 +177,7 @@ namespace GFGGame
                 int lockValue = shopCfg.lockValue;
                 if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
                 {
-                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
+                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
                 return ArenaDataManager.Instance.Grade >= lockValue;
@@ -210,7 +210,7 @@ namespace GFGGame
                 int lockValue = shopCfg.lockValue;
                 if (shopCfg.menu1 == ConstStoreTabId.STORE_ARENA && shopCfg.menu2 != ConstStoreSubId.STORE_ARENA_ITEM)
                 {
-                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce >= 0;
+                    bool isDown = ArenaDataManager.Instance.SeasonId - GlobalCfgArray.globalCfg.seasonReduce > 0;
                     lockValue = isDown ? Math.Max(1, shopCfg.lockValue - GlobalCfgArray.globalCfg.rankReduce) : shopCfg.lockValue;
                 }
                 ArenaRankCfg arenaRankCfg = ArenaRankCfgArray.Instance.GetCfg(lockValue);

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs

@@ -11,11 +11,7 @@ namespace UI.Arena
         public Controller m_c2;
         public GButton m_btnBack;
         public GComponent m_valueBar;
-        public GComponent m_comTag;
-        public GLoader m_loaScore0;
-        public GLoader m_loaScore1;
-        public GLoader m_loaScore2;
-        public GGroup m_grpTheme;
+        public UI_ComTheme m_comTheme;
         public GTextField m_txtTime;
         public GButton m_btnRule;
         public GGroup m_gtpTop;
@@ -94,11 +90,7 @@ namespace UI.Arena
             m_c2 = comp.GetController("c2");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_comTag = (GComponent)comp.GetChild("comTag");
-            m_loaScore0 = (GLoader)comp.GetChild("loaScore0");
-            m_loaScore1 = (GLoader)comp.GetChild("loaScore1");
-            m_loaScore2 = (GLoader)comp.GetChild("loaScore2");
-            m_grpTheme = (GGroup)comp.GetChild("grpTheme");
+            m_comTheme = (UI_ComTheme)UI_ComTheme.Create(comp.GetChild("comTheme"));
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnRule = (GButton)comp.GetChild("btnRule");
             m_gtpTop = (GGroup)comp.GetChild("gtpTop");
@@ -133,11 +125,8 @@ namespace UI.Arena
             m_c2 = null;
             m_btnBack = null;
             m_valueBar = null;
-            m_comTag = null;
-            m_loaScore0 = null;
-            m_loaScore1 = null;
-            m_loaScore2 = null;
-            m_grpTheme = null;
+            m_comTheme.Dispose();
+            m_comTheme = null;
             m_txtTime = null;
             m_btnRule = null;
             m_gtpTop = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComTheme.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Arena
+{
+    public partial class UI_ComTheme
+    {
+        public GComponent target;
+        public GComponent m_comTag;
+        public GLoader m_loaScore0;
+        public GLoader m_loaScore1;
+        public GLoader m_loaScore2;
+        public GGroup m_grpTheme;
+        public const string URL = "ui://4lc5fhlbt6j15b";
+        public const string PACKAGE_NAME = "Arena";
+        public const string RES_NAME = "ComTheme";
+        private static UI_ComTheme _proxy;
+
+        public static UI_ComTheme Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTheme();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComTheme Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTheme();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comTag = (GComponent)comp.GetChild("comTag");
+            m_loaScore0 = (GLoader)comp.GetChild("loaScore0");
+            m_loaScore1 = (GLoader)comp.GetChild("loaScore1");
+            m_loaScore2 = (GLoader)comp.GetChild("loaScore2");
+            m_grpTheme = (GGroup)comp.GetChild("grpTheme");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comTag = null;
+            m_loaScore0 = null;
+            m_loaScore1 = null;
+            m_loaScore2 = null;
+            m_grpTheme = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ComTheme.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/EnduringGiftBox/UI_EnduringGiftBoxUI.cs

@@ -20,6 +20,7 @@ namespace UI.EnduringGiftBox
         public GComponent m_btnBack;
         public Transition m_t1;
         public Transition m_t2;
+        public Transition m_t3;
         public const string URL = "ui://bdi1qe15qqhz1";
         public const string PACKAGE_NAME = "EnduringGiftBox";
         public const string RES_NAME = "EnduringGiftBoxUI";
@@ -80,6 +81,7 @@ namespace UI.EnduringGiftBox
             m_btnBack = (GComponent)comp.GetChild("btnBack");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
+            m_t3 = comp.GetTransition("t3");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,6 +98,7 @@ namespace UI.EnduringGiftBox
             m_btnBack = null;
             m_t1 = null;
             m_t2 = null;
+            m_t3 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -15,6 +15,7 @@ namespace UI.Friend
         public GButton m_btnAdd;
         public GList m_list;
         public GButton m_btnSendAll;
+        public GTextField m_txtPowerCount;
         public const string URL = "ui://wez2ujnnjdju0";
         public const string PACKAGE_NAME = "Friend";
         public const string RES_NAME = "FriendUI";
@@ -70,6 +71,7 @@ namespace UI.Friend
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_list = (GList)comp.GetChild("list");
             m_btnSendAll = (GButton)comp.GetChild("btnSendAll");
+            m_txtPowerCount = (GTextField)comp.GetChild("txtPowerCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,7 @@ namespace UI.Friend
             m_btnAdd = null;
             m_list = null;
             m_btnSendAll = null;
+            m_txtPowerCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueUI.cs

@@ -13,6 +13,7 @@ namespace UI.League
         public UI_Button3 m_btnMember;
         public UI_Button3 m_btnConstruct;
         public GTextField m_txtLowKeep;
+        public GGroup m_grpLowKeep;
         public GTextField m_txtUnionName;
         public UI_ComLeagueHead m_comLeagueHead;
         public GComponent m_comHead;
@@ -78,6 +79,7 @@ namespace UI.League
             m_btnMember = (UI_Button3)UI_Button3.Create(comp.GetChild("btnMember"));
             m_btnConstruct = (UI_Button3)UI_Button3.Create(comp.GetChild("btnConstruct"));
             m_txtLowKeep = (GTextField)comp.GetChild("txtLowKeep");
+            m_grpLowKeep = (GGroup)comp.GetChild("grpLowKeep");
             m_txtUnionName = (GTextField)comp.GetChild("txtUnionName");
             m_comLeagueHead = (UI_ComLeagueHead)UI_ComLeagueHead.Create(comp.GetChild("comLeagueHead"));
             m_comHead = (GComponent)comp.GetChild("comHead");
@@ -101,6 +103,7 @@ namespace UI.League
             m_btnConstruct.Dispose();
             m_btnConstruct = null;
             m_txtLowKeep = null;
+            m_grpLowKeep = null;
             m_txtUnionName = null;
             m_comLeagueHead.Dispose();
             m_comLeagueHead = null;

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_Component7
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaRight;
         public GGraph m_holder;
         public Transition m_t0;
@@ -57,12 +58,14 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaRight = (GLoader)comp.GetChild("loaRight");
             m_holder = (GGraph)comp.GetChild("holder");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaRight = null;
             m_holder = null;
             m_t0 = null;

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

@@ -9,6 +9,7 @@ namespace UI.Studio
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
+        public GButton m_btnHome;
         public UI_ComEctype m_comMetal;
         public UI_ComEctype m_comFabric;
         public UI_ComEctype m_comProperty;
@@ -63,6 +64,7 @@ namespace UI.Studio
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnHome = (GButton)comp.GetChild("btnHome");
             m_comMetal = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comMetal"));
             m_comFabric = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comFabric"));
             m_comProperty = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comProperty"));
@@ -73,6 +75,7 @@ namespace UI.Studio
         {
             m_loaBg = null;
             m_btnBack = null;
+            m_btnHome = null;
             m_comMetal.Dispose();
             m_comMetal = null;
             m_comFabric.Dispose();

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

@@ -68,6 +68,8 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    int[][] bonus = VipCfgArray.Instance.GetCfg(vipLv).bonusOnceArr;
+                    BonusController.TryShowBonusList(bonus);
                     return true;
                 }
             }
@@ -82,6 +84,8 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    int[][] bonus = VipCfgArray.Instance.GetCfg(vipLv).bonusWeekArr;
+                    BonusController.TryShowBonusList(bonus);
                     return true;
                 }
             }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -21,7 +21,6 @@ namespace GFGGame
         public static readonly string Material_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Material";
         public static readonly string Shader_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Shader";
         public static readonly string Model_DIR_PATH = $"{RES_ROOT_DIR_PATH}/model";
-        public static readonly string Texture_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
 
         public static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
@@ -54,7 +55,9 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            onClickDayIndex = ActivityDay7DataManager.Instance.GetActivityDay7Day() - 1;
+            var min = Math.Min(Activity7DaysTaskCfgArray.Instance.dataArray.Length,
+                ActivityDay7DataManager.Instance.GetActivityDay7Day());
+            onClickDayIndex = Math.Max(0, min - 1);
             SetScoreList();
             SetScore();
             SetDayList();

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -81,6 +81,7 @@ namespace GFGGame
                 MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
             }
             UpdateView();
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -93,6 +94,7 @@ namespace GFGGame
             }
             _ui.m_grhCloseComFightScore.visible = false;
             _ui.m_comValueInfo.m_c2.selectedIndex = 0;
+            Timers.inst.Remove(CheckGuide);
         }
 
         protected override void RemoveEventListener()
@@ -216,5 +218,31 @@ namespace GFGGame
             int itemId = (int)gesture.host.data;
             GoodsItemTipsController.ShowItemTips(itemId);
         }
+
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+            GuideController.TryGuide(_ui.m_btnRecommend, ConstGuideId.ARENA_OPEN, 6, "");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ARENA_OPEN, 7, "搭配好啦，挑个对手比拼吧~");
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 7);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaRoundResultView.cs

@@ -94,11 +94,12 @@ namespace GFGGame
         private void FinishFight()
         {
             ArenaDataManager dataManager = ArenaDataManager.Instance;
+            ViewManager.Hide<ArenaFightResultView>();
+
             if (dataManager.Grade > dataManager.LastGrade)
             {
                 BonusController.TryShowBonusList(dataManager.BonusList, () =>
                 {
-                    ViewManager.Hide<ArenaFightResultView>();
                     ViewManager.Show<ArenaDanUpView>(new object[] { dataManager.LastGrade, ArenaDataManager.Instance.Grade, dataManager.RewardId });
                 });
             }
@@ -106,7 +107,7 @@ namespace GFGGame
             {
                 BonusController.TryShowBonusList(dataManager.BonusList, () =>
                 {
-                    ViewManager.Hide<ArenaFightResultView>();
+                    // ViewManager.Hide<ArenaFightResultView>();
                     ViewManager.Show<ArenaRankUpView>(new object[] { dataManager.LastGrade, dataManager.LastRank, dataManager.LastTargetInfo.roleName, dataManager.LastTargetInfo.headId, dataManager.LastTargetInfo.headRes });
                 });
             }
@@ -114,7 +115,7 @@ namespace GFGGame
             {
                 BonusController.TryShowBonusList(dataManager.BonusList, () =>
                 {
-                    ViewManager.Hide<ArenaFightResultView>();
+                    // ViewManager.Hide<ArenaFightResultView>();
                 });
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -20,6 +20,7 @@ namespace GFGGame
         private ArenaDataManager _dataManager;
         private ArenaTargetData _targetData;
         private ArenaOpenCfg _arenaCfg;
+        private int _showOtherTargetGuide = -1;
 
         public override void Dispose()
         {
@@ -117,6 +118,7 @@ namespace GFGGame
             UpdateValue();
             UpdateRole();
 
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -127,11 +129,10 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+
             _targetDressUpObj.TakeOffAll();
-            // _copyDressUpObj.TakeOffAll();
-            // _copyDressUpObj.Dispose();
-            // _copyDressUpObj = null;
             _valueBarController.OnHide();
+            Timers.inst.Remove(CheckGuide);
         }
 
         protected override void RemoveEventListener()
@@ -150,6 +151,8 @@ namespace GFGGame
         // }
         private void OnBtnBackClick()
         {
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 12);
+            GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 12);
             ViewManager.GoBackFrom(typeof(ArenaView).FullName);
         }
         private void OnBtnShopClick()
@@ -302,7 +305,14 @@ namespace GFGGame
 
             _dataManager.myFightScore = _dataManager.GetFightScoreList(_dataManager.DressupList);
             _dataManager.targetFightScore = _dataManager.GetFightScoreList(_targetData.FightDatas);
-            return await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
+            bool result = await ArenaSproxy.ReqArenaFight(winCount >= 2, _targetData, _dataManager.myFightScore, _dataManager.targetFightScore, _dataManager.myScore, _dataManager.targetScore);
+
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0 && _showOtherTargetGuide < 0)
+            {
+
+                _showOtherTargetGuide = result ? 1 : 0;
+            }
+            return result;
         }
         private void UpdateView()
         {
@@ -314,11 +324,11 @@ namespace GFGGame
 
         private void UpdateNormal()
         {
-            ItemUtil.UpdateTag(_ui.m_comTag, _dataManager.Tag);
+            ItemUtil.UpdateTag(_ui.m_comTheme.m_comTag, _dataManager.Tag);
             ItemUtil.UpdateItemNeedNum(_ui.m_comCostCurrent.target, GlobalCfgArray.globalCfg.costIdBuyFreshTimes, GlobalCfgArray.globalCfg.costNumBuyFreshTimes, true, "#FBF6ED");
-            _ui.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
-            _ui.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
-            _ui.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
+            _ui.m_comTheme.m_loaScore0.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[0]);
+            _ui.m_comTheme.m_loaScore1.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[1]);
+            _ui.m_comTheme.m_loaScore2.url = ResPathUtil.GetScorePath(_dataManager.ThemeList[2]);
             string openTime = TimeUtil.FormattingTimeTo_MMdd(TimeUtil.DateTimeToTimestamp(_arenaCfg.openTime));
             string endTime = TimeUtil.FormattingTimeTo_MMdd(TimeUtil.DateTimeToTimestamp(_arenaCfg.endTime));
             _ui.m_txtTime.text = string.Format("赛季时间：{0}-{1}", openTime, endTime);
@@ -443,6 +453,51 @@ namespace GFGGame
             }
             ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
 
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_comTheme.target, ConstGuideId.ARENA_OPEN, 4, "搭配这些标签和属性的衣服会获得更强的战力哦~");
+            GuideController.TryGuide(_ui.m_btnDress, ConstGuideId.ARENA_OPEN, 5, "点这里可以自由搭配~");
+            GuideController.TryGuide(_ui.m_listTarget, ConstGuideId.ARENA_OPEN, 8, "", 0);
+            GuideController.TryGuide(_ui.m_btnFight, ConstGuideId.ARENA_OPEN, 9, "");
+
+            if (_showOtherTargetGuide > 0)
+            {
+                if (_showOtherTargetGuide == 0)
+                {
+                    GuideController.TryGuide(_ui.m_listTarget, ConstGuideId.ARENA_OPEN, 10, "对手排名发生变化，重新选个对手吧", 0, false);
+                    GuideController.TryGuide(_ui.m_btnFight, ConstGuideId.ARENA_OPEN, 11, "");
+                }
+                else
+                {
+                    GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ARENA_OPEN);
+                    if (GuideDataManager.IsGuideIndexFinish(cfg.id, 9) && !GuideDataManager.IsGuideIndexFinish(cfg.id, 10))
+                    {
+                        GuideDataManager.currentGuideIdIndex = 10;
+                        GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 10);
+                    }
+                    else if (GuideDataManager.IsGuideIndexFinish(cfg.id, 10) && !GuideDataManager.IsGuideIndexFinish(cfg.id, 11))
+                    {
+                        GuideDataManager.currentGuideIdIndex = 11;
+                        GuideController.TryCompleteGuideIndex(ConstGuideId.ARENA_OPEN, 11);
+                    }
+                }
+
+                GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ARENA_OPEN, 12, "厉害啦，你赢啦，我们继续新故事吧！");
+                GuideController.TryCompleteGuide(ConstGuideId.ARENA_OPEN, 12);
+            }
+        }
     }
 }

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

@@ -159,7 +159,9 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -173,6 +175,12 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
             GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌。", 0);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_1, 1, "");
+            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_STAR, 3, "选择可升星的词牌。", 0);
+
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.UP_CARD_STAR, 7, "");
+            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_STAR, 7);
+
         }
     }
 }

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

@@ -929,7 +929,8 @@ namespace GFGGame
 
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0)
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0)
             {
                 UpdateToCheckGuide(null);
             }
@@ -942,8 +943,21 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标，可持续给词牌增加经验。", 0);
-            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 4);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnAll, ConstGuideId.UP_CARD_LV, 4, "");
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "");
+            GuideController.TryGuide(_ui.m_ComFosterTop.m_btnback, ConstGuideId.UP_CARD_LV, 7, "让我们继续新旅程吧~");
+
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnStar, ConstGuideId.UP_CARD_STAR, 4, "");
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpStar, ConstGuideId.UP_CARD_STAR, 5, "");
+            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_STAR, 5);
+
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.UP_CARD_LV);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.UP_CARD_LV, 7);
+            GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 7);
         }
     }
 }

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

@@ -62,6 +62,7 @@ namespace GFGGame
                 _ui.m_txtLast.text = string.Format("{0}星", _lastNum);
                 _ui.m_txtNow.text = string.Format("{0}星", _curNum);
             }
+            Timers.inst.AddUpdate(CheckGuide);
         }
         private void RenderListPropertyItem(int index, GObject obj)
         {
@@ -72,16 +73,29 @@ namespace GFGGame
             listItem.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (index + 1));
             UI_ListScoreItem.ProxyEnd();
         }
-        //private void OnClickBtnBack()
-        //{
-
-        //    ViewManager.GoBackFrom(ViewName.CARD_UP_VIEW);
-
-        //}
-
         protected override void OnHide()
         {
             base.OnHide();
+            Timers.inst.Remove(CheckGuide);
+        }
+
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0)
+            // || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+
+            GuideController.TryGuide(null, ConstGuideId.UP_CARD_LV, 6, "升级成功啦", -1, true, 1500);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -256,7 +256,7 @@ namespace GFGGame
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
             if (GuideDataManager.currentGuideId == cfg.id)
             {
-                GuideController.TryCompleteGuideIndex(cfg.id, 3);
+                GuideController.TryCompleteGuideIndex(ConstGuideId.LUCKY_BOX, 3);
                 GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX, 3);
             }
         }

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

@@ -674,11 +674,11 @@ namespace GFGGame
                 _currentList3 = DressUpMenuItemDataManager.getItemDatasByType(_currentMenuType);
                 if (_scoreIndex == SORT_BY_HIGH_SCORE)
                 {
-                    _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3);
+                    _currentList3 = DressUpMenuItemDataManager.SortItemListByHighScore(_currentList3, true);
                 }
                 else if (_scoreIndex == SORT_BY_LOW_SCORE)
                 {
-                    _currentList3 = DressUpMenuItemDataManager.SortItemListByLowScore(_currentList3);
+                    _currentList3 = DressUpMenuItemDataManager.SortItemListByLowScore(_currentList3, true);
                 }
                 else
                 {

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

@@ -269,9 +269,14 @@ namespace GFGGame
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(context.data as GObject);// (GObject)context.data as GObject;
             int id = (int)listItem.target.data;
             // bool isSuit = SuitCfgArray.Instance.GetTotalCountOfOneSuit(id) > 0;
+
             if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
             {
-                if (SuitCfgArray.Instance.CheckSuitHasAction(id))
+                if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0 && GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS).id)
+                {
+                    ShowSuitPartList(id, true);
+                }
+                else if (SuitCfgArray.Instance.CheckSuitHasAction(id))
                 {
                     listItem.m_comAxtionSelect.target.visible = true;
                     UI_PartsListItem.ProxyEnd();
@@ -1056,14 +1061,14 @@ namespace GFGGame
             }
             if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里，可以查看集齐成套的服饰，点击一键换上。");
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "", 0);
-            if (_ui.m_partsList.m_list.numItems > 0)
-            {
-                UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
-                GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnAction, ConstGuideId.FREEDOM_DRESS, 5, "选择特殊动作并穿上。");
-                UI_PartsListItem.ProxyEnd();
-            }
-            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 6, "搭配好的服饰，可以保存到主界面显示。");
-            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 7, "辛苦搭配完，去拍个照片留念呀~~");
+            // if (_ui.m_partsList.m_list.numItems > 0)
+            // {
+            //     UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList.m_list.GetChildAt(0).asCom);
+            //     GuideController.TryGuide(listItem.m_comAxtionSelect.m_btnAction, ConstGuideId.FREEDOM_DRESS, 5, "选择特殊动作并穿上。");
+            //     UI_PartsListItem.ProxyEnd();
+            // }
+            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰，可以保存到主界面显示。");
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.FREEDOM_DRESS, 6, "辛苦搭配完，去拍个照片留念呀~~");
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 2, "");
 

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

@@ -124,17 +124,17 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 10, "");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
+            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 9, "");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
 
         }
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();
 
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
-            GuideController.TryCompleteGuideIndex(cfg.id, 10);
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
         }
     }
 }

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

@@ -618,8 +618,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 8, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
-            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 9, "来记录下这一刻吧。");
+            GuideController.TryGuide(null, ConstGuideId.FREEDOM_DRESS, 7, "在这里可以选择已获得的背景、道具等，也可以放大缩小物品，增加画面丰富度。", -1, true, _ui.target.height - _ui.m_ComSelectRes.target.height - 250);
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.FREEDOM_DRESS, 8, "来记录下这一刻吧。");
             // GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 8);
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER, 1, "");

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -68,6 +68,7 @@ namespace GFGGame
             AddEffect();
             _ui.m_t1.Play();
             _ui.m_t2.Play();
+            _ui.m_t3.Play(CheckGuide);
 
             UpdateView();
         }
@@ -370,6 +371,11 @@ namespace GFGGame
         // ReSharper disable Unity.PerformanceAnalysis
         private void OnBtnBuyClick(EventContext context)
         {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_POWER) <= 0)
+            {
+                GuideController.TryCompleteGuideIndex(ConstGuideId.BUY_POWER, 1);
+                GuideController.TryCompleteGuide(ConstGuideId.BUY_POWER, 1);
+            }
             GObject sender = context.sender as GObject;
             GObject obj = sender.parent;
             ShopCfg cfg = obj.data as ShopCfg;
@@ -535,6 +541,7 @@ namespace GFGGame
             Dispose();
             base.Hide();
             _onSuccess = null;
+            Timers.inst.Remove(CheckGuide);
         }
 
         private void OnClickBtnCancel()
@@ -542,5 +549,27 @@ namespace GFGGame
             // Dispose();
             this.Hide();
         }
+        private void CheckGuide()
+        {
+            Timers.inst.AddUpdate(CheckGuide);
+        }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.BUY_POWER) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_list.GetChildAt(1).asCom.GetChild("btnCurReceive").asButton, ConstGuideId.BUY_POWER, 1, "花点小钱可以购买体力超值返利包，每天都能领体力哦~");
+
+        }
     }
 }

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

@@ -137,6 +137,8 @@ namespace GFGGame
             _ui.m_list.RefreshVirtualList();
             _ui.m_txtCount.text = string.Format("好友数：{0}/{1}", _ui.m_list.numItems, GlobalCfgArray.globalCfg.maxFriendCount);
             _ui.m_btnSendAll.text = RedDotDataManager.Instance.GetFriendGiftRed() ? "一键领取并赠送" : "一键赠送";
+            _ui.m_txtPowerCount.SetVar("value", FriendDataManager.Instance.Count.ToString()).FlushVars();
+            _ui.m_txtPowerCount.SetVar("maxValue", FriendDataManager.Instance.maxGetPowerCount.ToString()).FlushVars();
         }
 
 

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

@@ -12,6 +12,7 @@ namespace GFGGame
         private UI_GuideUI _ui;
 
         private GObject guideTarget = null;
+        private string guideKey;
         private int guideId;
         private int guideIndex;
         private bool justHint;//仅提示，无遮罩，点击任何地方可关闭引导
@@ -54,12 +55,12 @@ namespace GFGGame
 
             List<object> dataList = viewData as List<object>;
             guideTarget = dataList[0] as GObject;
-            txtContent = (string)dataList[1];
-
-            guideId = (int)dataList[2];
-            guideIndex = (int)dataList[3];
-            compTxtY = (float)dataList[4];
-            justHint = (bool)dataList[5];
+            guideKey = (string)dataList[1];
+            txtContent = (string)dataList[2];
+            guideId = (int)dataList[3];
+            guideIndex = (int)dataList[4];
+            compTxtY = (float)dataList[5];
+            justHint = (bool)dataList[6];
 
 
             GRoot.inst.touchable = true;
@@ -96,10 +97,11 @@ namespace GFGGame
             }
 
             //一些特殊引导
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_METAL);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PORCELAIN);
             GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_FILING);
             GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.FIELD);
-            if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1)
+            GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PROPERTY);
+            if (guideId == cfg.id && guideIndex == 2 || guideId == cfg1.id && guideIndex == 2 || guideId == cfg2.id && guideIndex == 1 || guideId == cfg4.id && guideIndex == 1)
             {
                 _ui.m_loaMask.visible = false;
                 MainDataManager.Instance.CanSwipe = true;
@@ -206,7 +208,7 @@ namespace GFGGame
         private void OnClickTarget()
         {
             if (guideTarget != null) guideTarget.onClick.Remove(OnClickTarget);
-            GuideController.TryCompleteGuideIndex(guideId, guideIndex);
+            GuideController.TryCompleteGuideIndex(guideKey, guideIndex);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChangeNameView.cs

@@ -128,6 +128,13 @@ namespace GFGGame
                     PromptController.Instance.ShowFloatTextPrompt("雅集名字仅允许汉字、数字、下划线");
                     return;
                 }
+                
+                //判断是否和旧的名字一样
+                if (leagueName == LeagueDataManager.Instance.LeagueData.Name)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("雅集名字不可重名");
+                    return;
+                }
 
                 int needCount = GlobalCfgArray.globalCfg.consumeChangeNameArr[0][1];
                 long hasCount = ItemDataManager.GetItemNum(GlobalCfgArray.globalCfg.consumeChangeNameArr[0][0]);

GameClient/Assets/Game/HotUpdate/Views/League/LeagueConstructView.cs

@@ -149,7 +149,11 @@ namespace GFGGame
             _ui.m_btnUpLv0.target.enabled = nextHallCfg == null ? false : true;
             _ui.m_btnUpLv0.m_txtTip.text = nextHallCfg == null ? "已满级" : "";
             _ui.m_btnUpLv0.m_comCost.visible = nextHallCfg == null ? false : true;
-            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv0.m_comCost, hallCfg.consumeUpArr[0][0], hallCfg.consumeUpArr[0][1]);
+            _ui.m_btnUpLv0.m_comCost.visible = nextHallCfg != null;
+            if (nextHallCfg != null)
+            {
+                ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv0.m_comCost, hallCfg.consumeUpArr[0][0], hallCfg.consumeUpArr[0][1]);
+            }
 
 
         }
@@ -187,7 +191,7 @@ namespace GFGGame
             _ui.m_comHotel3.m_txtNextAdd.text = flowerLimitAdd.ToString();
             _ui.m_comHotel3.m_c1.selectedIndex = flowerLimitAdd > 0 ? 1 : 0;
 
-            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv1.m_comCost, hotelCfg.consumeArr[0][0], hotelCfg.consumeArr[0][1]);
+
 
             if (nextHotelCfg == null)
             {
@@ -216,6 +220,8 @@ namespace GFGGame
                 _ui.m_btnUpLv1.m_txtTip.text = "";
                 _ui.m_btnUpLv1.m_comCost.visible = true;
                 _ui.m_btnUpLv1.target.enabled = true;
+                ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv1.m_comCost, hotelCfg.consumeArr[0][0], hotelCfg.consumeArr[0][1]);
+
             }
         }
 
@@ -238,7 +244,6 @@ namespace GFGGame
             _ui.m_comStore0.m_txtNextAdd.text = coinLimitAdd.ToString();
             _ui.m_comStore0.m_c1.selectedIndex = coinLimitAdd > 0 ? 1 : 0;
 
-            ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv2.m_comCost, storeCfg.consumeArr[0][0], storeCfg.consumeArr[0][1]);
 
             if (nextStoreCfg == null)
             {
@@ -267,6 +272,8 @@ namespace GFGGame
                 _ui.m_btnUpLv2.m_txtTip.text = "";
                 _ui.m_btnUpLv2.m_comCost.visible = true;
                 _ui.m_btnUpLv2.target.enabled = true;
+                ItemUtil.UpdateItemNeedNum(_ui.m_btnUpLv2.m_comCost, storeCfg.consumeArr[0][0], storeCfg.consumeArr[0][1]);
+
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

@@ -124,8 +124,8 @@ namespace GFGGame
         private void UpdateInfo()
         {
             LeagueData leagueData = LeagueDataManager.Instance.LeagueData;
-            int lowKeepDay = (int)LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LowKeepDay);
-            _ui.m_txtLowKeep.visible = lowKeepDay > 0;
+            long lowKeepDay = LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LowKeepDay);
+            _ui.m_grpLowKeep.visible = lowKeepDay > 0;
             _ui.m_txtLowKeep.text = string.Format("已连续低维护：{0}天", lowKeepDay);
             _ui.m_txtUnionName.text = leagueData.Name;
             _ui.m_comLeagueHead.m_loaUnionIcon.url = ResPathUtil.GetLeagueIconPath(leagueData.Icon);

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

@@ -375,9 +375,9 @@ namespace GFGGame
         {
             if (clickComStars.Count >= 2)
             {
-                GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
+                // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
 
-                GuideController.TryCompleteGuideIndex(cfg.id, 1);
+                GuideController.TryCompleteGuideIndex(ConstGuideId.LUCKY_BOX_LINE, 1);
                 GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX_LINE, 1);
             }
             else

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

@@ -428,7 +428,7 @@ namespace GFGGame
         {
             base.TryCompleteGuide();
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX);
-            GuideController.TryCompleteGuideIndex(cfg.id, 2);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.LUCKY_BOX, 2);
         }
     }
 }

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

@@ -13,10 +13,41 @@ namespace GFGGame
         private UI_ArenaFightResultUI _ui;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+        private GameObject _gameObject4;
+        private GameObject _gameObject5;
+        private GameObject _gameObject6;
+        private GameObject _gameObject7;
+        private GameObject _gameObject8;
+        private GameObject _gameObject9;
+        private GameObject _gameObject10;
+        private GameObject _gameObject11;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
+        private GoWrapper _wrapper4;
+        private GoWrapper _wrapper5;
+        private GoWrapper _wrapper6;
+        private GoWrapper _wrapper7;
+        private GoWrapper _wrapper8;
+        private GoWrapper _wrapper9;
+        private GoWrapper _wrapper10;
+        private GoWrapper _wrapper11;
 
         public override void Dispose()
         {
-
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
+            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
+            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -42,9 +73,26 @@ namespace GFGGame
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightResult"));
-
+            AddEffect();
         }
+        private void AddEffect()
+        {
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_lose");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult0, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_qualified");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult1, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_good");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult2, resPath2, out _gameObject2, out _wrapper2);
+            string resPath3 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_Perfect");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult3, resPath3, out _gameObject3, out _wrapper3);
+            string resPath4 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_Text_kuang");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderScore, resPath4, out _gameObject4, out _wrapper4);
+            string resPath5 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_STAR");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderStar3, resPath5, out _gameObject7, out _wrapper7);
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderStar2, resPath5, out _gameObject6, out _wrapper6);
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderStar1, resPath5, out _gameObject5, out _wrapper5);
 
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -60,7 +108,6 @@ namespace GFGGame
             long targetScore = ArenaDataManager.Instance.targetScore[ArenaDataManager.Instance.CurFightIndex];
             _ui.m_comResult.m_c1.selectedIndex = myScore > targetScore ? 3 : 0;
             _ui.m_comResult.m_txtScore.text = myScore.ToString();
-            // _ui.m_comResult.m_grpStar.visible = false;
 
             _ui.m_btnClose.enabled = false;
 
@@ -87,12 +134,9 @@ namespace GFGGame
 
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
 
-            _ui.m_comResult.target.height = 0;
+            // _ui.m_comResult.target.height = 0;
             _ui.m_comResult.m_t1.Play();
-            _ui.m_comResult.m_t0.Stop(true, false);
-            // _ui.m_t0.Stop(true, false);
-            // _ui.m_comRoleResult.m_t3.Stop(true, false);
-            // _ui.m_comRoleResult.m_t0.Stop(true, false);
+
             if (ArenaDataManager.Instance.CurFightIndex > 2)
             {
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(ArenaView).FullName);

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

@@ -175,7 +175,13 @@ namespace GFGGame
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -190,7 +196,12 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_METAL, 1, "点击返回主界面。");
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
 
         }

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

@@ -273,6 +273,12 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
+             || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_DECOMPOSE) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -291,20 +297,53 @@ namespace GFGGame
             bool isGuide1 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 1, "获得的服饰随时可以查看和试穿。");
             bool isGuide2 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER, 5, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
+            bool isGuide3 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_1, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
 
             bool isGuide4 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.BUY_CLOTHING, 1, "衣服被弄脏了，到机场更衣室换身衣服吧。");
             bool isGuide5 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面。");
 
             bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
-            _ui.m_chapter.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide4 && !isGuide5 && !isGuide6;
+
+            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
+
+            bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
+
+            bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
+
+            bool isGuide11 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_5, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 4);
+
+            bool isGuide9 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面。");
+            bool isGuide12 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ARENA_OPEN, 1, "点击返回主界面。");
+
+            _ui.m_chapter.scrollPane.touchEffect = !isGuide0 && !isGuide1 && !isGuide2 && !isGuide3 && !isGuide4 && !isGuide5 && !isGuide6 && !isGuide7 && !isGuide8 && !isGuide9 && !isGuide10;
 
         }
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER);
-            GuideController.TryCompleteGuideIndex(cfg.id, 5);
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER, 5);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER, 5);
+            // GuideCfg cfg1 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_1);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_1, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
+            // GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_2);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
+            // GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_3);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_3, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
+            // GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_4);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_4, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
+            // GuideCfg cfg5 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_5);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_5, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 4);
 
         }
 

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

@@ -243,7 +243,7 @@ namespace GFGGame
             //     _ui.m_comClick.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             //     _ui.m_comClick.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
             // }
-            Timers.inst.Add(1, 0, CheckGuide);
+            Timers.inst.AddUpdate(CheckGuide);
         }
         /****************************************************************************************************************/
         private void SkillScoreStart(int roleType, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic, out bool showCard)

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

@@ -311,7 +311,8 @@ namespace GFGGame
         {
             if (
               GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0
-              || GuideDataManager.IsGuideFinish(ConstGuideId.OPEN_TAGS) <= 0
+               || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+               || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.BUY_CLOTHING) <= 0)
 
             {
@@ -330,15 +331,16 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.START_FIGHT, 2, "点击开启换装。");
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.BUY_CLOTHING, 2, "");
-            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数。", -1, true, _ui.m_btnStart.LocalToGlobal(Vector2.zero).y + _ui.m_btnStart.height + 400, true);
-            GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
-
+            // GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数。", -1, true, _ui.m_btnStart.LocalToGlobal(Vector2.zero).y + _ui.m_btnStart.height + 400, true);
+            // GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.STUDIO_PORCELAIN, 6, "");
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.STUDIO_PROPERTY, 5, "");
         }
 
         protected override void TryCompleteGuide()
         {
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
-            GuideController.TryCompleteGuideIndex(cfg.id, 3);
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.CLOTHING_SYNTHETIC, 3);
         }
     }
 }

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

@@ -67,9 +67,13 @@ namespace GFGGame
                 if (string.IsNullOrEmpty(skillCfg.res))
                 {
                     res = ItemCfgArray.Instance.GetCfg(skillCfg.cardId).res;
+                    _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
                     // ET.Log.Debug("技能" + skillCfg.skillId + "  未配资源");
                 }
-                _ui.m_comSkillShow.m_comSkillCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardPath(res);
+                else
+                {
+                    //to do...
+                }
                 _ui.m_comSkillShow.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
                 _ui.m_comSkillShow.m_t0.Play(() =>
                 {

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

@@ -157,8 +157,8 @@ namespace GFGGame
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
-            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag1);
-            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
+            _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.target.onClick.Add(MoveRight);
@@ -178,7 +178,7 @@ namespace GFGGame
             _ui.m_btnChange.m_c1.selectedIndex = 1;
             _ui.m_btnChange.target.selected = true;
 
-            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.OPEN_TAGS);
+            GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.ARENA_OPEN);
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 0).Coroutine();
             // StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_GUIDE + cfg.id, 1).Coroutine();
             AddEffect();
@@ -721,12 +721,12 @@ namespace GFGGame
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag1.target.visible = false;
+                _ui.m_btnGiftBag2.target.visible = false;
             }
             else
             {
-                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_btnGiftBag1.target.visible = true;
+                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                _ui.m_btnGiftBag2.target.visible = true;
             }
         }
 
@@ -739,12 +739,12 @@ namespace GFGGame
                 .Where(a => a.EndTime > TimeInfo.Instance.ServerNow()).ToList();
             if (list.Count == 0)
             {
-                _ui.m_btnGiftBag2.target.visible = false;
+                _ui.m_btnGiftBag1.target.visible = false;
             }
             else
             {
-                _ui.m_btnGiftBag2.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
-                _ui.m_btnGiftBag2.target.visible = true;
+                _ui.m_btnGiftBag1.m_txtTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
+                _ui.m_btnGiftBag1.target.visible = true;
             }
         }
 
@@ -977,7 +977,15 @@ namespace GFGGame
                 || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_STAR) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.SUIT_LIST_VIEW) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -1003,18 +1011,31 @@ namespace GFGGame
                 GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
                 GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_1, 2, "", -1, false);
+
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_2, 2, "", -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_3, 1, "", -1, false);
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_4, 2, "", -1, false);
+
+                GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);
+
+                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_5, 2, "", -1, false);
 
                 GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
-                    "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看。");
+                    "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看。", -1, false);
+                GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
+
 
-                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_METAL, 2, "向左滑动界面。", -1,
+                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PORCELAIN, 2, "向左滑动界面。", -1,
                     false, _ui.target.height - 700);
                 bool isStudioFilingGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_FILING, 2, "向左滑动界面。", -1,
                     false, _ui.target.height - 700);
-                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false,
-                    _ui.target.height - 700);
+                bool isFieldGuide = GuideController.TryGuide(null, ConstGuideId.FIELD, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+
+                bool isStudioPropertyGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PROPERTY, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+
 
-                if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide)
+                if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
                 {
                     _ui.m_loaGuidestudio.visible = true;
                     MainDataManager.Instance.CanSwipe = true;
@@ -1027,9 +1048,12 @@ namespace GFGGame
             if (MainDataManager.Instance.ViewType == 1)
             {
                 _ui.m_loaGuidestudio.visible = false;
-                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_METAL, 3, "工作室开门啦，进去看看~");
+                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PORCELAIN, 3, "工作室开门啦，进去看看~");
                 GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
                 GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
+                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
+                GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
+                GuideController.TryGuide(_ui.m_loaLeft.target, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeView.cs

@@ -42,7 +42,7 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.AddEventListener(ConstMessage.SHOP_BUY, UpdateView);
 
         }
         protected override void OnShown()
@@ -66,7 +66,7 @@ namespace GFGGame
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateView);
+            EventAgent.RemoveEventListener(ConstMessage.SHOP_BUY, UpdateView);
         }
 
         private void ListItemRenderer(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -232,7 +232,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_list, ConstGuideId.STUDIO_FILING, 5, "从尊贵的辟邪开始吧~~", 0);
+            GuideController.TryGuide(_ui.m_list, ConstGuideId.STUDIO_FILING, 5, "从华贵的花想容开始吧~~", 0);
             GuideController.TryCompleteGuide(ConstGuideId.STUDIO_FILING, 5);
 
         }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPorcelainView.cs

@@ -8,7 +8,7 @@ namespace GFGGame
     //瓷器副本
     public class StudioPorcelainView : StudioBaseView
     {
-
+        private GComponent _comPorcelain;
         public override void Dispose()
         {
             base.Dispose();
@@ -28,21 +28,22 @@ namespace GFGGame
 
         protected override void OnShown()
         {
-            GComponent com = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
-            AddChildCom(com);
-            com.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("hz_bjbj");
+            _comPorcelain = UIPackage.CreateObject(UI_StudioUI.PACKAGE_NAME, "ComPorcelain").asCom;
+            AddChildCom(_comPorcelain);
+            _comPorcelain.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath("hz_bjbj");
 
             StudioDataManager.Instance.VIEW_NAME = typeof(StudioPorcelainView).FullName;
             this._studioCfg = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPorcelainView).Name)[StudioDataManager.Instance.PorcelainTheme - 1];
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this._studioCfg.type, this._studioCfg.subType, this._studioCfg.id);
 
-            com.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
+            _comPorcelain.GetChild("loaScore").asLoader.url = string.Format("ui://Studio/cqxf_zdqh_{0}", StudioDataManager.Instance.PorcelainTheme);
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
             base.OnShown();
-            com.height = _ui.target.height;
+            _comPorcelain.height = _ui.target.height;
 
+            Timers.inst.AddUpdate(CheckGuide);
         }
 
         protected override void OnHide()
@@ -60,5 +61,30 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(StudioPorcelainView).FullName);
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_comPorcelain.GetChild("list").asList, ConstGuideId.STUDIO_PORCELAIN, 5, "", 0);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.STUDIO_PORCELAIN, 7, "挑战成功啦，让我们继续新故事吧");
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PORCELAIN, 7);
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PORCELAIN);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PORCELAIN, 7);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PORCELAIN, 7);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -57,6 +57,7 @@ namespace GFGGame
             list.numItems = this.storyLevelCfgs.Count;
             list.ScrollToView(curIndex);
 
+            Timers.inst.AddUpdate(CheckGuide);
             base.OnShown();
 
         }
@@ -71,47 +72,6 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(StudioPropertyView).FullName);
         }
-        // private void ListPropertyItemRender(int index, GObject obj)
-        // {
-        //     List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
-        //     GButton item = obj.asButton;
-        //     item.GetChild("icon0").asLoader.url = string.Format("ui://Studio/gzsltb_{0}", index + 1);
-        //     item.GetChild("icon1").asLoader.url = string.Format("ui://Studio/gzsatb_{0}", index + 1);
-        //     item.GetChild("icon2").asLoader.url = string.Format("ui://Studio/gzswtb_{0}", index + 1);
-        //     item.GetChild("icon2").asLoader.visible = TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr) ? false : true;
-        //     if (firstOpenProperty < 0 && TimeUtil.CheckDayOfWeek(studioCfgs[index].timeArr)) firstOpenProperty = index;
-        //     item.data = index;
-        // }
-        // private void OnClickListProperty(EventContext context)
-        // {
-
-        //     GButton item = (context.data as GObject).asButton;
-        //     int index = (int)item.data;
-        //     List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
-        //     StudioCfg studioCfg = studioCfgs[index];
-        //     if (!TimeUtil.CheckDayOfWeek(studioCfg.timeArr))
-        //     {
-        //         _listProperty.selectedIndex = _propertySelectIndex;
-        //         string str = "";
-        //         for (int i = 0; i < studioCfg.timeArr.Length; i++)
-        //         {
-        //             str += NumberUtil.GetChiniseNumberWeekText(studioCfg.timeArr[i]);
-        //             if (i == studioCfg.timeArr.Length - 1) break;
-        //             str += "、";
-        //         }
-        //         PromptController.Instance.ShowFloatTextPrompt(string.Format("周{0}开放", str));
-        //         return;
-        //     }
-        //     _propertySelectIndex = index;
-        //     this.studioCfg = studioCfg;
-        //     this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
-        //     this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
-        //     list.numItems = this.storyLevelCfgs.Count;
-        //     list.ScrollToView(curIndex);
-        //     UpdateView();
-        //     StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _listProperty.selectedIndex;
-
-        // }
 
         private void OnControllerChange()
         {
@@ -139,5 +99,31 @@ namespace GFGGame
             UpdateView();
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _croProperty.selectedIndex;
         }
+        private void CheckGuide(object param)
+        {
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0)
+            {
+                UpdateToCheckGuide(null);
+            }
+            else
+            {
+                Timers.inst.Remove(CheckGuide);
+            }
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(list, ConstGuideId.STUDIO_PROPERTY, 4, "通关这个副本可以获得风系词牌的升星材料哦~", 0);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.STUDIO_PROPERTY, 6, "挑战成功啦，让我们继续新旅程~");
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
+        }
+        protected override void TryCompleteGuide()
+        {
+            base.TryCompleteGuide();
+            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PROPERTY);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PROPERTY, 6);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -30,6 +30,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
 
             _ui.m_comMetal.target.onClick.Add(OnClickComMetal);
             _ui.m_comFabric.target.onClick.Add(OnCliclComFabric);
@@ -67,6 +68,10 @@ namespace GFGGame
             TryCompleteGuide();
             Timers.inst.Remove(CheckGuide);
         }
+        private void OnClickBtnHome()
+        {
+            GameController.GoBackToMainView();
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -125,7 +130,10 @@ namespace GFGGame
         }
         private void CheckGuide(object param)
         {
-            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_METAL) <= 0
+            if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
+            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
             {
                 UpdateToCheckGuide(null);
@@ -139,18 +147,21 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_comMetal.target, ConstGuideId.STUDIO_METAL, 4, "通关相应副本，可以获得各种升级材料哦，快开始今天的日常工作吧~");
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_METAL, 4);
+            GuideController.TryGuide(_ui.m_comPorcelain.target, ConstGuideId.STUDIO_PORCELAIN, 4, "通关这个副本可以获得词牌升级材料，快去挑战吧。");
+
+            GuideController.TryGuide(_ui.m_comFiling.target, ConstGuideId.STUDIO_FILING, 4, "完成小伙伴的心愿，获得合成服饰的必备材料哦。");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_2, 1, "");
 
-            GuideController.TryGuide(_ui.m_comFiling.target, ConstGuideId.STUDIO_FILING, 4, "完成小伙伴的心愿，获得服饰碎片哦。");
+            GuideController.TryGuide(_ui.m_comPorcelain.target, ConstGuideId.STUDIO_PORCELAIN, 4, "通关这个副本可以获得词牌升级材料，快去挑战吧。");
 
+            GuideController.TryGuide(_ui.m_comProperty.target, ConstGuideId.STUDIO_PROPERTY, 3, "");
+
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_4, 1, "");
         }
 
         protected override void TryCompleteGuide()
         {
-            // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_OPEN);
-            // GuideController.TryCompleteGuideIndex(cfg.id, 3);
-            // GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 3);
+
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -3,7 +3,6 @@ using ET;
 using FairyGUI;
 using UI.CommonGame;
 using UI.Task;
-using UnityEngine;
 
 namespace GFGGame
 {
@@ -181,8 +180,7 @@ namespace GFGGame
 
         private void OnBtnGoClick(EventContext context)
         {
-            if (!(context.sender is GObject btnGo)) return;
-            var taskCfg = btnGo.data as TaskCfg;
+            if (!(context.sender is GObject { data: TaskCfg taskCfg })) return;
             //功能未开放
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(taskCfg.jumpId)) return;
             Hide();