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

FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <displayList>
     <loader id="n0_mbf1" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://eg2y0ldpgd29ti0" align="center" vAlign="middle" fill="scaleMatchHeight">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n1_mbf1" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n3_mbf1" name="btnTask" src="mbf1l" fileName="compoents/Button1.xml" xy="896,147" group="n8_mbf1">

FGUIProject/assets/Card/components/ComStarConsume.xml

@@ -3,7 +3,7 @@
   <displayList>
     <loader id="n35_842s" name="n35" xy="0,0" size="180,180" url="ui://7l6lvkayqkjsbs" fill="scaleFree"/>
     <image id="n43_qkjs" name="n43" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="13,15"/>
-    <loader id="n36_842s" name="loaItem" xy="34,37" size="104,104" url="ui://eg2y0ldppq5x62" fill="scaleFree"/>
+    <loader id="n36_842s" name="loaItem" xy="25,25" size="130,130" aspect="true" url="ui://eg2y0ldppq5x62" fill="scaleFree"/>
     <image id="n33_842s" name="n33" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="19,139" pivot="0.5,0" size="140,30"/>
     <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" xy="135,130"/>
     <text id="n39_a713" name="txtHasCount" xy="34,130" size="35,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="20"/>

FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1333" opaque="false">
+<component size="1080,1273" opaque="false">
   <displayList>
-    <component id="n21_si5z" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1333">
+    <component id="n21_si5z" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,-50" size="1080,1333">
       <relation target="" sidePair="middle-middle"/>
       <relation target="n17_ohbx" sidePair="height-height"/>
     </component>
-    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="59,132" group="n17_ohbx"/>
-    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="59,809" size="962,506" group="n17_ohbx"/>
-    <group id="n17_ohbx" name="grpTips" xy="59,132" size="962,1183" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true">
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="59,84" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="components/ComTipsApproach.xml" xy="59,761" size="962,506" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="59,84" size="962,1183" advanced="true" layout="vt" lineGap="15" excludeInvisibles="true">
       <relation target="n21_si5z" sidePair="top-top"/>
     </group>
   </displayList>

FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,992">
+<component size="1080,992" opaque="false">
   <displayList>
     <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992">
       <relation target="" sidePair="height-height"/>
     </image>
+    <loader id="n8_jx6z" name="n8" xy="60,26" size="960,951">
+      <relation target="" sidePair="height-height"/>
+    </loader>
     <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="903,25"/>
     <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>

FGUIProject/assets/CommonGame/package.xml

@@ -365,8 +365,8 @@
     <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
     <image id="94m19v" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
     <image id="94m19u" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
-    <image id="94m19t" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
-    <image id="94m19w" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
+    <image id="94m19t" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
+    <image id="94m19w" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4p" name="jjcdi_jjcdi.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4o" name="jjcdi_jjxian.png" path="/imagesNew/" exported="true"/>

FGUIProject/assets/Main/MainUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImage="ui://mfvz4q8kv482fw" designImageOffsetY="-240">
+<component size="1080,1920" designImage="ui://mfvz4q8kjx6zp4" designImageOffsetY="-240">
   <displayList>
     <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" group="n59_oju1"/>
     <image id="n68_v95q" name="n68" src="v95qi0" fileName="images/zjm_mbmbmb.png" xy="0,1448" group="n52_qqat">
@@ -87,41 +87,39 @@
       <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="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="615,1195" group="n58_oju1">
+    <component id="n70_weok" name="loaLeft" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="38,164" group="n58_oju1"/>
+    <component id="n72_mzf8" name="btn1" src="mzf8iu" fileName="components/ButtonModle7.xml" xy="580,1199" group="n58_oju1" visible="false">
       <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="343,673" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8im"/>
+    <component id="n44_n3xh" name="btnStudio" src="jx6zpd" fileName="components/ButtonModle9.xml" xy="436,581" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp7"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482ft"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zp8"/>
     </component>
