Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

# Conflicts:
#	GameClient/Assets/Res/Texture/BgImg/cj_tp_1.png
#	GameClient/Assets/Res/Texture/BgImg/cj_tp_2.png
#	GameClient/Assets/Res/Texture/BgImg/cj_tp_3.png

FGUIProject/assets/Card/components/ComConsume.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="170,175">
   <displayList>
-    <loader id="n35_842s" name="n35" xy="5,15" size="160,160" url="ui://7l6lvkay842s6g" fill="scaleFree"/>
-    <loader id="n36_842s" name="loaItem" xy="29,41" size="112,112" url="ui://eg2y0ldppq5x62" fill="scaleFree">
+    <loader id="n35_842s" name="loaBg" xy="5,15" size="160,160" url="ui://7l6lvkay842s6g" fill="scaleFree"/>
+    <loader id="n36_842s" name="loaItem" xy="29,41" size="112,112" touchable="false" url="ui://eg2y0ldppq5x62" fill="scaleFree">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="32,5"/>
-    <component id="n34_842s" name="btnMinus" src="vek88j" fileName="components/btnMinus.xml" xy="115,-3" pkg="eg2y0ldp"/>
+    <component id="n34_842s" name="btnMinus" src="vek88j" fileName="components/btnMinus.xml" pkg="eg2y0ldp" xy="115,-3"/>
     <text id="n39_a713" name="txtUseCount" xy="85,4" pivot="0.5,0" anchor="true" size="82,34" fontSize="24" color="#fff8ea" align="center" autoSize="none" text="1222"/>
     <image id="n37_a713" name="n37" src="a7137b" fileName="images/kp_dikuang_7.png" xy="15,145"/>
     <text id="n38_a713" name="txtNum" xy="53,150" pivot="0.5,0" size="64,34" fontSize="24" color="#fff8ea" text="6666"/>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -6,8 +6,8 @@
   <displayList>
     <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
     <component id="n67_lc71" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,621"/>
-    <loader id="n26_842s" name="loaRarity" xy="388,918" size="62,62" group="n30_842s" url="ui://eg2y0ldp842s6n" autoSize="true"/>
-    <text id="n27_842s" name="txtName" xy="597,902" pivot="0.5,0" anchor="true" size="244,79" group="n30_842s" fontSize="60" color="#fdfbf3" text="许墨萌牙"/>
+    <loader id="n26_842s" name="loaRarity" xy="388,918" size="62,62" group="n30_842s" visible="false" url="ui://eg2y0ldp842s6n" autoSize="true"/>
+    <text id="n27_842s" name="txtName" xy="540,902" pivot="0.5,0" anchor="true" size="244,79" group="n30_842s" fontSize="60" color="#fdfbf3" text="许墨萌牙"/>
     <image id="n28_842s" name="n28" src="842s6j" fileName="images/kp_xiantiao.png" xy="731,948" size="341,10" group="n30_842s"/>
     <image id="n29_842s" name="n29" src="842s6j" fileName="images/kp_xiantiao.png" xy="13,948" size="341,10" group="n30_842s" flip="hz"/>
     <group id="n30_842s" name="grpName" xy="13,902" size="1059,79"/>

FGUIProject/assets/CommonGame/components/Button9.xml

@@ -8,7 +8,7 @@
     <text id="n1_842s" name="title" xy="135,7" pivot="0.5,0" anchor="true" size="148,49" fontSize="36" color="#926651" text="自动选择">
       <relation target="" sidePair="center-center"/>
     </text>
-    <movieclip id="n2_lj7e" name="ani" src="lj7ea8" fileName="effect/MovieClip1.jta" xy="-12,-18" size="294,105" blend="screen">
+    <movieclip id="n2_lj7e" name="ani" src="lj7ea8" fileName="effect/MovieClip1.jta" xy="-12,-18" size="294,105" visible="false" blend="screen">
       <relation target="" sidePair="width-width,height-height"/>
     </movieclip>
   </displayList>

FGUIProject/assets/CommonGame/package.xml

@@ -103,7 +103,7 @@
     <image id="vek88k" name="kp_anniu_7.png" path="/images/" exported="true"/>
     <image id="vek88l" name="kp_anniu_8.png" path="/images/" exported="true"/>
     <image id="ly9g8m" name="xingxie.png" path="/imgItemIcon/" exported="true"/>
-    <image id="ly9g8n" name="luoxings.png" path="/imagesExport/" exported="true"/>
+    <image id="ly9g8n" name="luoxings.png" path="/imgItemIcon/" exported="true"/>
     <image id="iakb8o" name="hd_hdicon_1.png" path="/imgItemIcon/" exported="true"/>
     <image id="iakb8p" name="hd_hdicon_2.png" path="/imgItemIcon/" exported="true"/>
     <component id="m9wm8q" name="RewardUI.xml" path="/" exported="true"/>

FGUIProject/assets/FieldGuide/FieldGuideUI.xml

@@ -6,7 +6,7 @@
     </loader>
     <component id="n2_pjip" name="compBanner" src="pjipg" fileName="components/CompBanner.xml" xy="0,0"/>
     <component id="n1_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <list id="n13_pjip" name="listGuide" xy="58,407" size="964,1513" overflow="scroll" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
+    <list id="n13_pjip" name="listGuide" xy="43,407" size="994,1513" overflow="scroll" lineGap="50" defaultItem="ui://vqq9h9h4pjipe" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/FieldGuide/SuitShowUI.xml

@@ -9,7 +9,7 @@
     </graph>
     <image id="n11_qr4e" name="n11" src="kztethr" fileName="imagesExport/hyhy_btbt_1.png" pkg="eg2y0ldp" xy="302,70" group="n13_qr4e"/>
     <text id="n2_pjip" name="txtTypeName" xy="275,82" size="530,62" group="n13_qr4e" fontSize="46" color="#8f6e30" align="center" autoSize="none" text="分类名称"/>
-    <group id="n13_qr4e" name="n13" xy="275,70" size="530,85"/>
+    <group id="n13_qr4e" name="n13" xy="275,70" size="530,85" visible="false" advanced="true"/>
     <image id="n4_pjip" name="n4" src="pjip1d" fileName="images/tujian_tzk_1.png" xy="145,1186">
       <relation target="n3_pjip" sidePair="center-center,middle-middle"/>
     </image>
@@ -26,9 +26,9 @@
     <loader id="n6_pjip" name="btnChangeAction" xy="940,329" size="99,98" group="n12_qr4e" url="ui://vqq9h9h4pjip1e" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <loader id="n5_pjip" name="imgBonusBox" xy="940,450" size="94,95" group="n12_qr4e" url="ui://vqq9h9h4pjip1j">
+    <component id="n5_pjip" name="imgBonusBox" src="jj4d1o" fileName="components/Button4.xml" xy="940,450" size="94,95" group="n12_qr4e">
       <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
+    </component>
     <group id="n12_qr4e" name="n12" xy="940,329" size="99,216" advanced="true" layout="vt" lineGap="23" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/components/Button4.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="99,98" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_jj4d" name="n0" src="pjip1j" fileName="imagesExport/tujian_lwlw_1.png" xy="0,0">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_jj4d" name="n1" src="pjip1c" fileName="imagesExport/tujian_lwlw_2.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/FieldGuide/components/ButtonBannerPage.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="47,15" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="136,32" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n0_pjip" name="img1" src="pjipb" fileName="images/tujian_qiehuan_1.png" xy="0,0">
+    <image id="n0_pjip" name="img1" src="pjipb" fileName="images/tujian_qiehuan_1.png" xy="5,0">
       <gearDisplay controller="button" pages="1,3"/>
     </image>
-    <image id="n1_pjip" name="img2" src="pjip2" fileName="images/tujian_qiehuan_2.png" xy="0,0">
+    <image id="n1_pjip" name="img2" src="pjip2" fileName="images/tujian_qiehuan_2.png" xy="61,11">
       <gearDisplay controller="button" pages="0,2"/>
     </image>
   </displayList>

FGUIProject/assets/FieldGuide/components/CompBanner.xml

@@ -2,7 +2,8 @@
 <component size="1080,354">
   <displayList>
     <loader id="n2_pjip" name="loaderPic" xy="0,0" size="1080,354" url="ui://vqq9h9h4pjipa"/>
