Explorar o código

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

guodong %!s(int64=2) %!d(string=hai) anos
pai
achega
c57d5827de

+ 1 - 1
FGUIProject/assets/ClothingShop/package.xml

@@ -48,7 +48,7 @@
     <image id="r9rieg" name="hl_jfscibt.png" path="/images/"/>
     <image id="r9rieh" name="jfsc_dik.png" path="/images/" scale="9grid" scale9grid="113,105,226,103"/>
     <component id="r9ri65" name="ComItemList.xml" path="/components/"/>
-    <image id="r9ri66" name="pz_dktu_1.png" path="/images/"/>
+    <image id="r9ri66" name="pz_dktu_1.png" path="/images/" scale="9grid" scale9grid="270,190,540,380"/>
     <component id="r9ri67" name="Component3.xml" path="/components/"/>
     <component id="r9ri68" name="Button7.xml" path="/components/"/>
     <image id="r9ri69" name="pz_xiantiao.png" path="/images/"/>

+ 7 - 13
FGUIProject/assets/Main/MainUI.xml

@@ -37,23 +37,23 @@
     <component id="n69_weok" name="loaRight" src="weokii" fileName="components/Component7.xml" xy="930,1447" group="n52_qqat">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
+    <list id="n41_wg7t" name="list" xy="916,290" size="97,1182" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
       <relation target="" sidePair="right-right,top-top"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xj" name="btnYouJian"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xa" name="btnHaoYou"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xe" name="btnRenWu"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xd" name="btnPengYouQuan"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xb" name="btnJInShu"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xg" name="btnTuJian"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08xf" name="btnTianGong"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kndrd7k" name="btnStore"/>
-      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kdhoaif" name="btnBag"/>
     </list>
-    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,466" pivot="0.5,0" anchor="true" group="n57_oju1">
+    <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="964,1472" pivot="0.5,0" anchor="true" group="n57_oju1" visible="false">
       <relation target="n41_wg7t" sidePair="center-center,bottom-bottom"/>
     </component>
-    <group id="n57_oju1" name="grpList" xy="913,308" size="102,271" group="n52_qqat" advanced="true"/>
+    <group id="n57_oju1" name="grpList" xy="913,290" size="102,1295" group="n52_qqat" advanced="true"/>
     <group id="n52_qqat" name="grpLeft" xy="0,160" size="1130,1760" group="n59_oju1" advanced="true"/>
     <component id="n73_mzf8" name="btn0" src="mzf8it" fileName="components/ButtonModle6.xml" xy="71,447" group="n58_oju1">
       <Button icon="ui://mfvz4q8kmzf8in"/>
@@ -117,10 +117,4 @@
     <item time="0" type="Visible" target="n52_qqat" value="false"/>
     <item time="0" type="Visible" target="n58_oju1" value="true"/>
   </transition>
-  <transition name="t16" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="XY" target="n69_weok" tween="true" startValue="930,1447" endValue="920,1447" duration="12" ease="Linear"/>
-    <item time="0" type="XY" target="n70_weok" tween="true" startValue="150,1447" endValue="160,1447" duration="12" ease="Linear"/>
-    <item time="12" type="XY" target="n69_weok" tween="true" startValue="920,1447" endValue="930,1447" duration="12" ease="Linear"/>
-    <item time="12" type="XY" target="n70_weok" tween="true" startValue="160,1447" endValue="150,1447" duration="12" ease="Linear"/>
-  </transition>
 </component>

+ 13 - 12
FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -7,29 +7,30 @@
       <Button title="开始旅程"/>
     </component>
     <loader id="n16_t8o1" name="loaderHead" xy="209,392" pivot="0.5,0.5" anchor="true" size="362,481" group="n54_rqo4" aspect="true" url="ui://mfvz4q8kv95qhp" align="center" fill="scale" clearOnPublish="true"/>
-    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,228" group="n61_v95q">
+    <image id="n34_pal5" name="n34" src="j48o97" fileName="images/zx_jq_rwbszik.png" xy="32,219" size="76,374" group="n61_v95q">
       <relation target="" sidePair="top-top"/>
+      <relation target="n21_t8o1" sidePair="height-height"/>
     </image>
-    <text id="n21_t8o1" name="txtTargetName" xy="53,257" pivot="0.5,0" size="32,278" group="n61_v95q" font="ui://eg2y0ldpwonotja" fontSize="32" color="#af8f6d" align="center" leading="0" autoSize="height" text="对手:走秀模特">
+    <text id="n21_t8o1" name="txtTargetName" xy="51,270" pivot="0.5,0" size="36,278" group="n61_v95q" font="ui://eg2y0ldpwonotja" fontSize="32" color="#af8f6d" align="center" vAlign="middle" leading="0" autoSize="height" text="对手名字五个字">
       <relation target="n34_pal5" sidePair="top-top"/>
     </text>