-    <component id="n60_wono" name="btnTravel" src="mzf8iq" fileName="components/ButtonModle3.xml" xy="753,893" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8il"/>
+    <component id="n60_wono" name="btnTravel" src="jx6zpd" fileName="components/ButtonModle9.xml" xy="106,381" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp7"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kwonohg"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zp5"/>
     </component>
-    <component id="n51_v482" name="btnPoem" src="mzf8is" fileName="components/ButtonModle5.xml" xy="118,1487" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8ij"/>
+    <component id="n51_v482" name="btnPoem" src="jx6zpc" fileName="components/ButtonModle8.xml" xy="174,1316" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp6"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fr"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zpb"/>
     </component>
-    <component id="n45_kqhd" name="btnField" src="mzf8ir" fileName="components/ButtonModle4.xml" xy="663,1584" group="n58_oju1">
-      <Button icon="ui://mfvz4q8kmzf8io"/>
+    <component id="n45_kqhd" name="btnField" src="jx6zpd" fileName="components/ButtonModle9.xml" xy="746,451" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp7"/>
       <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
-      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv482fv"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zpa"/>
     </component>
-    <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="-46,85" size="1176,1859" advanced="true"/>
+    <component id="n73_mzf8" name="btnArena" src="jx6zpc" fileName="components/ButtonModle8.xml" xy="637,1208" group="n58_oju1">
+      <Button icon="ui://mfvz4q8kjx6zp6"/>
+      <property target="loaLockIcon" propertyId="1" value="ui://mfvz4q8kv95qhz"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kjx6zp9"/>
+    </component>
+    <group id="n58_oju1" name="grpRight" xy="38,164" size="892,1402" group="n59_oju1" advanced="true"/>
+    <group id="n59_oju1" name="grpMove" xy="0,85" size="1130,1835" 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/StoryFightFailUI.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1120">
+  <displayList>
+    <image id="n0_jx6z" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1120"/>
+    <list id="n1_jx6z" name="list" xy="90,411" size="900,653" overflow="scroll" lineGap="20" defaultItem="ui://mfvz4q8kjx6zpf" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/ButtonModle8.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,250" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="125,125" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n1_wg7t" name="icon" xy="125,125" pivot="0.5,0.5" anchor="true" size="396,400" group="n10_jx6z" url="ui://mfvz4q8kjx6zp6" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n9_jx6z" name="icon1" xy="142,128" pivot="0.5,0.5" anchor="true" size="234,144" group="n10_jx6z" url="ui://mfvz4q8kjx6zp9" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <graph id="n4_lki4" name="holder1" xy="125,125" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n8_v95q" name="loaLockIcon" xy="125,125" pivot="0.5,0.5" anchor="true" size="84,395" group="n10_jx6z" url="ui://eg2y0ldpv95qtk0" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <group id="n10_jx6z" name="n10" xy="-73,-75" size="396,400"/>
+  </displayList>
+  <Button/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

FGUIProject/assets/Main/components/ButtonModle9.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="184,538" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n2_lki4" name="holder" xy="92,296" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n1_wg7t" name="icon" xy="92,296" pivot="0.5,0.5" anchor="true" size="242,632" group="n10_jx6z" url="ui://mfvz4q8kjx6zp7" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <loader id="n9_jx6z" name="icon1" xy="85,229" pivot="0.5,0.5" anchor="true" size="190,300" group="n10_jx6z" url="ui://mfvz4q8kjx6zp5" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <graph id="n4_lki4" name="holder1" xy="92,296" size="0,0" group="n10_jx6z" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <loader id="n8_v95q" name="loaLockIcon" xy="92,296" pivot="0.5,0.5" anchor="true" size="84,395" group="n10_jx6z" url="ui://eg2y0ldpv95qtk0" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <group id="n10_jx6z" name="n10" xy="-29,-20" size="242,632"/>
+  </displayList>
+  <Button/>
+  <relation target="n1_wg7t" sidePair="width-width,height-height"/>
+  <customProperty target="loaLockIcon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
+</component>