-    <list id="n7_pjip" name="listTab" xy="466,295" size="148,15" layout="flow_hz" colGap="19" defaultItem="ui://vqq9h9h4pjipd" autoClearItems="true">
+    <image id="n8_r0yx" name="n8" src="r0yx1p" fileName="images/tujian_qiehuan_3.png" xy="100,336"/>
+    <list id="n7_pjip" name="listTab" xy="216,316" size="648,41" layout="flow_hz" colGap="50" defaultItem="ui://vqq9h9h4pjipd" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/FieldGuide/components/CompGuideItem.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="964,295">
+<component size="994,236">
   <displayList>
     <image id="n8_pjip" name="bg" src="pjip9" fileName="images/tujian_dikuang_1.png" xy="0,0"/>
-    <loader id="n15_pjip" name="loaderPic" xy="21,17" size="922,202" url="ui://vqq9h9h4u6p31m"/>
-    <loader id="n11_pjip" name="loaderTitle" xy="15,-5" size="215,101" url="ui://vqq9h9h4pjip4"/>
+    <loader id="n15_pjip" name="loaderPic" xy="15,17" size="964,202" url="ui://vqq9h9h4r0yx1v" autoSize="true"/>
+    <loader id="n11_pjip" name="loaderTitle" xy="40,0" size="58,198" url="ui://vqq9h9h4pjip4" autoSize="true"/>
     <image id="n12_pjip" name="n12" src="pjip3" fileName="images/tujian_sjdu.png" xy="814,90"/>
     <text id="n13_pjip" name="n13" xy="834,129" size="76,34" fontSize="24" color="#fff9f0" text="收集度">
       <relation target="n12_pjip" sidePair="center-center"/>

FGUIProject/assets/FieldGuide/package.xml

@@ -49,9 +49,11 @@
     <image id="pjip1j" name="tujian_lwlw_1.png" path="/imagesExport/" exported="true"/>
     <image id="pjip1k" name="tujian_suoan.png" path="/images/"/>
     <image id="pjip1l" name="zhuxian_shuoto.png" path="/images/"/>
-    <image id="u6p31m" name="tujian_tup_1.jpg" path="/imagesExport/" exported="true"/>
     <image id="qr4e1n" name="tujian_tztub_4.png" path="/images/"/>
     <component id="z3os0" name="SuitGuideUI.xml" path="/" exported="true"/>
+    <component id="jj4d1o" name="Button4.xml" path="/components/"/>
+    <image id="r0yx1p" name="tujian_qiehuan_3.png" path="/images/"/>
+    <image id="r0yx1v" name="tujian_tup_1.png" path="/imagesExport/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Launcher/LauncherUI.xml

@@ -20,10 +20,10 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar value="100" max="100"/>
     </component>
-    <graph id="n18_slyz" name="holder" xy="-140,1620" size="10,10">
+    <graph id="n18_slyz" name="holder" xy="-90,1622" size="10,10">
       <relation target="n16_slyz" sidePair="right-right,top-top"/>
     </graph>
-    <image id="n16_slyz" name="imgAni" src="slyzp" fileName="images/dljm_chuan.png" xy="-120,1595">
+    <image id="n16_slyz" name="imgAni" src="slyzp" fileName="images/dljm_chuan.png" xy="-70,1597">
       <relation target="n15_slyz" sidePair="bottom-bottom"/>
     </image>
     <image id="n14_slyz" name="n14" src="slyzq" fileName="images/dljm_jdk.png" xy="210,1723" group="n17_slyz"/>

FGUIProject/assets/Loading/LoadingView.xml

@@ -8,10 +8,10 @@
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <ProgressBar max="100"/>
     </component>
-    <graph id="n4_hibu" name="holder" xy="-108,1621" size="10,10">
+    <graph id="n4_hibu" name="holder" xy="-90,1622" size="10,10">
       <relation target="n5_hibu" sidePair="right-right,top-top"/>
     </graph>
-    <image id="n5_hibu" name="imgAni" src="hibu6" fileName="images/dljm_chuan.png" xy="-88,1596">
+    <image id="n5_hibu" name="imgAni" src="hibu6" fileName="images/dljm_chuan.png" xy="-70,1597">
       <relation target="n3_hibu" sidePair="bottom-bottom"/>
     </image>
     <image id="n6_hibu" name="n6" src="hibu7" fileName="images/dljm_jdk.png" xy="210,1723" group="n8_hibu"/>

FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
   <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="1"/>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" fill="scaleMatchWidth">
+    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391i" fill="scaleMatchWidth">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="513,889">
+    <component id="n20_f5bl" name="comStar0_0_0" src="l5nzq" fileName="components/ComStar.xml" xy="498,973">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
     </component>
-    <component id="n31_iakb" name="comStar0_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="512,739">
+    <component id="n31_iakb" name="comStar0_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="605,857">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
     </component>
-    <component id="n32_iakb" name="comStar0_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="660,571">
+    <component id="n32_iakb" name="comStar0_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="605,857">
       <gearDisplay controller="ctrlBuyType" pages="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
     </component>
@@ -37,29 +37,30 @@
       <gearDisplay2 controller="ctrlRewardsType" pages="0" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="197,1085" group="n25_iakb"/>
-    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="716,245" group="n25_iakb"/>
-    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="301,225" group="n25_iakb"/>
-    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="205,555" group="n25_iakb"/>
-    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="634,890" group="n25_iakb"/>
-    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="789,1158" group="n25_iakb"/>
-    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="228,1363" group="n25_iakb"/>
-    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="487,1692" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="158,186" size="670,1545" advanced="true">
+    <component id="n21_iakb" name="comStar1_1_0" src="l5nzq" fileName="components/ComStar.xml" xy="389,363" group="n25_iakb"/>
+    <component id="n22_iakb" name="comStar1_1_1" src="l5nzq" fileName="components/ComStar.xml" xy="268,561" group="n25_iakb"/>
+    <component id="n23_iakb" name="comStar1_1_2" src="l5nzq" fileName="components/ComStar.xml" xy="220,778" group="n25_iakb"/>
+    <component id="n24_iakb" name="comStar1_1_3" src="l5nzq" fileName="components/ComStar.xml" xy="229,976" group="n25_iakb"/>
+    <component id="n38_o139" name="comStar1_1_4" src="l5nzq" fileName="components/ComStar.xml" xy="295,1278" group="n25_iakb"/>
+    <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="414,1511" group="n25_iakb"/>
+    <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="697,653" group="n25_iakb"/>
+    <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="853,990" group="n25_iakb"/>
+    <component id="n50_w1qi" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="819,1408" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="181,324" size="711,1226" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
-    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="951,308" group="n30_iakb"/>
-    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="903,557" group="n30_iakb"/>
-    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="138,675" group="n30_iakb"/>
-    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="333,1056" group="n30_iakb"/>
-    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="633,1061" group="n30_iakb"/>
-    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="581,1394" group="n30_iakb"/>
-    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="758,1646" group="n30_iakb"/>
-    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="932,1394" group="n30_iakb"/>
-    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="574,547" group="n30_iakb"/>
-    <group id="n30_iakb" name="grpComStar2" xy="99,269" size="891,1416" advanced="true">
+    <component id="n26_iakb" name="comStar1_2_0" src="l5nzq" fileName="components/ComStar.xml" xy="635,267" group="n30_iakb"/>
+    <component id="n27_iakb" name="comStar1_2_1" src="l5nzq" fileName="components/ComStar.xml" xy="343,498" group="n30_iakb"/>
+    <component id="n28_iakb" name="comStar1_2_2" src="l5nzq" fileName="components/ComStar.xml" xy="562,1709" group="n30_iakb"/>
+    <component id="n29_iakb" name="comStar1_2_3" src="l5nzq" fileName="components/ComStar.xml" xy="117,721" group="n30_iakb"/>
+    <component id="n44_o139" name="comStar1_2_4" src="l5nzq" fileName="components/ComStar.xml" xy="308,1073" group="n30_iakb"/>
+    <component id="n45_o139" name="comStar1_2_5" src="l5nzq" fileName="components/ComStar.xml" xy="368,1409" group="n30_iakb"/>
+    <component id="n46_o139" name="comStar1_2_6" src="l5nzq" fileName="components/ComStar.xml" xy="875,1411" group="n30_iakb"/>
+    <component id="n47_o139" name="comStar1_2_7" src="l5nzq" fileName="components/ComStar.xml" xy="546,898" group="n30_iakb"/>
+    <component id="n48_o139" name="comStar1_2_8" src="l5nzq" fileName="components/ComStar.xml" xy="774,754" group="n30_iakb"/>
+    <group id="n30_iakb" name="grpComStar2" xy="78,228" size="836,1520" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>

FGUIProject/assets/Main/MainUI.xml

@@ -56,6 +56,8 @@
       <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://mfvz4q8kjj4dfe" name="btnStudio"/>