-    <group id="n61_v95q" name="n61" xy="32,228" size="76,362" group="n54_rqo4"/>
-    <group id="n54_rqo4" name="n54" xy="27,151" size="362,481"/>
+    <group id="n61_v95q" name="n61" xy="32,219" size="76,374" group="n54_rqo4"/>
+    <group id="n54_rqo4" name="n54" xy="28,151" size="362,481"/>
     <text id="n4_t8o1" name="txtTitle" xy="384,158" pivot="0.5,0" size="536,72" group="n60_v95q" fontSize="54" color="#91724a" align="center" autoSize="none" autoClearText="true" text="关卡标题"/>
-    <text id="n38_j48o" name="n38" xy="392,258" size="184,49" group="n50_rqo4" fontSize="36" color="#9e8059" text="最高评分:"/>
+    <text id="n38_j48o" name="n38" xy="392,258" size="181,49" group="n50_rqo4" fontSize="36" color="#9e8059" text="最高评分:"/>
     <text id="n7_t8o1" name="txtHighestScore" xy="585,258" size="226,57" group="n50_rqo4" fontSize="36" color="#d6817b" ubb="true" autoSize="none" autoClearText="true" text="9999"/>
     <component id="n8_t8o1" name="flower" src="s2cc5k" fileName="components/CompFlower1.xml" xy="702,260" group="n50_rqo4">
       <relation target="n7_t8o1" sidePair="left-left,top-top"/>
     </component>
     <group id="n50_rqo4" name="n50" xy="392,258" size="445,57" group="n60_v95q"/>
-    <text id="n39_j48o" name="n39" xy="392,325" size="184,49" group="n51_rqo4" fontSize="36" color="#9e8059" text="通关属性:"/>
+    <text id="n39_j48o" name="n39" xy="392,325" size="181,49" group="n51_rqo4" fontSize="36" color="#9e8059" text="通关属性:"/>
     <loader id="n37_d4iw" name="scoreType" xy="586,323" size="50,50" group="n51_rqo4" url="ui://eg2y0ldp842s6h" fill="scale"/>
     <group id="n51_rqo4" name="n51" xy="392,323" size="244,51" group="n60_v95q"/>
-    <text id="n40_j48o" name="n40" xy="392,390" size="184,49" group="n52_rqo4" fontSize="36" color="#9e8059" text="通关条件:">
+    <text id="n40_j48o" name="n40" xy="392,390" size="181,49" group="n52_rqo4" fontSize="36" color="#9e8059" text="通关条件:">
       <gearDisplay controller="ctrlNeed" pages="1,2"/>
       <gearText controller="ctrlNeed" pages="2" values="通关加分:" default="通关条件:"/>
     </text>
-    <richtext id="n45_rfkv" name="txtNeed" xy="585,390" size="148,49" group="n52_rqo4" fontSize="36" color="#d6817b" text="赵钱孙李">
+    <richtext id="n45_rfkv" name="txtNeed" xy="585,390" size="146,49" group="n52_rqo4" fontSize="36" color="#d6817b" text="赵钱孙李">
       <gearDisplay controller="ctrlNeed" pages="1"/>
     </richtext>
     <list id="n42_j48o" name="listTag" xy="586,398" size="206,41" group="n52_rqo4" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
@@ -38,8 +39,8 @@
       <item/>
     </list>
     <group id="n52_rqo4" name="n52" xy="392,390" size="400,49" group="n60_v95q"/>
-    <text id="n48_rqo4" name="n48" xy="392,389" size="184,49" group="n53_rqo4" fontSize="36" color="#9e8059" text="套装增益:"/>
-    <richtext id="n49_rqo4" name="txtAddition" xy="585,388" size="148,49" group="n53_rqo4" fontSize="36" color="#c67c6b" text="赵钱孙李"/>
+    <text id="n48_rqo4" name="n48" xy="392,389" size="181,49" group="n53_rqo4" fontSize="36" color="#9e8059" text="套装增益:"/>
+    <richtext id="n49_rqo4" name="txtAddition" xy="585,388" size="146,49" group="n53_rqo4" fontSize="36" color="#c67c6b" text="赵钱孙李"/>
     <component id="n56_hbio" name="btnAdditionDesc" src="hbiofi" fileName="components/Button3.xml" xy="754,391" group="n53_rqo4"/>
     <image id="n57_hbio" name="n57" src="v482fl" fileName="images/cyjd_tsts.png" xy="515,317" pivot="0.5,0" group="n59_hbio"/>
     <text id="n58_hbio" name="txtAdditionDesc" xy="524,322" size="474,44" group="n59_hbio" fontSize="32" color="#d1928d" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="孔雀东南飞套装收集进度:(0/1)"/>