FGUIProject/assets/Main/components/ListFailItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="900,180" overflow="hidden">
+  <displayList>
+    <image id="n2_jx6z" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,-67"/>
+    <text id="n3_jx6z" name="txtDesc" xy="62,64" size="230,51" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n4_jx6z" name="btnGo" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="668,58">
+      <Button title="前往"/>
+    </component>
+  </displayList>
+</component>

FGUIProject/assets/Main/package.xml

@@ -359,8 +359,6 @@
     <image id="v482ft" name="zjm_rk_7.png" path="/images/"/>
     <image id="v482fu" name="zjm_rk_8.png" path="/images/"/>
     <image id="v482fv" name="zjm_rk_9.png" path="/images/"/>
-    <image id="v482fw" name="zjm_2.jpg" path="/"/>
-    <image id="v482fx" name="zjm_1.jpg" path="/" atlas="alone_npot"/>
     <image id="qqatfy" name="zjm_hdhd_2.png" path="/images/"/>
     <image id="wonog1" name="zd_jsjm_jszi_0.png" path="/imagesFight/"/>
     <image id="wonog2" name="jz_ejd_yz.png" path="/imagesFight/"/>
@@ -452,7 +450,7 @@
     <component id="psphix" name="ComDeduction.xml" path="/components/"/>
     <component id="psphiy" name="ComSkillShow.xml" path="/components/"/>
     <component id="psphiz" name="ComTargetCard.xml" path="/components/"/>
-    <component id="psphj0" name="ComClick(1).xml" path="/components/"/>
+    <component id="psphj0" name="ComStarClick.xml" path="/components/"/>
     <component id="psphj1" name="ComSkillTips.xml" path="/components/"/>
     <component id="psphj2" name="ComAllCircle.xml" path="/components/"/>
     <component id="psphj4" name="ComAllPerfect.xml" path="/components/"/>
@@ -647,10 +645,22 @@
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
-    <component id="ofwup0" name="ListCardSkillItem.xml" path="/"/>
-    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/"/>
-    <component id="ofwup2" name="ComSkillTips.xml" path="/"/>
+    <component id="ofwup0" name="ListCardSkillItem.xml" path="/components/"/>
+    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/components/"/>
+    <component id="ofwup2" name="ComArenaSkillTips.xml" path="/components/"/>
     <image id="jx6zp3" name="zjm_dibutb_db.png" path="/imagesNew/"/>
+    <image id="jx6zp4" name="fuben_bg.png" path="/"/>
+    <image id="jx6zp5" name="sn_txt_xfqs.png" path="/imagesNew/"/>
+    <image id="jx6zp6" name="sn_img_circle.png" path="/imagesNew/"/>
+    <image id="jx6zp7" name="sn_img_ver.png" path="/imagesNew/"/>
+    <image id="jx6zp8" name="sn_txt_gzs.png" path="/imagesNew/"/>
+    <image id="jx6zp9" name="sn_txt_jjc.png" path="/imagesNew/"/>
+    <image id="jx6zpa" name="sn_txt_tydc.png" path="/imagesNew/"/>
+    <image id="jx6zpb" name="sn_txt_wss.png" path="/imagesNew/"/>
+    <component id="jx6zpc" name="ButtonModle8.xml" path="/components/"/>
+    <component id="jx6zpd" name="ButtonModle9.xml" path="/components/"/>
+    <component id="jx6zpe" name="StoryFightFailUI.xml" path="/" exported="true"/>
+    <component id="jx6zpf" name="ListFailItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 2;
+        public int maxFightSpeed = 6;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

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

@@ -178,9 +178,9 @@ namespace GFGGame
                     return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.paramsArr[1]);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
-                {
-                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
-                }
+                    {
+                        return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
+                    }
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }
@@ -195,52 +195,6 @@ namespace GFGGame
             return false;
         }
 