+      <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kjj4dff" name="btnField"/>
     </list>
     <component id="n43_wg7t" name="btnChange" src="wg7t8z" fileName="components/ButtonChange.xml" xy="32,1754">
       <relation target="" sidePair="bottom-bottom"/>

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -46,7 +46,7 @@
     <component id="n8_t8o1" name="flower" src="s2cc5k" fileName="components/CompFlower1.xml" xy="697,201">
       <relation target="n7_t8o1" sidePair="left-left,top-top"/>
     </component>
-    <list id="n33_t8o1" name="listBonus" xy="-33,592" pivot="0.5,0" size="1146,281" scale="0.95,0.95" layout="row" overflow="hidden" scroll="horizontal" colGap="5" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
+    <list id="n33_t8o1" name="listBonus" xy="43,592" pivot="0.5,0" size="992,281" scale="0.95,0.95" layout="row" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldpj48o98" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Main/components/ButtonStoryType.xml

@@ -2,7 +2,7 @@
 <component size="184,146" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n2_ed2z" name="up" xy="0,0" size="184,146" url="ui://mfvz4q8kzjj37v" autoSize="true">
+    <loader id="n2_ed2z" name="up" xy="23,0" size="137,146" url="ui://mfvz4q8kzjj37v" autoSize="true">
       <gearDisplay controller="button" pages="0"/>
     </loader>
     <loader id="n3_ed2z" name="down" xy="0,0" size="184,146" url="ui://mfvz4q8kzjj37u" autoSize="true">

FGUIProject/assets/Main/components/ComScoreResult.xml

@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="256,259">
-  <controller name="c1" pages="0,,1,,2," selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
   <displayList>
-    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1">
-      <gearDisplay controller="c1" pages="0"/>
-    </graph>
-    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1">
-      <gearDisplay controller="c1" pages="1"/>
-    </graph>
-    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1">
-      <gearDisplay controller="c1" pages="2"/>
-    </graph>
-    <loader id="n8_vuz5" name="loaType" xy="69,54" size="118,63" url="ui://mfvz4q8kvuz5bf" autoSize="true">
+    <graph id="n14_ecw3" name="holder2" xy="133,135" size="1,1" visible="false"/>
+    <graph id="n12_c2um" name="holder" xy="127,129" size="1,1"/>
+    <graph id="n13_c2um" name="holder1" xy="137,137" size="1,1" visible="false"/>
+    <loader id="n8_vuz5" name="loaType" xy="69,54" size="119,63" url="ui://mfvz4q8kvuz5be" autoSize="true">
       <gearIcon controller="c1" pages="0,1" values="ui://mfvz4q8kvuz5bf|ui://mfvz4q8kvuz5bd" default="ui://mfvz4q8kvuz5be"/>
     </loader>
     <text id="n9_vuz5" name="txtCount0" xy="15,129" pivot="0.5,0" size="226,55" font="ui://mfvz4q8kvuz5b4" fontSize="51" align="center" text="666666">

FGUIProject/assets/Main/components/ComponentListChapterItem.xml

@@ -3,9 +3,10 @@
   <displayList>
     <component id="n0_slb4" name="compPic" src="tu966u" fileName="components/ComponentChapterPic.xml" xy="0,0"/>
     <image id="n7_tu96" name="n7" src="tu967c" fileName="imagesStory/zhuxian_diban_2.png" xy="0,805"/>
+    <image id="n12_r0yx" name="n12" src="r0yxfg" fileName="images/zhuxian_szdi.png" xy="184,1421"/>
     <text id="n11_zjj3" name="txtLv" xy="44,833" pivot="0.5,0" anchor="true" size="22,26" skew="0.5,0" font="ui://mfvz4q8ked2z89" fontSize="12" color="#ffffff" align="center" leading="0" text="1"/>
     <text id="n3_slb4" name="txtTitle" xy="25,905" size="37,239" fontSize="32" color="#ffffff" leading="0" autoSize="height" text="人之初性本善"/>
-    <text id="n4_slb4" name="txtProgress" xy="203,1421" size="78,34" fontSize="24" color="#ffffff" align="center" text="00/00"/>
+    <text id="n4_slb4" name="txtProgress" xy="198,1421" pivot="0.5,0" size="78,34" fontSize="24" color="#ffffff" align="center" text="00/00"/>
     <image id="n1_slb4" name="imgLockBg" src="slb41n" fileName="imagesStory/zhuxian_zhedang.png" xy="0,585"/>
     <image id="n2_slb4" name="imgLock" src="slb41m" fileName="imagesStory/zhuxian_shuoto.png" xy="107,1052"/>
     <text id="n10_q8od" name="txtLockDesc" xy="41,1124" size="202,69" fontSize="26" color="#fffcf1" align="center" autoSize="none" text="通关上一章&#xA;并达到x级开启">

FGUIProject/assets/Main/package.xml

@@ -382,6 +382,9 @@
     <component id="ox5bf5" name="Button2.xml" path="/components/"/>
     <image id="hky3fb" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/images/"/>
     <image id="gd29fd" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/imagesStory/"/>
+    <image id="jj4dfe" name="zjm_gzs.png" path="/images/"/>
+    <image id="jj4dff" name="zjm_ty.png" path="/images/"/>
+    <image id="r0yxfg" name="zhuxian_szdi.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -19,7 +19,7 @@ namespace GFGEditor
         public static void startScan()
         {
             ItemCfg[] dataArray = ItemCfgArray.Instance.dataArray;
-            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach };
+            GetApproachCall[] actions = new GetApproachCall[] { GetClothingShopApproach, GetZhaiXingApproach, GetStoryLevelApproach, GetClothingSyntheticApproach, GetSuitGuideApproach, GetSuitSyntheticApproach, GetClothingDecomposeApproach, CheckGiftBagApproach, CheckShopExchangeApproach };
             Dictionary<SuitCfg, List<int>> suitDic = new Dictionary<SuitCfg, List<int>>();
             int suitPartTotalCount = 0;
             foreach (ItemCfg cfg in dataArray)
@@ -172,17 +172,29 @@ namespace GFGEditor
             {
                 Debug.Log("");
             }
+
             foreach (LuckyBoxCfg cfg in dataArray)
             {
                 for (int i = 0; i < cfg.bonusArr.Length; i++)
                 {
-                    int dropId = cfg.bonusArr[i][0];
-                    bool approach = CheckDropApproach(itemId, dropId);
-                    if (approach)
+                    if (itemId == cfg.bonusArr[i][0])
                     {
                         return "ZHAI_XING";
                     }
                 }
+
+                int dropId = cfg.dropId;
+                if (itemId == 3000028)
+                {
+                    ET.Log.Debug("");
+                }
+
+                bool approach = CheckDropApproach(itemId, dropId);
+                if (approach)
+                {
+                    return "ZHAI_XING";
+                }
+                // }
             }
             return null;
         }
@@ -302,7 +314,10 @@ namespace GFGEditor
                 }
                 if (manager.GetCfgs(dataArray[i].item).Count > 0)
                 {
-
+                    if (dropId == 11000006)
+                    {
+                        ET.Log.Debug("");
+                    }
                     return CheckDropApproach(itemId, dataArray[i].item);
                 }
             }
@@ -320,10 +335,7 @@ namespace GFGEditor
                 a.AddRange(storyFightCfg.bonusBaseArr);
                 int[][] bonus = a.ToArray();
                 bool result = CheckItemInBonus(itemId, bonus);
-                if (itemId == 100095)
-                {
-                    Debug.Log("zoya");
-                }
+
                 if (result)
                 {
                     return true;
@@ -376,6 +388,46 @@ namespace GFGEditor
             }
             return false;
         }
+        /// <summary>
+        /// 检测商城-礼包是否产出该物品
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string CheckGiftBagApproach(int itemId)
+        {
+            GiftBagCfgArray manager = GiftBagCfgArray.Instance;
+            GiftBagCfg[] dataArray = manager.dataArray;
+            for (int i = 0; i < dataArray.Length; i++)
+            {
+                for (int j = 0; j < dataArray[i].itemsArr.Length; j++)
+                {
+                    if (dataArray[i].itemsArr[j][0] == itemId)
+                    {
+                        return ConstFunctionId.SHOP_GIFT_BAG + "=1";
+                    }
+                }
+            }
+            return null;
+        }
+        /// <summary>
+        /// 检测商城-道具兑换是否产出该物品
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        private static string CheckShopExchangeApproach(int itemId)
+        {
+            ShopExchangeCfgArray manager = ShopExchangeCfgArray.Instance;
+            ShopExchangeCfg[] dataArray = manager.dataArray;
+            for (int i = 0; i < dataArray.Length; i++)
+            {
+                if (dataArray[i].itemId == itemId)
+                {
+                    return ConstFunctionId.SHOP_EXCHANGE + "=2";
+                }
+            }
+            return null;
+        }
+
 
     }
 }

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