@@ -67,8 +68,8 @@
       <relation target="n0_vxw5" sidePair="right-right"/>
     </group>
     <loader id="n46_kzvk" name="btnGuide" xy="480,1455" size="120,120"/>
-    <text id="n22_t8o1" name="txtUnpassTips" xy="200,1079" pivot="0.5,0" size="404,54" group="n24_t8o1" fontSize="40" color="#d1b3b1" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
+    <text id="n22_t8o1" name="txtUnpassTips" xy="203,1079" pivot="0.5,0" size="398,54" group="n24_t8o1" fontSize="40" color="#d1b3b1" align="center" vars="true" singleLine="true" text="{count=二}星及以上可快速通关"/>
     <group id="n24_t8o1" name="groupUnpass" xy="200,1079" size="404,54" advanced="true"/>
-    <component id="n68_ysx9" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="785,1212"/>
+    <component id="n68_ysx9" name="comCostCurrent" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="785,1212" size="237,46"/>
   </displayList>
 </component>

+ 7 - 1
FGUIProject/assets/Main/components/Component7.xml

@@ -2,6 +2,12 @@
 <component size="200,234">
   <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"/>
+    <graph id="n70_weok" name="holder" xy="90,120" size="1,1">
+      <relation target="n69_weok" sidePair="right-right"/>
+    </graph>
   </displayList>
+  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
+    <item time="0" type="XY" target="n69_weok" tween="true" startValue="100,117" endValue="105,117" duration="15" ease="Linear"/>
+    <item time="15" type="XY" target="n69_weok" tween="true" startValue="105,117" endValue="100,117" duration="15" ease="Linear"/>
+  </transition>
 </component>

+ 3 - 3
FGUIProject/assets/poem/PoemGalleryPreviewUI.xml

@@ -21,7 +21,7 @@
     <image id="n10_r9ri" name="n10" src="r9ri126" fileName="imagesGallery/hl_hyxxk.png" xy="165,35" group="n12_r9ri"/>
     <component id="n20_v95q" name="comHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="182,41" group="n12_r9ri" scale="0.75,0.75"/>
     <text id="n4_r9ri" name="txtName" xy="361,99" size="70,46" group="n12_r9ri" fontSize="34" color="#9d7f5c" text="老六"/>
-    <component id="n7_r9ri" name="btnAddFriend" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="787,101" size="198,59" group="n12_r9ri">
+    <component id="n7_r9ri" name="btnAddFriend" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="787,101" size="246,71" group="n12_r9ri">
       <gearDisplay controller="c1" pages="0,1,3"/>
       <Button icon="ui://iyz778gkr9ri129" selectedIcon="ui://iyz778gkr9ri12u"/>
     </component>
@@ -37,10 +37,10 @@
     <group id="n12_r9ri" name="n12" xy="165,35" size="902,236"/>
     <image id="n11_r9ri" name="n11" src="r9ri125" fileName="imagesGallery/hl_grxxdi.png" xy="0,1525" group="n16_r9ri"/>
     <text id="n15_r9ri" name="txtTheme" xy="52,1733" size="466,54" group="n16_r9ri" fontSize="40" color="#ac9370" text="11/11至11/12主题名称xx"/>
-    <component id="n13_r9ri" name="btnCollect" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="710,1736" size="47,44" group="n16_r9ri">
+    <component id="n13_r9ri" name="btnCollect" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="710,1728" size="111,57" group="n16_r9ri">
       <Button title="50000" icon="ui://iyz778gkdhoatjp" selectedIcon="ui://iyz778gkdhoatjs"/>
     </component>
-    <component id="n14_r9ri" name="btnVote" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="890,1736" size="48,45" group="n16_r9ri">
+    <component id="n14_r9ri" name="btnVote" src="dhoatjt" fileName="componentsGallery/Button14.xml" xy="890,1728" size="112,58" group="n16_r9ri">
       <Button title="50000" icon="ui://iyz778gkdhoatjr" selectedIcon="ui://iyz778gkdhoatjq"/>
     </component>
     <group id="n16_r9ri" name="n16" xy="0,1525" size="1080,395" advanced="true">

+ 3 - 3
FGUIProject/assets/poem/componentsGallery/Button10.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="32,30" extention="Button">
+<component size="80,45" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_r9ri" name="icon" xy="0,0" size="32,30" url="ui://iyz778gkr9ri124" autoSize="true"/>
-    <text id="n3_r9ri" name="title" xy="34,-2" size="10,34" fontSize="24" color="#ac9370" align="center" vAlign="middle" singleLine="true" text="">
+    <loader id="n4_r9ri" name="icon" xy="0,6" size="32,33" url="ui://iyz778gkr9ri124" autoSize="true"/>
+    <text id="n3_r9ri" name="title" xy="34,5" size="45,34" fontSize="24" color="#ac9370" align="center" vAlign="middle" singleLine="true" text="520">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