-        /// <summary>
-        /// 任务界面跳转
-        /// </summary>
-        /// <param name="jumpId"></param>
-        public void JumpToView(string jumpId, object[] param, object[] goBackDatas)
-        {
-            switch (jumpId)
-            {
-                case nameof(LeagueAnswerView):
-
-                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
-                    {
-                        ViewManager.Show<LeagueView>(null, goBackDatas, true);
-                        ViewManager.Show($"GFGGame.{jumpId}");
-                    }
-                    else
-                    {
-                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
-                    }
-
-                    break;
-                case nameof(LeagueView):
-                    if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
-                    {
-                        ViewManager.Show<LeagueView>(null, goBackDatas, true);
-                    }
-                    else
-                    {
-                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, true, true);
-                    }
-                    break;
-                case nameof(StoreView):
-                    ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
-                    ViewManager.Show<StoreView>(param, goBackDatas);
-                    break;
-                case nameof(StoryChapterListView):
-                    ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, true, true);
-                    break;
-                default:
-                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, true, true);
-                    break;
-            }
-        }
-
         public void Clear()
         {
             TaskInfosDic.Clear();

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

@@ -31,7 +31,7 @@ namespace GFGGame
             //背景1
             Transform tf1 = sceneObj.transform.Find("Bg1");
             SpriteRenderer spr1 = tf1.GetComponent<SpriteRenderer>();
-            var resPath1 = ResPathUtil.GetBgImgPath("zjm_2");
+            var resPath1 = ResPathUtil.GetBgImgPath("fuben_bg");
             Sprite sp1 = GFGAsset.Load<Sprite>(resPath1);
             DressUpUtil.AddAssetReleaser(tf1.gameObject, resPath);
             spr1.sprite = sp1;

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonModle4
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8ir";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle4";
-        private static UI_ButtonModle4 _proxy;
-
-        public static UI_ButtonModle4 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle4();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonModle4 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle4();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonModle5
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8is";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle5";
-        private static UI_ButtonModle5 _proxy;
-
-        public static UI_ButtonModle5 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle5();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonModle5 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle5();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ButtonModle6
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GLoader m_icon1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8it";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle6";
-        private static UI_ButtonModle6 _proxy;
-
-        public static UI_ButtonModle6 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle6();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonModle6 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle6();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_holder1 = null;
-            m_icon1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle6.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle2.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle8.cs

@@ -4,21 +4,21 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ButtonModle2
+    public partial class UI_ButtonModle8
     {
         public GButton target;
         public GGraph m_holder;
-        public GGraph m_holder1;
         public GLoader m_icon1;
+        public GGraph m_holder1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8ip";
+        public const string URL = "ui://mfvz4q8kjx6zpc";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle2";
-        private static UI_ButtonModle2 _proxy;
+        public const string RES_NAME = "ButtonModle8";
+        private static UI_ButtonModle8 _proxy;
 
-        public static UI_ButtonModle2 Create(GObject gObject = null)
+        public static UI_ButtonModle8 Create(GObject gObject = null)
         {
-            var ui = new UI_ButtonModle2();
+            var ui = new UI_ButtonModle8();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ButtonModle2 Proxy(GObject gObject = null)
+        public static UI_ButtonModle8 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ButtonModle2();
+                _proxy = new UI_ButtonModle8();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -59,15 +59,15 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
-            m_holder1 = null;
             m_icon1 = null;
+            m_holder1 = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle2.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle8.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: da3532dc70093064f83cadbc83fc1230
+guid: 676d22f16cf0a8343b915731a75c25d1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle9.cs

@@ -4,21 +4,21 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ButtonModle3
+    public partial class UI_ButtonModle9
     {
         public GButton target;
         public GGraph m_holder;
-        public GGraph m_holder1;
         public GLoader m_icon1;
+        public GGraph m_holder1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8iq";
+        public const string URL = "ui://mfvz4q8kjx6zpd";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ButtonModle3";
-        private static UI_ButtonModle3 _proxy;
+        public const string RES_NAME = "ButtonModle9";
+        private static UI_ButtonModle9 _proxy;
 
-        public static UI_ButtonModle3 Create(GObject gObject = null)
+        public static UI_ButtonModle9 Create(GObject gObject = null)
         {
-            var ui = new UI_ButtonModle3();
+            var ui = new UI_ButtonModle9();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ButtonModle3 Proxy(GObject gObject = null)
+        public static UI_ButtonModle9 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ButtonModle3();
+                _proxy = new UI_ButtonModle9();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -59,15 +59,15 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon1 = (GLoader)comp.GetChild("icon1");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_holder = null;
-            m_holder1 = null;
             m_icon1 = null;
+            m_holder1 = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle3.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle9.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f5d5cd4ad253de94dbb54ba135e78a00
+guid: 5225c1b1730e8a346b9fd6c97f8a105a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComArenaSkillTips.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComSkillTips
+    public partial class UI_ComArenaSkillTips
     {
         public GComponent target;
         public GTextField m_txtName;
         public GTextField m_txtSkillTips;
         public const string URL = "ui://mfvz4q8kofwup2";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComSkillTips";
-        private static UI_ComSkillTips _proxy;
+        public const string RES_NAME = "ComArenaSkillTips";
+        private static UI_ComArenaSkillTips _proxy;
 
-        public static UI_ComSkillTips Create(GObject gObject = null)
+        public static UI_ComArenaSkillTips Create(GObject gObject = null)
         {
-            var ui = new UI_ComSkillTips();
+            var ui = new UI_ComArenaSkillTips();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComSkillTips Proxy(GObject gObject = null)
+        public static UI_ComArenaSkillTips Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComSkillTips();
+                _proxy = new UI_ComArenaSkillTips();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle4.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComArenaSkillTips.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9107d46dc08f8c54d9ceece7fd1877c7
+guid: d12b42a471c05884ba7d9af303692534
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillTips.cs.meta

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

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ListFailItem
+    {
+        public GComponent target;
+        public GTextField m_txtDesc;
+        public GButton m_btnGo;
+        public const string URL = "ui://mfvz4q8kjx6zpf";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ListFailItem";
+        private static UI_ListFailItem _proxy;
+
+        public static UI_ListFailItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListFailItem();
+            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_ListFailItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListFailItem();
+            }
+            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_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtDesc = null;
+            m_btnGo = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle5.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListFailItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5e7ff38ed7572f3479bf66b2f2370fc6
+guid: 05516d9d74aef834996cc69d986ae437
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -27,13 +27,13 @@ namespace UI.Main
         public UI_BtnModle2 m_btnActivityDay7;
         public UI_BtnModle2 m_btnActivityLuckyBox;
         public GGroup m_grpLeft;
-        public UI_ButtonModle6 m_btnArena;
+        public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
-        public UI_ButtonModle2 m_btnStudio;
-        public UI_ButtonModle3 m_btnTravel;
-        public UI_ButtonModle5 m_btnPoem;
-        public UI_ButtonModle4 m_btnField;
-        public UI_Component7 m_loaLeft;
+        public UI_ButtonModle9 m_btnStudio;
+        public UI_ButtonModle9 m_btnTravel;
+        public UI_ButtonModle8 m_btnPoem;
+        public UI_ButtonModle9 m_btnField;
+        public UI_ButtonModle8 m_btnArena;
         public GGroup m_grpRight;
         public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
@@ -108,13 +108,13 @@ namespace UI.Main
             m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
             m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
-            m_btnArena = (UI_ButtonModle6)UI_ButtonModle6.Create(comp.GetChild("btnArena"));
+            m_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
-            m_btnStudio = (UI_ButtonModle2)UI_ButtonModle2.Create(comp.GetChild("btnStudio"));
-            m_btnTravel = (UI_ButtonModle3)UI_ButtonModle3.Create(comp.GetChild("btnTravel"));
-            m_btnPoem = (UI_ButtonModle5)UI_ButtonModle5.Create(comp.GetChild("btnPoem"));
-            m_btnField = (UI_ButtonModle4)UI_ButtonModle4.Create(comp.GetChild("btnField"));
-            m_loaLeft = (UI_Component7)UI_Component7.Create(comp.GetChild("loaLeft"));
+            m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
+            m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
+            m_btnPoem = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnPoem"));
+            m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
+            m_btnArena = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnArena"));
             m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
@@ -160,8 +160,7 @@ namespace UI.Main
             m_btnActivityLuckyBox.Dispose();
             m_btnActivityLuckyBox = null;
             m_grpLeft = null;
-            m_btnArena.Dispose();
-            m_btnArena = null;
+            m_loaLeft = null;
             m_btn1.Dispose();
             m_btn1 = null;
             m_btnStudio.Dispose();
@@ -172,8 +171,8 @@ namespace UI.Main
             m_btnPoem = null;
             m_btnField.Dispose();
             m_btnField = null;
-            m_loaLeft.Dispose();
-            m_loaLeft = null;
+            m_btnArena.Dispose();
+            m_btnArena = null;
             m_grpRight = null;
             m_grpMove = null;
             m_loaGuidestudio = null;

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

@@ -15,7 +15,7 @@ namespace UI.Main
         public GButton m_btnUpCard;
         public GList m_listSkill;
         public GTextField m_txtTips;
-        public UI_ComSkillTips m_comSkillTips;
+        public UI_ComArenaSkillTips m_comSkillTips;
         public const string URL = "ui://mfvz4q8kr1a99d";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryCardChooseUI";
@@ -71,7 +71,7 @@ namespace UI.Main
             m_btnUpCard = (GButton)comp.GetChild("btnUpCard");
             m_listSkill = (GList)comp.GetChild("listSkill");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
-            m_comSkillTips = (UI_ComSkillTips)UI_ComSkillTips.Create(comp.GetChild("comSkillTips"));
+            m_comSkillTips = (UI_ComArenaSkillTips)UI_ComArenaSkillTips.Create(comp.GetChild("comSkillTips"));
         }
         public void Dispose(bool disposeTarget = false)
         {

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

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightFailUI.cs.meta

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

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

@@ -227,7 +227,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param,
+            ViewManager.JumpToView(taskCfg.jumpId, param,
                 new[] { typeof(ActivityDay7View).FullName, viewData });
         }
 

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -122,7 +122,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
+            ViewManager.JumpToView(taskCfg.jumpId, param, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
         }
     }
 }

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

@@ -133,6 +133,7 @@ namespace GFGGame
             this.UpdateUpSkillView();
             this.UpdateRedDot();
             _comFosterBottom.m_ctrlTab.selectedIndex = this._selectTab;
+            _comFosterBottom.m_listSkill.selectedIndex = 0;
 
             List<CardStarCfg> cardStarCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
             for (int i = 0; i < cardStarCfgs.Count; i++)
@@ -747,7 +748,6 @@ namespace GFGGame
         {
             // RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
             _comFosterBottom.m_listSkill.numItems = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id).Count;
-            _comFosterBottom.m_listSkill.selectedIndex = 0;
             _comFosterBottom.m_ctrlSkillCount.selectedIndex = _comFosterBottom.m_listSkill.numItems;
         }
 

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

@@ -0,0 +1,98 @@
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.Main;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class StoryFightFailView : BaseWindow
+    {
+        private UI_StoryFightFailUI _ui;
+        private List<LevelTipsCfg> _cfgs = new List<LevelTipsCfg>();
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_StoryFightFailUI.PACKAGE_NAME;
+            _ui = UI_StoryFightFailUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = RenderListItem;
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            for (int i = 0; i < LevelTipsCfgArray.Instance.dataArray.Length; i++)
+            {
+                LevelTipsCfg cfg = LevelTipsCfgArray.Instance.dataArray[i];
+                if (cfg.storyLevel > 0 && InstanceZonesDataManager.currentLevelCfgId != cfg.storyLevel) continue;
+                _cfgs.Add(cfg);
+            }
+            _ui.m_list.numItems = _cfgs.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _cfgs.Clear();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+
+        private void RenderListItem(int index, GObject gObject)
+        {
+            UI_ListFailItem item = UI_ListFailItem.Proxy(gObject);
+
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+
+            item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[fightCfg.scoreType]);
+            if (item.m_btnGo.data == null)
+            {
+                item.m_btnGo.onClick.Add(OnBtnGoClick);
+            }
+            item.m_btnGo.data = _cfgs[index];
+
+            UI_ListFailItem.ProxyEnd();
+
+        }
+
+        private void OnBtnGoClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            LevelTipsCfg cfg = obj.data as LevelTipsCfg;
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(cfg.jumpId)) return;
+            object[] param = new object[cfg.jumpParamArr.Length];
+            for (int i = 0; i < cfg.jumpParamArr.Length; i++)
+            {
+                param[i] = cfg.jumpParamArr[i];
+            }
+            Hide();
+            ViewManager.Hide<StroyFightResultView>();
+            ViewManager.JumpToView(cfg.jumpId, param, null, false);
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightFailView.cs.meta

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

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

@@ -141,7 +141,7 @@ namespace GFGGame
                 _ui.m_comExpBar.m_txtExpAdded.SetVar("value", fightCfg.exp.ToString()).FlushVars();
             }
 
-            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
+            if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field && this._resultData.Result && FieldDataManager.Instance.currFightLv < FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId).num)
             {
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
@@ -210,6 +210,8 @@ namespace GFGGame
                 _ui.m_comExpBar.m_proExp.m_comHolder.target.width = t.value.x / cfgExp * _ui.m_comExpBar.m_proExp.m_comHolder.target.initWidth;
             }).OnComplete(() =>
             {
+                if (!this._resultData.Result) ViewManager.Show<StoryFightFailView>();
+
                 InstanceZonesDataManager.isResultFighting = false;
             });
             _ui.m_btnClose.enabled = true;

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