@@ -38,6 +38,14 @@ namespace GFGGame
         /// 自动战斗
         /// </summary>
         public const string FUNCTION_AUTOPLAY_FIGHT = "FUNCTION_AUTOPLAY_FIGHT";
+        /// <summary>
+        /// 商城-道具兑换
+        /// </summary>
+        public const string SHOP_EXCHANGE = "SHOP_EXCHANGE";
+        /// <summary>
+        /// 商城-礼包
+        /// </summary>
+        public const string SHOP_GIFT_BAG = "SHOP_GIFT_BAG";
 
     }
 }

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

@@ -61,5 +61,7 @@ namespace GFGGame
         public const string NOTICE_SYSTOM_ADD = "NOTICE_SYSTOM_ADD";//新增公告
         public const string NOTICE_SYSTOM_REMOVE = "NOTICE_SYSTOM_REMOVE";//删除公告
 
+        public const string SUIT_GUIDE_BOX_BONUS = "SUIT_GUIDE_BOX_BONUS";//领取套装收集奖励
+
     }
 }

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

@@ -104,6 +104,7 @@ namespace GFGGame
 
             await InstanceZonesSProxy.GetInstanceZonesInfos();
             await StorageSProxy.ReqGetClientValues();
+            await SuitFosterProxy.SendGetSuitInfos();
             await ActivitySProxy.ReqDailyLoginInfos();
 
             GameGlobal.lastLoginTime = StorageDataManager.Instance.GetStorageValue(ConstStorageId.LAST_LOGIN_TIME);