+ 3 - 3
FGUIProject/assets/poem/componentsGallery/Button14.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="50,47" extention="Button">
+<component size="114,60" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_r9ri" name="icon" xy="0,0" size="50,50" url="ui://iyz778gkdhoatjq" autoSize="true"/>
-    <text id="n3_r9ri" name="title" xy="51,0" size="10,46" fontSize="34" color="#ac9370" align="center" vAlign="middle" singleLine="true" text="">
+    <loader id="n4_r9ri" name="icon" xy="0,5" size="50,50" url="ui://iyz778gkdhoatjq" autoSize="true"/>
+    <text id="n3_r9ri" name="title" xy="51,7" size="62,46" fontSize="34" color="#ac9370" align="center" vAlign="middle" singleLine="true" text="520">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

+ 4 - 4
FGUIProject/assets/poem/componentsGallery/ListItem.xml

@@ -9,14 +9,14 @@
     <image id="n21_r9ri" name="n21" src="r9ri12h" fileName="imagesGallery/hl_cjkuangdi.png" xy="0,0" size="500,903" group="n23_pac9">
       <relation target="n15_r9ri" sidePair="height-height"/>
     </image>
-    <text id="n16_r9ri" name="txtName" xy="20,838" size="184,42" group="n22_r9ri" font="ui://eg2y0ldpweoktkb" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
-    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="273,844" group="n22_r9ri">
+    <text id="n16_r9ri" name="txtName" xy="20,838" size="184,41" group="n22_r9ri" font="ui://eg2y0ldpweoktkb" fontSize="30" color="#ac9370" leading="0" letterSpacing="-4" text="名字名字名字啊"/>
+    <component id="n19_r9ri" name="btnCollect" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="273,841" size="80,42" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri128" selectedIcon="ui://iyz778gkr9ri127"/>
     </component>
-    <component id="n20_r9ri" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="386,842" size="32,33" group="n22_r9ri">
+    <component id="n26_mzf8" name="btnVote" src="r9ri12j" fileName="componentsGallery/Button10.xml" xy="383,841" size="80,45" group="n22_r9ri">
       <Button title="50000" icon="ui://iyz778gkr9ri124" selectedIcon="ui://iyz778gkr9ri123"/>
     </component>
-    <group id="n22_r9ri" name="n22" xy="20,838" size="398,42" group="n23_pac9" advanced="true">
+    <group id="n22_r9ri" name="n22" xy="20,838" size="443,48" group="n23_pac9" advanced="true">
       <relation target="n15_r9ri" sidePair="top-bottom"/>
     </group>
     <group id="n23_pac9" name="n23" xy="0,0" size="500,903" advanced="true">

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaRight;
         public GGraph m_holder;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kweokii";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "Component7";
@@ -58,11 +59,13 @@ namespace UI.Main
         {
             m_loaRight = (GLoader)comp.GetChild("loaRight");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaRight = null;
             m_holder = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -34,7 +34,6 @@ namespace UI.Main
         public Transition m_t2;
         public Transition m_t3;
         public Transition m_t4;
-        public Transition m_t16;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "MainUI";
@@ -109,7 +108,6 @@ namespace UI.Main
             m_t2 = comp.GetTransition("t2");
             m_t3 = comp.GetTransition("t3");
             m_t4 = comp.GetTransition("t4");
-            m_t16 = comp.GetTransition("t16");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -156,7 +154,6 @@ namespace UI.Main
             m_t2 = null;
             m_t3 = null;
             m_t4 = null;
-            m_t16 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/PictureStorageHelper.cs

@@ -78,6 +78,7 @@ namespace GFGGame
             {
                 ET.Log.Error("Download  fild!!!");
                 data.Ntexture = null;
+                ViewManager.Hide<ModalStatusView>();
                 yield return null;
             }
             using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(data.PictureTempUrl))
@@ -99,6 +100,7 @@ namespace GFGGame
             }
         }
 
+
         public static IEnumerator Download(List<PoemPhotoData> list)
         {
             for (int i = 0; i < list.Count; i++)
@@ -117,6 +119,7 @@ namespace GFGGame
             {
                 ET.Log.Error("Download  fild!!!");
                 data.Ntexture = null;
+                ViewManager.Hide<ModalStatusView>();
                 yield return null;
             }
             using (UnityWebRequest request = UnityWebRequestTexture.GetTexture(data.PictureTempUrl))

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -715,12 +715,12 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
 
         }
-        private void Skip(object param = null)
+        private async void Skip(object param = null)
         {
-            Reset();
             EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
             EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
-            InstanceZonesController.CheckStoryFightResult().Coroutine();
+            await InstanceZonesController.CheckStoryFightResult();
+            Reset();
         }
         private void Reset()
         {

BIN=BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN=BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/Poem/Poem_fui.bytes