@@ -161,18 +161,18 @@ namespace GFGGame
             _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
             _ui.m_loaRight.target.onClick.Add(MoveLeft);
-            _ui.m_loaLeft.target.onClick.Add(MoveRight);
+            _ui.m_loaLeft.onClick.Add(MoveRight);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
             _ui.m_comListAd.m_listAd.scrollPane.onScrollEnd.Add(OnListAdScrollEnd);
             _ui.m_comListAd.m_listAd.scrollPane.decelerationRate = 0.8f;
 
-            swipeGesture = new SwipeGesture(_ui.target);
-            swipeGesture.onAction.Add(OnSwipe);
-            swipeGesture.onBegin.Add(OnSwipeBegin);
-            swipeGesture.onEnd.Add(OnSwipeEnd);
-            swipeGesture.actionDistance = swipeDistance;
+            // swipeGesture = new SwipeGesture(_ui.target);
+            // swipeGesture.onAction.Add(OnSwipe);
+            // swipeGesture.onBegin.Add(OnSwipeBegin);
+            // swipeGesture.onEnd.Add(OnSwipeEnd);
+            // swipeGesture.actionDistance = swipeDistance;
             _ui.m_list.ResizeToFit();
             _ui.m_btnChange.target.onClick.Add(OnBtnChangClick);
             _ui.m_btnChange.m_c1.selectedIndex = 1;