@@ -220,7 +221,6 @@ namespace GFGGame
         private static async void AfterEnterGame(object param)
         {
             ItemHelper.GetItemAttributeInfos().Coroutine();
-            SuitFosterProxy.SendGetSuitInfos().Coroutine();
             MainStorySProxy.GetStoryInfos().Coroutine();
             CardSProxy.GetCardInfos().Coroutine();
             RechargeSProxy.ReqRechargeInfo().Coroutine();

GameClient/Assets/Game/HotUpdate/Data/Cache/StoryBonusDataCache.cs

@@ -8,24 +8,21 @@ namespace GFGGame
     {
         private static Dictionary<int, StoryBonusData> _bonusDic = new Dictionary<int, StoryBonusData>();
 
-        public static List<ItemData> GetBonusList(int levelID, bool hasOnce)
+        public static List<ItemData> GetBonusList(int levelID, bool hasOnce, bool showRandom = false)
         {
             StoryBonusData bonusData = GetBonusData(levelID);
             List<ItemData> bonusList = new List<ItemData>();
             if (hasOnce)
             {
                 bonusList.AddRange(bonusData.bonusOnce);
-                if (bonusData.bonusBase != null)
-                {
-                    bonusList.AddRange(bonusData.bonusBase);
-                }
             }
-            else
+            if (bonusData.bonusBase != null)
             {
-                if (bonusData.bonusBase != null)
-                {
-                    bonusList.AddRange(bonusData.bonusBase);
-                }
+                bonusList.AddRange(bonusData.bonusBase);
+            }
+            if (showRandom)
+            {
+
                 if (bonusData.bonusRandom != null && bonusData.bonusRandom.Count > 0)
                 {
                     bonusList.AddRange(bonusData.bonusRandom);

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

@@ -208,7 +208,7 @@ namespace GFGGame
             {
                 status = _suitGuideBoxBonusStatus[suitId];
             }
-            if (status == ConstBonusStatus.CAN_NOT_GET)
+            if (status == ConstBonusStatus.CAN_NOT_GET)//游戏过程中收集完成套装，不会有奖励可领状态不会有推送，需要前端判断
             {
                 if (CheckHaveSuit(suitId))
                 {

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

@@ -149,28 +149,8 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
 
             //五个属性中最大的为主属性
-            mainScore = 1;
+
             mainScoreValue = 0;
-            // if (itemCfg.score1 > mainScoreValue)
-            // {
-            //     mainScoreValue = itemCfg.score1;
-            //     mainScore = 1;
-            // }
-            // if (itemCfg.score2 > mainScoreValue)
-            // {
-            //     mainScoreValue = itemCfg.score2;
-            //     mainScore = 2;
-            // }
-            // if (itemCfg.score3 > mainScoreValue)
-            // {
-            //     mainScoreValue = itemCfg.score3;
-            //     mainScore = 3;
-            // }
-            // if (itemCfg.score4 > mainScoreValue)
-            // {
-            //     mainScoreValue = itemCfg.score4;
-            //     mainScore = 4;
-            // }
             mainScore = itemCfg.mainScore;
             switch (mainScore)
             {

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

@@ -56,5 +56,40 @@ namespace GFGGame
 
             return false;
         }
+
+        /// <summary>
+        /// 套装收集奖励可领
+        /// </summary>
+        /// <returns></returns>
+        public bool GetFieldGuideRed()
+        {
+            List<int> _suitIds = SuitUtil.GetSuitIdList(false, true, 0, 3);//全部已获得套装按照收集度高排序
+            for (int i = 0; i < _suitIds.Count; i++)
+            {
+                int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(_suitIds[i]);
+                if (status == ConstBonusStatus.CAN_GET)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 根据章节Id判断是否有奖励可领
+        /// </summary>
+        /// <returns></returns>
+        public bool GetChapterRed(int chapterId)
+        {
+            for (int i = 0; i < 3; i++)
+            {
+                int state = MainStoryDataManager.GetChapterBonusStatus(chapterId, i);
+                if (state == ConstBonusStatus.CAN_GET)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }

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

@@ -91,14 +91,14 @@ namespace GFGGame
         private static void CheckUpLv(object param)
         {
             if (GuideDataManager.currentGuideId > 0) return;
-            if (ViewManager.isViewOpen(typeof(FunctionOpenView).Name)) return;//等功能开启展示完成后在展示角色升级
-            // if (ViewManager.isViewOpen(typeof(GuideView).Name)) return;
+            if (ViewManager.isViewOpen(typeof(FunctionOpenView).Name)) return;//等功能开启展示完成后再展示角色升级
+
             if (GRoot.inst.GetTopWindow() == null)
             {
                 OpenRoleLvUpView(null);
                 Timers.inst.Remove(CheckUpLv);
-                // roleLastLv = lvl;
             }
+            
             if (ViewManager.isViewOpen(typeof(StroyFightResultView).Name))
             {
                 Timers.inst.Add(0.2f, 1, OpenRoleLvUpView);

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

@@ -115,7 +115,7 @@ namespace GFGGame
             for (int i = 0; i < parts.Length; i++)
             {
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(parts[i]);
-                // Debug.Log("zoya:" + itemCfg.id + "   " + ItemDataManager.GetScore(itemCfg.id, 1) + "  " + ItemDataManager.GetScore(itemCfg.id, 2) + "   " + ItemDataManager.GetScore(itemCfg.id, 3) + "   " + ItemDataManager.GetScore(itemCfg.id, 4));
+
                 for (int j = 0; j < ConstDressUpScoreType.scoreTypeList().Count; j++)
                 {
                     int score = j + 1;

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

@@ -192,6 +192,19 @@ namespace GFGGame
 
             parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
             DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, resLayer);
+
+            if (parentGameObj.transform.childCount > 1)
+            {
+                if (resLayer == itemCfg.resLayer1)
+                {
+                    GameObject.DestroyImmediate(parentGameObj.transform.GetChild(1).gameObject);
+                }
+                else if (resLayer == itemCfg.resLayer2)
+                {
+                    GameObject.DestroyImmediate(parentGameObj.transform.GetChild(0).gameObject);
+                }
+            }
+
             SceneController.SetBoxCollider2DToGameObject(parentGameObj.transform.GetChild(0).gameObject);
         }
 
@@ -311,7 +324,6 @@ namespace GFGGame
                 if (strs.Length > 1 && strs[1] == "eff") continue;
                 Renderer render = t.GetComponent<Renderer>();
                 if (render) bounds.Encapsulate(render.bounds);
-                Debug.Log("zoya_111" + bounds);
             }
 
             parent.position = postion;

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

@@ -7,6 +7,7 @@ namespace UI.Card
     public partial class UI_ComConsume
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public GLoader m_loaItem;
         public GButton m_btnMinus;
         public GTextField m_txtUseCount;
@@ -58,6 +59,7 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaItem = (GLoader)comp.GetChild("loaItem");
             m_btnMinus = (GButton)comp.GetChild("btnMinus");
             m_txtUseCount = (GTextField)comp.GetChild("txtUseCount");
@@ -65,6 +67,7 @@ namespace UI.Card
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_loaItem = null;
             m_btnMinus = null;
             m_txtUseCount = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_Button4.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_Button4
+    {
+        public GButton target;
+        public Controller m_c1;
+        public const string URL = "ui://vqq9h9h4jj4d1o";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "Button4";
+        private static UI_Button4 _proxy;
+
+        public static UI_Button4 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button4();
+            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_Button4 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button4();
+            }
+            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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_Button4.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitShowUI.cs

@@ -15,7 +15,7 @@ namespace UI.FieldGuide
         public GButton m_btnLeft;
         public GButton m_btnBack;
         public GLoader m_btnChangeAction;
-        public GLoader m_imgBonusBox;
+        public UI_Button4 m_imgBonusBox;
         public const string URL = "ui://vqq9h9h4pjip1b";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitShowUI";
@@ -71,7 +71,7 @@ namespace UI.FieldGuide
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChangeAction = (GLoader)comp.GetChild("btnChangeAction");
-            m_imgBonusBox = (GLoader)comp.GetChild("imgBonusBox");
+            m_imgBonusBox = (UI_Button4)UI_Button4.Create(comp.GetChild("imgBonusBox"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -83,6 +83,7 @@ namespace UI.FieldGuide
             m_btnLeft = null;
             m_btnBack = null;
             m_btnChangeAction = null;
+            m_imgBonusBox.Dispose();
             m_imgBonusBox = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -32,6 +32,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_1_5;
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_7;
+        public UI_ComStar m_comStar1_1_8;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
@@ -116,6 +117,7 @@ namespace UI.LuckyBox
             m_comStar1_1_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_5"));
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
+            m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
@@ -176,6 +178,8 @@ namespace UI.LuckyBox
             m_comStar1_1_6 = null;
             m_comStar1_1_7.Dispose();
             m_comStar1_1_7 = null;
+            m_comStar1_1_8.Dispose();
+            m_comStar1_1_8 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;

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

@@ -10,11 +10,12 @@ namespace GFGGame
             m2C_GetSuitGuideBoxBonus = (M2C_GetSuitGuideBoxBonus)await MessageHelper.SendToServer(new C2M_GetSuitGuideBoxBonus() { SuitId = suitId });
             if (m2C_GetSuitGuideBoxBonus != null)
             {
-                if(m2C_GetSuitGuideBoxBonus.Error == ErrorCode.ERR_Success)
+                if (m2C_GetSuitGuideBoxBonus.Error == ErrorCode.ERR_Success)
                 {
                     DressUpMenuSuitDataManager.SetSuitGuideBoxBonusCompleted(m2C_GetSuitGuideBoxBonus.SuitId);
                     SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
                     BonusController.TryShowBonusList(suitCfg.guideBoxBonusArr);
+                    EventAgent.DispatchEvent(ConstMessage.SUIT_GUIDE_BOX_BONUS);
                 }
             }
         }

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

@@ -145,7 +145,7 @@ namespace GFGGame
             _comFosterBottom.m_txtName.text = _cardData.itemCfg.name;
             _comFosterBottom.m_btnStory.visible = CardDataManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
             _comFosterBottom.m_btnUpLv.grayed = true;
-            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = true;
+            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;
             _comFosterBottom.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("kp_sx_da_" + _cardData.itemCfg.rarity);
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
             _valueBarController.OnShown();
@@ -232,7 +232,7 @@ namespace GFGGame
             _comFosterBottom.m_txtCurExp.text = _showExp.ToString();
             //    = "0";
             _comFosterBottom.m_btnUpLv.grayed = _comLvConsumeGold.m_txtNeed.text == "0" ? true : false;
-            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = !_comFosterBottom.m_btnUpLv.grayed;
+            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpLv.grayed;
 
             _comFosterBottom.m_ctrlFullLv.selectedIndex = CardDataManager.isFullLv(_cardData.id, _cardData.lv, false) ? 1 : 0;
 
@@ -260,13 +260,13 @@ namespace GFGGame
                 listItem.m_btnMinus.onTouchBegin.Add(() => OnClickItemConsumsBegin(obj, 0));
                 listItem.m_btnMinus.onTouchEnd.Add(() => OnClickItemLvConsumsEnd());
             }
-            if (listItem.m_loaItem.data == null)
+            if (listItem.m_loaBg.data == null)
             {
-                listItem.m_loaItem.onTouchBegin.Add(() => OnClickItemConsumsBegin(obj, 1));
-                listItem.m_loaItem.onTouchEnd.Add(() => OnClickItemLvConsumsEnd());
+                listItem.m_loaBg.onTouchBegin.Add(() => OnClickItemConsumsBegin(obj, 1));
+                listItem.m_loaBg.onTouchEnd.Add(() => OnClickItemLvConsumsEnd());
             }
             listItem.m_btnMinus.data = index;
-            listItem.m_loaItem.data = index;
+            listItem.m_loaBg.data = index;
             UI_ComConsume.ProxyEnd();
         }
         private void OnClickItemConsumsBegin(GObject obj, int type)
@@ -487,10 +487,12 @@ namespace GFGGame
 
                 _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级，1：材料不足
 
-                int costHas = ItemDataManager.GetItemNum(cardStarCfg.costID);
-                int costNeed = cardStarCfg.costNum;
-                _comStarCousumeGold.m_txtHas.text = costHas.ToString();
-                _comStarCousumeGold.m_txtNeed.text = costNeed.ToString();
+                // int costHas = ItemDataManager.GetItemNum(cardStarCfg.costID);
+                // int costNeed = cardStarCfg.costNum;
+                // _comStarCousumeGold.m_txtHas.text = costHas.ToString();
+                // _comStarCousumeGold.m_txtNeed.text = costNeed.ToString();
+
+                ItemUtil.SetItemNumAndNeedNum(_comStarCousumeGold.target, cardStarCfg.costID, cardStarCfg.costNum);
 
                 _comFosterBottom.m_listStarConsume.data = cardStarCfg;
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
@@ -501,7 +503,7 @@ namespace GFGGame
 
 
                 _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 1 ? true : false;
-                _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = !_comFosterBottom.m_btnUpStar.grayed;
+                _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
 
             }
         }
@@ -658,6 +660,7 @@ namespace GFGGame
             float scale = _ui.target.height / comCardImgResInitSize.y;
             if (!showCard)
             {
+                _ui.target.touchable = false;
                 _ui.m_loaListener1.visible = false;
                 GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize * scale, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
                 {
@@ -668,11 +671,15 @@ namespace GFGGame
                 {
                     _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
                 });
-                _ui.m_t0.Play();
+                _ui.m_t0.Play(() =>
+                {
+                    _ui.target.touchable = true;
+                });
                 showCard = true;
             }
             else
             {
+                _ui.target.touchable = false;
                 _ui.m_loaListener1.visible = true;
                 GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
                {
@@ -682,7 +689,10 @@ namespace GFGGame
                 {
                     _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
                 });
-                _ui.m_t1.Play();
+                _ui.m_t1.Play(() =>
+                {
+                    _ui.target.touchable = true;
+                });
                 showCard = false;
             }
         }

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

@@ -73,7 +73,7 @@ namespace GFGGame
         {
             PassivitySkillLvlCfg skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfg(lv, _skillId);
             com.m_txtLv.text = title;
-            com.m_txtDiscribe.text = string.Format(skillCfg.describe, skillLvCfg.probability, (float)skillLvCfg.count / 100f);
+            com.m_txtDiscribe.text = string.Format(skillCfg.describe, (float)skillLvCfg.probability / 10000f * 100f, (float)skillLvCfg.count / 100f);
         }
         private void RenderListStarConsumeItem(int index, GObject obj)
         {
@@ -83,7 +83,6 @@ namespace GFGGame
             // skillCfg = SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId, skillLv);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(skillLvCfg.materiarsArr[index][0]);
 
-            listItem.target.data = skillLvCfg.materiarsArr[index][0];
             listItem.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
 
             int needCount = skillLvCfg.materiarsArr[index][1];
@@ -91,11 +90,11 @@ namespace GFGGame
             listItem.m_txtNeedCount.text = needCount.ToString();
             listItem.m_txtHasCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;
             listItem.m_btnPlus.visible = false;
-            if (listItem.m_btnPlus.data == null)
+            if (listItem.target.data == null)
             {
-                listItem.m_btnPlus.onClick.Add(() => OnClickBtnPlusStarConsum(index));
+                listItem.target.onClick.Add(() => OnClickBtnPlusStarConsum(index));
             }
-            listItem.m_btnPlus.data = skillLvCfg.materiarsArr[index][0];
+            listItem.target.data = skillLvCfg.materiarsArr[index][0];
 
             if (hasCount < needCount)
             {
@@ -106,7 +105,8 @@ namespace GFGGame
         private void OnClickBtnPlusStarConsum(int index)
         {
             int itemId = int.Parse(UI_ComStarConsume.Proxy(_ui.m_listConsume.GetChildAt(index)).target.data.ToString());
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, this.viewData } });
+            CardData cardData = CardDataManager.GetCardDataById(_cardId);
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } });
         }
         private async void OnClickBtnUp()
         {

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

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

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -125,6 +125,16 @@ namespace GFGGame
                     this.Hide();
                     ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
                     break;
+                case ConstFunctionId.SHOP_GIFT_BAG:
+                    this.Hide();
+                    int giftBagValue = int.Parse(infos[1]);
+                    ViewManager.Show<RechargeStoreView>(giftBagValue, _fromeViewDatas);
+                    break;
+                case ConstFunctionId.SHOP_EXCHANGE:
+                    this.Hide();
+                    int exchangeValue = int.Parse(infos[1]);
+                    ViewManager.Show<RechargeStoreView>(exchangeValue, _fromeViewDatas);
+                    break;
                 case ConstFunctionId.JU_QING_GUAN_QIA:
                     string value = infos[1];
                     var levelCfgId = int.Parse(value);
@@ -220,7 +230,7 @@ namespace GFGGame
                     break;
                 }
             }
-            GuideController.TryGuide(_ui.m_listApproach, ConstGuideId.BUY_CLOTHING, 2, "该物品可以在服装店购买，点开服装店看看", index, true, (int)(this.viewCom.y + this.viewCom.height + 10));
+            GuideController.TryGuide(_ui.m_listApproach, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买，点开服装店看看", index, true, (int)(this.viewCom.y + this.viewCom.height + 10));
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -356,7 +356,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnSure, ConstGuideId.BUY_CLOTHING, 3, "找到需要的物品了，点击购买吧");
+            GuideController.TryGuide(_ui.m_btnSure, ConstGuideId.BUY_CLOTHING, 5, "找到需要的物品了，点击购买吧");
         }
     }
 }

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

@@ -181,6 +181,7 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_groupTaskHint.visible = false;
 
             if (_sceneObject != null)
             {
@@ -982,11 +983,11 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 7, "", 0, true, (int)_ui.m_partsList.m_list.y);
             GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕，来验证一下，换上的服饰是否符合需求");
 
-            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 1, "当提示有“必需品”时，需要穿上对应物品才能通关", -1, true, 170);
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 5, "按照指示就可以找到必需品啦", buyClothingIndex);
-            GuideController.TryGuide(_ui.m_comListType2.m_listType, ConstGuideId.BUY_CLOTHING, 6, "", buyClothingSubIndex);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 7, "点击换上吧", buyClothingIdIndex, true, 170);
-            GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 7);
+            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时，需要穿上对应物品才能通关", -1, true, 170);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦", buyClothingIndex);
+            GuideController.TryGuide(_ui.m_comListType2.m_listType, ConstGuideId.BUY_CLOTHING, 8, "", buyClothingSubIndex);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 9, "点击换上吧", buyClothingIdIndex, true, 170);
+            GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 9);
 
             GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢");
             GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);

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

@@ -243,9 +243,6 @@ namespace GFGGame
                 }
             }
 
-            // GameObject parentGameObj2;
-
-
         }
         /************************************************************场景*********************************************************/
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -7,9 +7,12 @@ namespace GFGGame
 {
     public class FieldGuideView : BaseWindow
     {
+        private delegate bool GetRedCall();
+
         private UI_FieldGuideUI _ui;
         private int[] _listBannerDatas = new int[3] { ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING };
         private int[] _listGuideDatas = new int[1] { ConstFieldGuideId.SUIT_GUIDE };
+        GetRedCall[] actions = new GetRedCall[] { RedDotDataManager.Instance.GetFieldGuideRed };
 
         public override void Dispose()
         {
@@ -34,13 +37,18 @@ namespace GFGGame
             _ui.m_listGuide.onClickItem.Add(OnClickListGuideItem);
             _ui.m_compBanner.m_listTab.onClickItem.Add(OnClickListBannerItem);
             _ui.m_compBanner.m_loaderPic.onClick.Add(OnClickBannerPic);
+
+            EventAgent.AddEventListener(ConstMessage.SUIT_GUIDE_BOX_BONUS, () =>
+            {
+                _ui.m_listGuide.numItems = _listGuideDatas.Length;
+            });
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
-
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bjbj");
+            _ui.m_listGuide.numItems = _listGuideDatas.Length;
             UpdatePrgress();
             _ui.m_compBanner.m_listTab.selectedIndex = 0;
             UpdateBanner(_ui.m_compBanner.m_listTab.GetChildAt(_ui.m_compBanner.m_listTab.selectedIndex));
@@ -84,6 +92,8 @@ namespace GFGGame
             listItem.m_loaderTitle.url = "ui://FieldGuide/tujian_taoz_" + id;
             listItem.m_loaderPic.url = "ui://FieldGuide/tujian_tup_" + id;
             listItem.target.data = id;
+            bool red = actions[index]();
+            RedDotController.Instance.SetComRedDot(listItem.target, red, "", 20);
         }
 
         private void OnClickListBannerItem(EventContext context)
@@ -149,19 +159,19 @@ namespace GFGGame
         private void UpdateListBannerItems()
         {
             int num = _ui.m_compBanner.m_listTab.numChildren;
-            for (int i = 0; i < num; i++)
-            {
-                UI_ButtonBannerPage listItem = UI_ButtonBannerPage.Proxy(_ui.m_compBanner.m_listTab.GetChildAt(i));
-                if (listItem.target.selected)
-                {
-                    listItem.target.width = 47;
-                }
-                else
-                {
-                    listItem.target.width = 15;
-                }
-            }
-            _ui.m_compBanner.m_listTab.ResizeToFit();
+            // for (int i = 0; i < num; i++)
+            // {
+            //     UI_ButtonBannerPage listItem = UI_ButtonBannerPage.Proxy(_ui.m_compBanner.m_listTab.GetChildAt(i));
+            //     if (listItem.target.selected)
+            //     {
+            //         listItem.target.width = 47;
+            //     }
+            //     else
+            //     {
+            //         listItem.target.width = 15;
+            //     }
+            // }
+            // _ui.m_compBanner.m_listTab.ResizeToFit();
         }
 
         private void SwitchBannerPic(object param)

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -199,6 +199,7 @@ namespace GFGGame
             bool haveSuit = DressUpMenuSuitDataManager.CheckHaveSuit(suitId);
             listItem.m_imgLock.visible = listItem.m_imgLockBg.visible = !haveSuit;
             int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(suitId);
+            RedDotController.Instance.SetComRedDot(listItem.target, status == ConstBonusStatus.CAN_GET, "", 0, 4, 0, 402);
             if (status == ConstBonusStatus.CAN_GET)
             {
                 listItem.m_loaderBonusBox.url = "ui://FieldGuide/tujian_lw_1";

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -46,7 +46,7 @@ namespace GFGGame
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
 
-            _ui.m_imgBonusBox.onClick.Add(OnClickImgBonusBox);
+            _ui.m_imgBonusBox.target.onClick.Add(OnClickImgBonusBox);
             _ui.m_btnChangeAction.onClick.Add(OnClickBtnChangeAction);
 
             _ui.m_btnLeft.onClick.Add(OnClickBtnLeft);
@@ -177,13 +177,15 @@ namespace GFGGame
             if (eventContext == null || _suitId == (int)eventContext.data)
             {
                 int status = DressUpMenuSuitDataManager.GetSuitGuideBonusStatus(_suitId);
+                RedDotController.Instance.SetComRedDot(_ui.m_imgBonusBox.target, status == ConstBonusStatus.CAN_GET);
+
                 if (status == ConstBonusStatus.CAN_GET)
                 {
-                    _ui.m_imgBonusBox.url = "ui://FieldGuide/tujian_lwlw_1";
+                    _ui.m_imgBonusBox.m_c1.selectedIndex = 1;
                 }
                 else
                 {
-                    _ui.m_imgBonusBox.url = "ui://FieldGuide/tujian_lwlw_2";
+                    _ui.m_imgBonusBox.m_c1.selectedIndex = 0;
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -102,7 +102,8 @@ namespace GFGGame
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.value = progress;
-                _ui.m_imgAni.x = _ui.m_progressBar1.width * (progress / 100) - 120;
+                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
                 callback?.Invoke();
             }
             else
@@ -111,7 +112,8 @@ namespace GFGGame
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
-                    _ui.m_imgAni.x = _ui.m_progressBar1.width * (t.value.x / 100) - 120;
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
 
                 });
                 if (callback != null)

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             SceneController.UpdateLoginScene(_sceneObject);
             ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             ServerInfo recentlyServerInfo = serverInfosComponent.recentlyServerInfo;
-            UpdateServer(recentlyServerInfo);
+            // UpdateServer(recentlyServerInfo);
             _ui.m_btnStart.visible = false;
             _ui.m_btnTapLogin.visible = false;
             InitLoginStatus(serverInfosComponent).Coroutine();
@@ -96,16 +96,16 @@ namespace GFGGame
             }
             //else//自有登录
             //{
-                _ui.m_btnStart.visible = true;
-                //尝试自动登录
-                if (serverInfosComponent.ServerInfoList.Count <= 0)
-                {
-                    OnClickBtnStart();
-                }
-                if (!_ui.m_btnLogout.visible)
-                {
-                    ViewManager.Show<LoginInputView>();
-                }
+            _ui.m_btnStart.visible = true;
+            //尝试自动登录
+            if (serverInfosComponent.ServerInfoList.Count <= 0)
+            {
+                OnClickBtnStart();
+            }
+            if (!_ui.m_btnLogout.visible)
+            {
+                ViewManager.Show<LoginInputView>();
+            }
             //}
         }
 