@@ -281,16 +281,12 @@ namespace GFGGame
 
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl_d");
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_zzl");
-            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4,
-                out _wrapper4);
-            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3,
-                out _effectObj4_1, out _wrapper4_1);
+            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4, out _wrapper4);
+            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
 
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_jt");
-            SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6,
-                out _wrapper6);
-            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7,
-                out _wrapper7);
+            // SceneController.AddObjectToView(_effectObj6, _wrapper6, _ui.m_loaLeft.m_holder, resPath4, out _effectObj6,out _wrapper6);
+            SceneController.AddObjectToView(_effectObj7, _wrapper7, _ui.m_loaRight.m_holder, resPath4, out _effectObj7, out _wrapper7);
 
 
             // string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
@@ -1094,24 +1090,24 @@ namespace GFGGame
                 GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
 
 
-                bool isStudioMetalGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PORCELAIN, 2, "向左滑动界面。", -1,
+                bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
                     false, _ui.target.height - 700);
-                bool isStudioFilingGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_FILING, 2, "向左滑动界面。", -1,
+                bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_loaRight.target, 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(_ui.m_loaRight.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
 
-                bool isStudioPropertyGuide = GuideController.TryGuide(null, ConstGuideId.STUDIO_PROPERTY, 1, "向左滑动界面。", -1, false, _ui.target.height - 700);
+                bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
 
-
-                if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
-                {
-                    _ui.m_loaGuidestudio.visible = true;
-                    MainDataManager.Instance.CanSwipe = true;
-                }
-                else
-                {
-                    _ui.m_loaGuidestudio.visible = false;
-                }
+                _ui.m_loaGuidestudio.visible = false;
+                // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
+                // {
+                //     _ui.m_loaGuidestudio.visible = true;
+                //     MainDataManager.Instance.CanSwipe = true;
+                // }
+                // else
+                // {
+                //     _ui.m_loaGuidestudio.visible = false;
+                // }
             }
             if (MainDataManager.Instance.ViewType == 1)
             {
@@ -1121,7 +1117,7 @@ namespace GFGGame
                 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);