@@ -178,7 +178,8 @@ namespace GFGGame
             var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             if (serverInfosComponent.ServerInfoList.Count <= 0)
             {
-                if (!GameController.CheckLoginCache(true))
+                bool login = GameController.CheckLoginCache(true);
+                if (!login)
                 {
                     ViewManager.Show<LoginInputView>();
                 }

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

@@ -79,7 +79,6 @@ namespace GFGGame
             }
 
             LuckyBoxDataManager.Instance.currentBoxId = boxId;
-            Debug.Log("zoya0:" + LuckyBoxDataManager.Instance.currentBoxId);
             isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
             bgIndex = 0;
 
@@ -99,7 +98,7 @@ namespace GFGGame
             // UpdateNormal();
             OnListBgScroll();
             updateBoxEffect();
-            Timers.inst.Add(3, 0, UpdateBg);
+            Timers.inst.Add(8, 0, UpdateBg);
         }
 
         private void RenderListBgItem(int index, GObject obj)
@@ -117,7 +116,6 @@ namespace GFGGame
             {
                 //活动未开启                           
                 LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
-                Debug.Log("zoya1:" + LuckyBoxDataManager.Instance.currentBoxId);
 
                 Timers.inst.Remove(CheckTime);
                 return;
@@ -132,7 +130,6 @@ namespace GFGGame
         {
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(_ui.m_c1.selectedIndex));
             LuckyBoxDataManager.Instance.currentBoxId = (int)item.target.data;// LuckyBoxDataManager.Instance.luckyBoxIds[_ui.m_c1.selectedIndex];
-            Debug.Log("zoya2:" + LuckyBoxDataManager.Instance.currentBoxId);
 
             item.m_grpTime.visible = LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             item.m_imgTitle.visible = LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
@@ -265,7 +262,6 @@ namespace GFGGame
         private void Reset()
         {
             LuckyBoxDataManager.Instance.currentBoxId = LuckyBoxDataManager.BOX_ID_1;
-            Debug.Log("zoya3:" + LuckyBoxDataManager.Instance.currentBoxId);
 
         }
         protected override void UpdateToCheckGuide(object param)

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

@@ -111,8 +111,8 @@ namespace GFGGame
             arrayList.Sort((CardData a, CardData b) =>
             {
 
-                int scoreA = ItemDataManager.GetItemScoreValue(a.id, _scoreType);
-                int scoreB = ItemDataManager.GetItemScoreValue(b.id, _scoreType);
+                int scoreA = a.scores[_scoreType];// ItemDataManager.GetItemScoreValue(a.id, _scoreType);
+                int scoreB = b.scores[_scoreType];//ItemDataManager.GetItemScoreValue(b.id, _scoreType);
 
                 if (scoreA < scoreB)
                 {

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

@@ -43,7 +43,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bjbj");
 
             subType = 0;//MainStoryDataManager.GetChapterSubType(MainStoryDataManager.currentChapterCfgId);
             if (this.viewData != null)
@@ -118,6 +118,7 @@ namespace GFGGame
             }
             listItem.target.data = chapterCfg.id;
             listItem.m_content.target.data = chapterCfg.id;
+            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", 0, 8, 0, (int)listItem.m_content.m_txtProgress.y - 20);
         }
 
         private void UpdateList()

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

@@ -253,6 +253,8 @@ namespace GFGGame
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了，暂时解释不清，先按请求换上服饰吧");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面");
 
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "");
+
             // GuideController.TryGuide(_unPasslevelItem, ConstGuideId.CLOTHING_SYNTHETIC, 1, "点击下一关");
             // GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 4, "先回到主界面");
 

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

@@ -58,6 +58,7 @@ namespace GFGGame
             SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
             EventAgent.AddEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
 
+            _gameObject2.SetActive(false);
             _ui.m_comClickCircle.target.onClick.Add(CircleScoreEnd);
             _ui.m_comAllCircle.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             _ui.m_comAllCircle.target.onTouchEnd.Add(AllCircleScoreStart);
@@ -156,7 +157,7 @@ namespace GFGGame
             }
 
         }
-
+        private string[] paths = { "zd_df_sb", "zd_df_lv", "zd_df_cheng" };
         private void CircleScoreEnd()
         {
             _ui.m_comClickCircle.target.onClick.Remove(CircleScoreEnd);
@@ -168,12 +169,17 @@ namespace GFGGame
             }
             // _ui.m_comClickCircle.m_t0.Stop(true, false);
             _ui.m_comClickCircle.m_grpCircle.visible = false;
+            string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", paths[clickState]);
+            SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out GoWrapper _wrapper2, 59);
+            _gameObject2.SetActive(true);
+
             _ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
             _ui.m_comClickCircle.m_ComScoreResult.target.visible = true;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
             _ui.m_comClickCircle.m_ComScoreResult.m_t0.Play(() =>
             {
+                _gameObject2.SetActive(false);
                 _ui.m_comClickCircle.m_ComScoreResult.target.visible = false;
                 CircleResuleEnd();
                 PlayScoreTWEffect();
@@ -320,7 +326,9 @@ namespace GFGGame
             // _ui.m_comClickCircle.m_t0.Stop(true, false);
             // _ui.m_comClickCircle.m_t1.Stop(true, false);
             _ui.m_proScore.target.value = 0;
-            _ui.m_proScore.m_txtCount.text = "总分：0";
+            _ui.m_proScore.m_txtCount.text = "总分 0";
+            _gameObject2.SetActive(false);
+
         }
 
         private void PlayScoreTWEffect()
@@ -344,10 +352,10 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper1);
             string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
             SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out GoWrapper _wrapper2, 59);
-            string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
-            SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
-            string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
-            SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
+            // string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
+            // SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
+            // string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
+            // SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
             SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out GoWrapper _wrapper5);
             string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");

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

@@ -181,8 +181,6 @@ namespace GFGGame
                 if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0 && playStop)
                 {
                     playStop = false;
-                    // _ui.m_comTargetCircle.target.visible = false;
-                    // _ui.m_comMineCircle.target.visible = false;
 
                     _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
                     _ui.m_comTargetCircle.m_t0.Play();
@@ -209,8 +207,8 @@ namespace GFGGame
 
             // _ui.m_selfName.m_txtName.text = RoleDataManager.roleName;
             // _ui.m_targetName.m_txtName.text = fightCfg.targetName;
-            _ui.m_proScore.m_txtNpcScore.text = fightCfg.targetName + "0";
-            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + "0";
+            _ui.m_proScore.m_txtNpcScore.text = fightCfg.targetName + " 0";
+            _ui.m_proScore.m_txtMineScore.text = RoleDataManager.roleName + " 0";
             _ui.m_btnBack.visible = true;
 
             _speed = EquipDataCache.cacher.fightSpeed;
@@ -219,8 +217,7 @@ namespace GFGGame
                 _speed = EquipDataCache.cacher.fieldFightSpeed;
                 _ui.m_btnBack.visible = false;
             }
-            _ui.m_btnSpeedUp.visible = _isAutoPlay;
-            _ui.m_btnSpeedUp.title = "x" + _speed;
+
 
 
             ScoreSystemData.Instance.SetEquipDicWithType();
@@ -232,6 +229,9 @@ namespace GFGGame
             _targetMainScore = fightCfg.targetMainScore;
 
             UpdateNormal();
+            _ui.m_btnSpeedUp.visible = _isAutoPlay;
+            _ui.m_btnSpeedUp.title = "x" + _speed;
+
             if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
             {
                 _ui.m_btnSkill0.target.touchable = false;
@@ -317,8 +317,8 @@ namespace GFGGame
         private void UpdateProgressBar()
         {
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0}{1}", fightCfg.targetName, (int)_targetScore);
-            _ui.m_proScore.m_txtMineScore.text = string.Format("{0}{1}", RoleDataManager.roleName, (int)_score);
+            _ui.m_proScore.m_txtNpcScore.text = string.Format("{0} {1}", fightCfg.targetName, (int)_targetScore);
+            _ui.m_proScore.m_txtMineScore.text = string.Format("{0} {1}", RoleDataManager.roleName, (int)_score);
             // _ui.m_proScore.m_comBar.m_imgAni.visible = true;
 
             double proportion = (_score + _targetScore) > 0 ? _score / (_score + _targetScore) : 0;
@@ -344,6 +344,8 @@ namespace GFGGame
             _ui.m_comMineCircle.target.visible = true;
             _ui.m_comMineCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
 
+            _gameObject13.SetActive(true);
+            _gameObject14.SetActive(true);
             _ui.m_comTargetCircle.target.visible = true;
             _ui.m_comTargetCircle.m_txtPart.text = FightScoreCfgArray.Instance.GetCfg(_index + 1).name;
             if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)
@@ -396,7 +398,8 @@ namespace GFGGame
         private void CircleScoreEnd()
         {
             //当前部件评分结束
-
+            _gameObject13.SetActive(false);
+            _gameObject14.SetActive(false);
             _index++;
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
@@ -658,8 +661,8 @@ namespace GFGGame
             GTweener twenerNpc = GTween.GetTween(_ui.m_proMinusNpc, TweenPropType.Progress);
             if (twenerNpc != null) twenerNpc.Kill(true);
 
-            // _ui.m_ComShieldNpc.target.visible = false;
-            // _ui.m_ComShieldMine.target.visible = false;
+            _gameObject13.SetActive(false);
+            _gameObject14.SetActive(false);
 
             _ui.m_ComShieldMine.m_holder.visible = false;
             _ui.m_ComShieldNpc.m_holder1.visible = false;

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

@@ -207,7 +207,7 @@ namespace GFGGame
             _bonusList.Clear();
             if (InstanceZonesDataManager.CheckLevelPass(_levelID))
             {
-                _bonusList = StoryBonusDataCache.GetBonusList(_levelID, false);
+                _bonusList = StoryBonusDataCache.GetBonusList(_levelID, false, true);
                 _ui.m_groupPass.visible = true;
                 _ui.m_groupUnpass.visible = false;
                 UpdateBtnFightTimes();
@@ -220,14 +220,14 @@ namespace GFGGame
                 _ui.m_txtUnpassTips.SetVar("count", NumberUtil.GetChiniseNumberText(fightCfg.quickFightStart)).FlushVars();
             }
             _ui.m_listBonus.numItems = _bonusList.Count;
-            if (_ui.m_listBonus.numItems > 4)
-            {
-                _ui.m_listBonus.columnGap = 40;
-            }
-            else
-            {
-                _ui.m_listBonus.columnGap = 60;
-            }
+            // if (_ui.m_listBonus.numItems > 4)
+            // {
+            //     _ui.m_listBonus.columnGap = 40;
+            // }
+            // else
+            // {
+            //     _ui.m_listBonus.columnGap = 60;
+            // }
             int score = InstanceZonesDataManager.GetScoreHighest(_levelID);
             if (score > 0)
             {
@@ -292,6 +292,7 @@ namespace GFGGame
             // GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 3, "点击空白处关闭", -1, true, (int)(this.viewCom.y + _ui.m_txtPowerDesc.y), 0, 0, false);
             GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y), 0, 0, false);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.BUY_CLOTHING, 2, "");
 
 
         }

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

@@ -25,6 +25,8 @@ namespace GFGGame
         private GButton _btnTianGong;
         private GButton _btnStore;
         private GButton _btnTuJian;
+        private GButton _btnStudio;
+        private GButton _btnField;
 
 
         private GameObject _effectObj4;
@@ -80,6 +82,8 @@ namespace GFGGame
             _btnTianGong = _ui.m_list.GetChild("btnTianGong").asButton;
             _btnTuJian = _ui.m_list.GetChild("btnTuJian").asButton;
             _btnJInShu = _ui.m_list.GetChild("btnJInShu").asButton;
+            _btnStudio = _ui.m_list.GetChild("btnStudio").asButton;
+            _btnField = _ui.m_list.GetChild("btnField").asButton;
 
             // _btnGongGao.visible = false;
             _btnHaoYou.visible = false;
@@ -105,6 +109,8 @@ namespace GFGGame
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
+            _btnStudio.onClick.Add(OnClickBtnStudio);
+            _btnField.onClick.Add(OnClickBtnField);
 
 
             AddEffect();
@@ -126,9 +132,10 @@ namespace GFGGame
             _valueBarController.OnShown();
 
             long lastTime = GameGlobal.lastLoginTime;// GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
-            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET && GuideDataManager.currentGuideId <= 0)
             {
                 ViewManager.Show<DailyLoginView>();
+                GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }
             Timers.inst.AddUpdate(Update);
         }
@@ -360,13 +367,13 @@ namespace GFGGame
         {
             _ui.m_btnXiuFang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
             _ui.m_btnMain.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            _ui.m_btnStudio.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            // _ui.m_btnStudio.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
             _ui.m_btnZhaiXing.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnCiPai.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false)
             || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));
-            _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            // _ui.m_btnField.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             _ui.m_btnHuanZhuang.target.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);
@@ -374,6 +381,8 @@ namespace GFGGame
             _btnYouJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(MailView).Name, false);
             _btnStore.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(RechargeStoreView).Name, false);
             _btnTuJian.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldGuideView).Name, false);
+            _btnStudio.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            _btnField.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             // _btnTianGong.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             // _btnPengYouQuan.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             // _btnJInShu.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
@@ -386,6 +395,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target, RedDotDataManager.Instance.GetDailyLoginRed());
             RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
+            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed());
         }
 
 
@@ -404,9 +414,10 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”，点击查看", -1, false, 0, 0, 0, true, true);
 
-            GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_OPEN, 1, "工作室开门啦，进去看看~~");
+            GuideController.TryGuide(_btnStudio, ConstGuideId.STUDIO_OPEN, 1, "工作室开门啦，进去看看~~");
 
             GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看");
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 2);
 
 
         }

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -57,8 +57,9 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("scsc_bjbj");
 
             _valueBarController.OnShown();
-            _ui.m_c1.selectedIndex = 0;
-            _ui.m_comTab.m_c1.selectedIndex = 0;
+
+            _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
+            _ui.m_comTab.m_c1.selectedIndex = this.viewData == null ? 0 : (int)this.viewData;
             _ui.m_list.numItems = RechargeCfgArray.Instance.dataArray.Length;
             UpdateExchangeList();
             UpdateGiftBagList();

GameClient/Assets/Game/Launcher/Views/LauncherView.cs

@@ -126,7 +126,8 @@ namespace GFGGame
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.value = progress;
-                _ui.m_imgAni.x = _ui.m_progressBar1.width * (progress / 100) - 120;
+                float posX = _ui.m_progressBar1.width * (progress / 100) - 70;
+                _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
                 callback?.Invoke();
             }
             else
@@ -135,7 +136,8 @@ namespace GFGGame
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
-                    _ui.m_imgAni.x = _ui.m_progressBar1.width * (t.value.x / 100) - 120;
+                    float posX = _ui.m_progressBar1.width * (t.value.x / 100) - 70;
+                    _ui.m_imgAni.x = Mathf.Min(posX, _ui.target.width - _ui.m_imgAni.width - 70);
 
                 });
                 if (callback != null)