+                GuideController.TryGuide(_ui.m_loaLeft, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
             }
         }
     }

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

@@ -228,7 +228,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            TaskDataManager.Instance.JumpToView(taskCfg.jumpId, param, new[] { typeof(TaskView).FullName, viewData });
+            ViewManager.JumpToView(taskCfg.jumpId, param, new[] { typeof(TaskView).FullName, viewData });
         }
 
         private async void OnBtnGetAllClick()
@@ -259,17 +259,17 @@ namespace GFGGame
             switch (state)
             {
                 case ConstBonusStatus.CAN_NOT_GET:
-                {
-                    var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                    ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
-                    break;
-                }
+                    {
+                        var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
+                        ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
+                        break;
+                    }
                 case ConstBonusStatus.CAN_GET:
-                {
-                    var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
-                    if (result) UpdateLivenessProcess();
-                    break;
-                }
+                    {
+                        var result = await DailyTaskSProxy.ReqLivenessBox(cfg.id);
+                        if (result) UpdateLivenessProcess();
+                        break;
+                    }
                 case ConstBonusStatus.GOT:
                     //领取完毕
                     break;

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -289,6 +289,7 @@ namespace GFGGame
             }
             else
             {
+                MainDataManager.Instance.ViewType = 0;
                 ViewManager.Show(ViewName.MAINUI_VIEW, null, null, hideOther);
             }
         }
@@ -413,6 +414,54 @@ namespace GFGGame
 
         }
 
+        /// <summary>
+        /// 任务界面跳转
+        /// </summary>
+        /// <param name="jumpId"></param>
+        public static void JumpToView(string jumpId, object[] param, object[] goBackDatas, bool hideOther = true, Action onSuccess = null)
+        {
+            switch (jumpId)
+            {
+                case nameof(LeagueAnswerView):
 
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
+                        ViewManager.Show($"GFGGame.{jumpId}");
+                    }
+                    else
+                    {
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
+                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
+                    }
+
+                    break;
+                case nameof(LeagueView):
+                    if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
+                    }
+                    else
+                    {
+                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
+                    }
+                    break;
+                case nameof(StoreView):
+                    ViewManager.Show(goBackDatas[0].ToString(), goBackDatas.Length > 1 ? goBackDatas[1] : null);
+                    ViewManager.Show<StoreView>(param, goBackDatas);
+                    break;
+                case nameof(StoryChapterListView):
+                    ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, hideOther, true);
+                    break;
+                case nameof(StoryChapterView):
+                    ViewManager.Show<StoryChapterView>(param[0], goBackDatas, hideOther);
+                    break;
+                default:
+                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, hideOther, true);
+                    break;
+            }
+            onSuccess?.Invoke();
+        }
     }
 }