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

FGUIProject/assets/CommonGame/components/BtnStyle002.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="189,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="wm603f" fileName="imagesNew/an__3xuanzhong.png" xy="0,0" size="189,63">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="189,63" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle007.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="189,63" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n0_qik1" name="n0" src="o9gh4k" fileName="imagesNew/an__xuanzhong_qifu.png" xy="0,0" size="189,63">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_qik1" name="title" xy="0,0" size="189,63" font="ui://eg2y0ldpa0cftkz" fontSize="28" color="#683c28" align="center" vAlign="middle" autoSize="none" singleLine="true" text="领取">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/BtnStyle1Big.xml

@@ -3,8 +3,8 @@
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <loader id="n4_u2u3" name="icon" xy="0,0" size="187,56" aspect="true" url="ui://eg2y0ldpwm603g" fill="scale" autoSize="true"/>
-    <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vars="true" text="{value=0}/{maxValue=0}">
-      <relation target="" sidePair="center-center"/>
+    <text id="n3_u2u3" name="title" xy="71,8" pivot="0.5,0.5" size="44,39" font="ui://eg2y0ldpa0cftky" fontSize="28" color="#683c28" align="center" vAlign="middle" vars="true" text="{value=0}/{maxValue=0}">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>
   <Button/>

FGUIProject/assets/CommonGame/components/Button14.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="273,77" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n5_9jv6" name="n5" src="a0cf2o" fileName="imagesNew/an_yellow.png" xy="0,0" size="273,76">
+      <relation target="" sidePair="width-width"/>
+    </image>
+    <text id="n3_u2u3" name="title" xy="105,11" pivot="0.5,0" size="61,54" font="ui://eg2y0ldpa0cftky" fontSize="40" color="#915e15" align="center" vAlign="middle" vars="true" text="{value=0}/{maxValue=0}">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/CommonGame/components/TaskListItem.xml

@@ -16,11 +16,11 @@
       <item/>
       <item/>
     </list>
-    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="204,63">
+    <component id="n16_ids4" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" xy="804,82" size="189,58">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
+      <Button title="领取" icon="ui://eg2y0ldpmbf1tn8"/>
     </component>
-    <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/ComeBt.xml" xy="804,81" size="189,58">
+    <component id="n17_ids4" name="ComeBt" src="9qpb4h" fileName="components/BtnStyle001.xml" xy="804,81" size="189,58">
       <gearDisplay controller="c1" pages="1"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
       <Button title="前往" icon="ui://eg2y0ldpittstn4"/>
@@ -28,7 +28,7 @@
     <text id="n19_jttb" name="n19" xy="883,22" size="126,43" fontSize="28" color="#8e4b2a" autoSize="none" text="积分+20">
       <gearDisplay controller="c3" pages="1"/>
     </text>
-    <image id="n20_jttb" name="n20" src="nyhm6" fileName="imagesNew/qrhd_ylq_db.png" xy="788,86" group="n22_jttb"/>
+    <image id="n20_jttb" name="n20" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" xy="788,86" group="n22_jttb"/>
     <text id="n21_jttb" name="n21" xy="870,91" size="88,39" group="n22_jttb" fontSize="28" color="#683c28" text="已领取"/>
     <group id="n22_jttb" name="n22" xy="788,86" size="233,51" advanced="true">
       <gearDisplay controller="c1" pages="3"/>

FGUIProject/assets/CommonGame/package.xml

@@ -285,13 +285,13 @@
     <image id="wm603f" name="an__3xuanzhong.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4m" name="an__tongyi.png" path="/imagesNew/" exported="true"/>
     <image id="9jv66c" name="an__3xuanzhong2.png" path="/imagesNew/" exported="true"/>
-    <image id="o9gh4k" name="an__xuanzhong_qifu.png" path="/imagesNew/" exported="true"/>
+    <image id="o9gh4k" name="an__xuanzhong_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="51,15,102,30"/>
     <image id="o9gh4b" name="lm_tb_tishi.png" path="/imagesNew/" exported="true"/>
     <image id="a0cf2h" name="lm_tb.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4o" name="an_jujue.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh4l" name="an__weixuan_qifu.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="47,14,94,28"/>
     <component id="rv091o" name="Button11.xml" path="/components/" exported="true"/>
-    <image id="a0cf2o" name="an_yellow.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="54,15,108,30"/>
+    <image id="a0cf2o" name="an_yellow.png" path="/imagesNew/" exported="true" scale9grid="54,15,108,30"/>
     <image id="o9gh4g" name="lm_kuang_icon.png" path="/imagesNew/" exported="true"/>
     <image id="9jv66j" name="lm_zsx0.png" path="/imagesNew/" exported="true"/>
     <image id="o9gh40" name="tanchuang.png" path="/imagesNew/" exported="true" scale="9grid" scale9grid="255,165,510,239"/>
@@ -370,6 +370,9 @@
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4p" name="jjcdi_jjcdi.png" path="/imagesNew/" exported="true"/>
     <image id="jcej4o" name="jjcdi_jjxian.png" path="/imagesNew/" exported="true"/>
+    <component id="jx6ztod" name="Button14.xml" path="/components/" exported="true"/>
+    <component id="jx6ztoe" name="BtnStyle007.xml" path="/components/" exported="true"/>
+    <component id="jx6ztof" name="BtnStyle002.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/League/LeagueConstructUI.xml

@@ -5,8 +5,9 @@
     <image id="n46_o9gh" name="n46" src="o9gh4q" fileName="images/biaotizi_8.png" xy="207,102"/>
     <component id="n73_o9gh" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="913,51"/>
     <image id="n43_o9gh" name="n43" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="118,187" group="n7_rv09"/>
+    <image id="n74_jx6z" name="n74" src="jx6z8p" fileName="images/yjjs_tb_db.png" xy="164,238" pivot="0.5,0" size="185,185" group="n7_rv09" aspect="true"/>
     <image id="n39_o9gh" name="n39" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="150,223" group="n7_rv09"/>
-    <loader id="n0_rv09" name="loaIcon" xy="197,267" size="127,127" group="n7_rv09" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n0_rv09" name="loaIcon" xy="170,233" pivot="0.5,0.5" size="180,180" group="n7_rv09" aspect="true" url="ui://tw70qm9djx6z8o" align="center" vAlign="middle" fill="scale" autoSize="true"/>
     <image id="n42_o9gh" name="n42" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="135,435" group="n7_rv09"/>
     <text id="n2_rv09" name="txtName" xy="201,429" pivot="0.5,0" size="107,47" group="n7_rv09" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="宴客厅"/>
     <image id="n40_o9gh" name="n40" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="300,382" group="n44_o9gh"/>
@@ -23,8 +24,9 @@
     <component id="n35_a0cf" name="btnUpLv0" src="a0cf31" fileName="components/Button20.xml" xy="160,792" group="n10_rv09"/>
     <group id="n10_rv09" name="n10" xy="118,187" size="274,736" group="n67_o9gh"/>
     <image id="n47_o9gh" name="n47" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="412,187" group="n55_o9gh"/>
+    <image id="n75_jx6z" name="n75" src="jx6z8p" fileName="images/yjjs_tb_db.png" xy="458,238" pivot="0.5,0" size="185,185" group="n55_o9gh" aspect="true"/>
     <image id="n48_o9gh" name="n48" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="444,223" group="n55_o9gh"/>
-    <loader id="n49_o9gh" name="loaIcon1" xy="491,267" size="127,127" group="n55_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n49_o9gh" name="loaIcon1" xy="467,240" pivot="0.5,0.5" size="180,180" group="n55_o9gh" aspect="true" url="ui://tw70qm9djx6z8n" align="center" vAlign="middle" fill="scale" autoSize="true"/>
     <image id="n50_o9gh" name="n50" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="429,435" group="n55_o9gh"/>
     <text id="n51_o9gh" name="txtName1" xy="495,429" pivot="0.5,0" size="107,47" group="n55_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小酒馆"/>
     <image id="n52_o9gh" name="n52" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="594,382" group="n54_o9gh"/>
@@ -50,8 +52,9 @@
     </component>
     <group id="n17_rv09" name="n17" xy="412,187" size="274,736" group="n67_o9gh"/>
     <image id="n57_o9gh" name="n57" src="o9gh4u" fileName="images/lm_kuang_qifu.png" xy="717,187" group="n65_o9gh"/>
+    <image id="n76_jx6z" name="n76" src="jx6z8p" fileName="images/yjjs_tb_db.png" xy="762,238" pivot="0.5,0" size="185,185" group="n65_o9gh" aspect="true"/>
     <image id="n58_o9gh" name="n58" src="o9gh4g" fileName="imagesNew/lm_kuang_icon.png" pkg="eg2y0ldp" xy="749,223" group="n65_o9gh"/>
-    <loader id="n59_o9gh" name="loaIcon2" xy="796,267" size="127,127" group="n65_o9gh" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <loader id="n59_o9gh" name="loaIcon2" xy="766,240" pivot="0.5,0.5" size="180,180" group="n65_o9gh" aspect="true" url="ui://tw70qm9djx6z8m" align="center" fill="scale" autoSize="true"/>
     <image id="n60_o9gh" name="n60" src="o9gh4f" fileName="images/lm_kuang_qifu_name.png" xy="734,435" group="n65_o9gh"/>
     <text id="n61_o9gh" name="txtName2" xy="800,429" pivot="0.5,0" size="107,47" group="n65_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="35" color="#5a3e16" align="center" text="小金库"/>
     <image id="n62_o9gh" name="n62" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="899,382" group="n64_o9gh"/>

FGUIProject/assets/League/LeagueSkillUI.xml

@@ -7,7 +7,7 @@
     <image id="n15_miy3" name="n15" src="volstne" fileName="bgimg/lm_fl_db.png" pkg="eg2y0ldp" xy="-31,21" size="1144,1898">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243"/>
+    <image id="n16_miy3" name="n16" src="miy37f" fileName="images/lm_ch_zsx.png" xy="67,243" size="945,8"/>
     <component id="n3_pvb4" name="comValue" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" controller="c1,13"/>
     <component id="n1_pvb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>

FGUIProject/assets/League/package.xml

@@ -218,6 +218,10 @@
     <image id="jx6z8j" name="tb_xiang_tianmuxiang.png" path="/images/"/>
     <image id="jx6z8k" name="yajiqifu_tb_db.png" path="/images/"/>
     <image id="jx6z8l" name="jn_banner.png" path="/images/"/>
+    <image id="jx6z8m" name="tb_xiaojinku.png" path="/images/"/>
+    <image id="jx6z8n" name="tb_xiaojiuguan.png" path="/images/"/>
+    <image id="jx6z8o" name="tb_yanketing.png" path="/images/"/>
+    <image id="jx6z8p" name="yjjs_tb_db.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/package.xml

@@ -28,12 +28,12 @@
     <component id="qdrt1c" name="Button4.xml" path="/components/"/>
     <image id="qi041j" name="cj_zizi_2.png" path="/images/"/>
     <component id="xg6g1k" name="ComHolder.xml" path="/components/" exported="true"/>
-    <movieclip id="jpnf1x" name="MovieClip1.jta" path="/effect/"/>
-    <movieclip id="jpnf26" name="MovieClip2.jta" path="/effect/"/>
+    <movieclip id="jpnf1x" name="MovieClip1.jta" path="/effect/" atlas="10"/>
+    <movieclip id="jpnf26" name="MovieClip2.jta" path="/effect/" atlas="10"/>
     <image id="qr4e27" name="wpzs_anniu_1.png" path="/images/"/>
     <image id="qr4e28" name="wpzs_bji.png" path="/images/"/>
     <image id="qr4e29" name="wpzs_yhd.png" path="/images/"/>
-    <movieclip id="hibu2m" name="MovieClip3.jta" path="/effect/" atlas="alone_npot"/>
+    <movieclip id="hibu2m" name="MovieClip3.jta" path="/effect/" atlas="10"/>
     <component id="njmn2n" name="ComBox_2.xml" path="/combox/" exported="true"/>
     <component id="njmn2o" name="ComBox_3.xml" path="/combox/" exported="true"/>
     <component id="njmn2p" name="ComBox.xml" path="/combox/" exported="true"/>

FGUIProject/assets/Main/StoryFightFailUI.xml

@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1120">
+<component size="1080,1002">
   <displayList>
-    <image id="n0_jx6z" name="n0" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1120"/>
-    <list id="n1_jx6z" name="list" xy="90,411" size="900,653" overflow="scroll" lineGap="20" defaultItem="ui://mfvz4q8kjx6zpf" align="center">
+    <component id="n0_jx6z" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0" size="1021,1000">
+      <property target="txtTitle" propertyId="0" value="阿福的提示"/>
+    </component>
+    <list id="n1_jx6z" name="list" xy="98,396" size="899,548" overflow="scroll" defaultItem="ui://mfvz4q8kjx6zpf" align="center">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <image id="n7_jx6z" name="n7" src="jx6zpl" fileName="imagesNew/duihuakuang_db.png" xy="431,180"/>
+    <text id="n9_jx6z" name="n9" xy="485,207" size="425,150" fontSize="32" color="#a88656" autoSize="none" text="通关失败别灰心！试试以下途径提升自己~"/>
+    <image id="n5_jx6z" name="n5" src="jx6zpm" fileName="imagesNew/lm_touxiangdb.png" xy="156,142" size="262,254" group="n8_jx6z" aspect="true"/>
+    <image id="n6_jx6z" name="n6" src="jx6zpn" fileName="imagesNew/shengqi.png" xy="200,166" group="n8_jx6z"/>
+    <group id="n8_jx6z" name="n8" xy="156,142" size="262,254"/>
+    <image id="n10_ebfi" name="n10" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="112,393" size="846,10"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ListFailItem.xml

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="900,180" overflow="hidden">
+<component size="893,170" overflow="hidden">
   <displayList>
-    <image id="n2_jx6z" name="n2" src="8xpg4r" fileName="imagesFight/zd_jsjm_ditu.png" xy="0,-67"/>
-    <text id="n3_jx6z" name="txtDesc" xy="62,64" size="230,51" fontSize="38" color="#9e7c50" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
-    <component id="n4_jx6z" name="btnGo" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="668,58">
-      <Button title="前往"/>
+    <image id="n2_jx6z" name="n2" src="jx6zpo" fileName="imagesNew/tc_xuanxiangkuang_1.png" xy="0,18" group="n9_ebfi"/>
+    <text id="n3_jx6z" name="txtDesc" xy="72,74" size="196,44" group="n9_ebfi" fontSize="32" color="#a07c49" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n4_jx6z" name="btnGo" src="jx6ztoe" fileName="components/BtnStyle007.xml" pkg="eg2y0ldp" xy="648,67" group="n9_ebfi">
+      <Button title="前往" titleColor="#683c28"/>
     </component>
+    <image id="n5_jx6z" name="n5" src="jx6zpq" fileName="imagesNew/zs_flower.png" xy="43,87" group="n9_ebfi"/>
+    <image id="n6_jx6z" name="n6" src="jx6zpp" fileName="imagesNew/yf_db_1.png" xy="817,0" group="n8_jx6z"/>
+    <text id="n7_jx6z" name="n7" xy="827,19" size="60,39" group="n8_jx6z" fontSize="28" color="#9a4e16" text="推荐"/>
+    <group id="n8_jx6z" name="grpRecommend" xy="817,0" size="76,79" group="n9_ebfi" advanced="true"/>
+    <group id="n9_ebfi" name="n9" xy="0,0" size="893,170"/>
   </displayList>
 </component>

FGUIProject/assets/Main/package.xml

@@ -661,6 +661,12 @@
     <component id="jx6zpd" name="ButtonModle9.xml" path="/components/"/>
     <component id="jx6zpe" name="StoryFightFailUI.xml" path="/" exported="true"/>
     <component id="jx6zpf" name="ListFailItem.xml" path="/components/"/>
+    <image id="jx6zpl" name="duihuakuang_db.png" path="/imagesNew/"/>
+    <image id="jx6zpm" name="lm_touxiangdb.png" path="/imagesNew/"/>
+    <image id="jx6zpn" name="shengqi.png" path="/imagesNew/"/>
+    <image id="jx6zpo" name="tc_xuanxiangkuang_1.png" path="/imagesNew/"/>
+    <image id="jx6zpp" name="yf_db_1.png" path="/imagesNew/"/>
+    <image id="jx6zpq" name="zs_flower.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -2,6 +2,7 @@
 <component size="1080,1920" opaque="false">
   <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="0"/>
   <displayList>
+    <image id="n60_jx6z" name="n60" src="emattnp" fileName="images/txz_bn_cscs.png" xy="0,205"/>
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,264">
       <relation target="" sidePair="left-right"/>
     </image>
@@ -49,15 +50,15 @@
       <relation target="" sidePair="bottomext-bottom"/>
     </image>
     <group id="n59_emat" name="n59" xy="0,670" size="1082,1312"/>
-    <image id="n26_nd17" name="n26" src="uxxstmn" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1538" group="n57_emat"/>
-    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70" group="n57_emat">
+    <image id="n26_nd17" name="n26" src="uxxstmn" fileName="images/txz_jlzz_tbdj_db.png" xy="1,1536" group="n57_emat"/>
+    <component id="n51_nd17" name="btnGetAll" src="jx6ztod" fileName="components/Button14.xml" pkg="eg2y0ldp" xy="403,1785" group="n57_emat">
       <Button title="一键领取"/>
     </component>
-    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577" group="n57_emat"/>
-    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548" group="n57_emat"/>
-    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" group="n57_emat" fontSize="32" color="#915e15" text="下个特别大奖"/>
-    <group id="n57_emat" name="n57" xy="1,1538" size="1084,313" advanced="true">
-      <relation target="" sidePair="bottom-bottom"/>
+    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1575" group="n57_emat"/>
+    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1546" group="n57_emat"/>
+    <text id="n54_or80" name="n54" xy="412,1547" size="196,44" group="n57_emat" fontSize="32" color="#915e15" text="下个特别大奖"/>
+    <group id="n57_emat" name="n57" xy="1,1536" size="1084,326" advanced="true">
+      <relation target="n48_nd17" sidePair="top-bottom"/>
     </group>
   </displayList>
 </component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -8,6 +8,7 @@
     <image id="n28_emat" name="n28" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,608">
       <relation target="" sidePair="bottomext-bottom"/>
     </image>
+    <image id="n29_jx6z" name="n29" src="emattnp" fileName="images/txz_bn_cscs.png" xy="0,205"/>
     <component id="n15_ids4" name="LivenessProcess" src="ids449" fileName="components/LivenessRewardProcess.xml" xy="70,717" size="949,53">
       <ProgressBar value="50" max="100"/>
     </component>

FGUIProject/assets/Task/TaskUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="2,,0,,1," selected="0">
+  <controller name="c1" pages="2,,0,,1," selected="2">
     <remark page="1" value="任务"/>
     <remark page="2" value="锦罗织造"/>
   </controller>
@@ -8,7 +8,6 @@
     <loader id="n13_gbqo" name="loaBg" xy="540,600" pivot="0.5,0.5" anchor="true" size="1080,1200" fill="scaleMatchWidth">
       <relation target="" sidePair=""/>
     </loader>
-    <image id="n18_emat" name="n18" src="emattnp" fileName="images/txz_bn_cscs.png" xy="0,205"/>
     <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" size="1080,70" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
@@ -19,7 +18,7 @@
       <Button title="今日任务" controller="c1" page="0"/>
     </component>
     <component id="n16_fqor" name="btnBattlePass" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="536,165" group="n17_fqor">
-      <Button title="锦罗织造" controller="c1" page="1"/>
+      <Button checked="true" title="锦罗织造" controller="c1" page="1"/>
     </component>
     <group id="n17_fqor" name="n17" xy="246,165" size="580,70" advanced="true" layout="hz" excludeInvisibles="true"/>
   </displayList>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,153">
-  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="2">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="1">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -14,15 +14,15 @@
     <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay2 controller="c2" pages="0" condition="0"/>
-      <Button title="领取" icon="ui://eg2y0ldpittstn4"/>
+      <Button title="领取" titleColor="#465a7f" icon="ui://eg2y0ldpittstn4"/>
     </component>
-    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="187,56">
+    <component id="n10_nd17" name="GetRewardBt" src="jx6ztof" fileName="components/BtnStyle002.xml" pkg="eg2y0ldp" xy="822,44">
       <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
-    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="204,63">
+    <component id="n11_nd17" name="ContinueBt" src="jx6ztoe" fileName="components/BtnStyle007.xml" pkg="eg2y0ldp" xy="822,44">
       <gearDisplay controller="c1" pages="3"/>
-      <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
+      <Button title="继续领取" icon="ui://eg2y0ldpwm603f"/>
     </component>
     <image id="n19_vnby" name="n19" src="nyhm6" fileName="imagesNew/an_qrhd_ylq_db.png" pkg="eg2y0ldp" xy="800,47" group="n21_vnby"/>
     <text id="n20_vnby" name="n20" xy="882,52" size="88,39" group="n21_vnby" fontSize="28" color="#683c28" text="已领取"/>

GameClient/Assets/Editor/Bat/commitBundles.bat

@@ -1,3 +0,0 @@
-cd ../../../Bundles
-svn add . --force
-svn ci -m "¹«ÓûúÌá½»"

GameClient/Assets/Editor/Bat/commitBundles.bat.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0921dce128c6bba4aa7e3dc48de55622
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Editor/ToolsMenu.cs

@@ -83,10 +83,6 @@ namespace GFGEditor
             BuildDllHelper.BuildHotUpdateDll();
             BuildScript.BuildCustomBundles(resArr, "BuildSetting");
             EditorUtility.ClearProgressBar();
-            if (CommitWhenRelease)
-            {
-                CommitBundles();
-            }
         }
 
         [MenuItem("策划/其它/更新项目(会丢弃未推送内容)", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
@@ -333,22 +329,6 @@ namespace GFGEditor
             BuildScript.CopyToStreamingAssets();
         }
 
-        [MenuItem("Tools/BuildTest/导入临时版本资源", false, 0)]
-        public static void SetBundlesResTestDir()
-        {
-            try
-            {
-                ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
-                CommitWhenRelease = false;
-                UpdateAndImportArtRes();
-            }
-            catch (Exception e)
-            {
-                Log.Error(e.ToString());
-                ImportArtResTool.ResRootDirNameDressUp = "正式资源";
-                CommitWhenRelease = true;
-            }
-        }
         [MenuItem("Tools/BuildTest/导入临时版本配置", false, 1)]
         public static void SetBundlesExcelTestDir()
         {

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

@@ -233,7 +233,8 @@ namespace GFGGame
                 else
                 {
                     MainStoryDataManager.currentChapterCfgId = 10001;
-                    if (GameGlobal.isFirstEntry == true)
+                    // GameGlobal.isFirstEntry == true 
+                    if (!InstanceZonesDataManager.CheckLevelPass(100001001))
                     {
                         GameGlobal.isFirstEntry = false;
                         // StoryController.ShowPriorStoryDialog();

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

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

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

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GTextField m_txtDesc;
         public GButton m_btnGo;
+        public GGroup m_grpRecommend;
         public const string URL = "ui://mfvz4q8kjx6zpf";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ListFailItem";
@@ -58,11 +59,13 @@ namespace UI.Main
         {
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_grpRecommend = (GGroup)comp.GetChild("grpRecommend");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtDesc = null;
             m_btnGo = null;
+            m_grpRecommend = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_StoryFightFailUI
     {
         public GComponent target;
+        public GComponent m_comBg;
         public GList m_list;
         public const string URL = "ui://mfvz4q8kjx6zpe";
         public const string PACKAGE_NAME = "Main";
@@ -55,10 +56,12 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_comBg = (GComponent)comp.GetChild("comBg");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_comBg = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -4,6 +4,7 @@ using ET;
 using System.Collections.Generic;
 using System;
 using UnityEngine;
+using System.Collections;
 
 namespace GFGGame
 {
@@ -30,7 +31,7 @@ namespace GFGGame
             _curTime = _turnTime;
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
             _com.GetChild("loaMask").asLoader.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
-            ChangeRes();
+            UpdateRes();
             Timers.inst.Remove(UpdateTime);
             if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitIdArr.Length > 1)
             {
@@ -51,18 +52,24 @@ namespace GFGGame
                 _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitIdArr.Length ? 0 : _modelIndex + 1;
             }
 
-            _com.GetTransition("t0").Play(ChangeRes);
+            _com.GetTransition("t0").Play(UpdateRes);
             // ChangeRes();
         }
-
-        private void ChangeRes()
+        private void UpdateRes()
+        {
+            Timers.inst.StartCoroutine(ChangeRes());
+        }
+        private IEnumerator ChangeRes()
         {
             UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
             if (_luckyBoxCfg.resArr.Length > 0)
             {
+                int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
+                float scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000f : 1;
                 _comModel.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
                 _comModel.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                _comModel.m_loaRes.SetScale(direction * scale, scale);
             }
             else if (_luckyBoxCfg.suitIdArr.Length > 0)
             {
@@ -83,19 +90,21 @@ namespace GFGGame
                 else
                 {
                     _comModel.m_loaRes.url = "";
-
+                    _comModel.m_loaMask.alpha = 1;
+                    yield return null;
                     int scale = _luckyBoxCfg.scaleArr.Length > 0 ? Math.Abs(_luckyBoxCfg.scaleArr[_modelIndex]) / 10000 : 100;
                     _dressUpObjUI.ResetSceneObj(scale, false, false, null, false);
                     _dressUpObjUI.dressUpObj.PutOnSuitCfg(_luckyBoxCfg.suitIdArr[_modelIndex], true, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                     _dressUpObjUI.UpdateWrapper(_comModel.m_holder);
                     _dressUpObjUI.sceneObject.transform.localScale = new Vector3(direction * scale, scale, scale);
                     _comModel.m_holder.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
+                    yield return null;
                 }
             }
             _comModel.m_t1.Play();
-            // _com.GetTransition("t1").Play();
             UI_ComModel.ProxyEnd();
         }
+
         public void OnHide()
         {
             _bgIndex = 0;

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

@@ -98,22 +98,9 @@ namespace GFGGame
             int type = (int)(context.sender as GObject).data;
             LeaguePrayCfg prayCfg = LeaguePrayCfgArray.Instance.GetCfg(type);
             int curTimes = LeagueDataManager.Instance.GetPrayTimesByType(type);
-            // long hasCount = ItemDataManager.GetItemNum(prayCfg.consumeArr[0][0]);
-            // long needCount = prayCfg.consumeArr[0][1];
+
             if (type == LeaguePrayType.First && curTimes != 0 || type != LeaguePrayType.First)
             {
-                if (prayCfg.consumeArr[0][0] == ConstItemID.GOLD)
-                {
-                    ItemUtil.AddGold(null, 1);
-                }
-                else if (prayCfg.consumeArr[0][0] == ConstItemID.DIAMOND_RED)
-                {
-                    ItemUtil.AddDiamondRed();
-                }
-                else
-                {
-                    PromptController.Instance.ShowFloatTextPrompt("消耗不足");
-                }
 
                 if (!ItemUtil.CheckItemEnough(prayCfg.consumeArr[0][0], prayCfg.consumeArr[0][1]))
                 {
@@ -121,7 +108,6 @@ namespace GFGGame
                     ItemUtil.BuyCurrency(prayCfg.consumeArr[0][0], prayCfg.consumeArr[0][1] - has);
                     return;
                 }
-                return;
             }
             LeagueSproxy.ReqPrayLeague(type).Coroutine();
         }

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

@@ -150,6 +150,7 @@ namespace GFGGame
                 _speedAutoPlay = 1;
                 FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
             }
+            if (!InstanceZonesDataManager.CheckLevelPass(100001001)) _ui.m_btnBack.visible = false;
         }
 
         protected override void OnHide()
@@ -181,7 +182,7 @@ namespace GFGGame
         private void OnClickBtnNext()
         {
             // StopAutoPlay();
-            if(_onScreenEffectComplete != null)
+            if (_onScreenEffectComplete != null)
             {
                 Timers.inst.Remove(OnScreenEffectComplete);
                 _onScreenEffectComplete.Invoke(null);
@@ -392,7 +393,7 @@ namespace GFGGame
                 _ui.m_dialogHead.m_comphead.m_holder.visible = true;
 
                 var headAniCfg = HeadAniCfgArray.Instance.GetCfg(headAniRes);
-                if(headAniCfg != null && !string.IsNullOrEmpty(headAniCfg.headAni))
+                if (headAniCfg != null && !string.IsNullOrEmpty(headAniCfg.headAni))
                 {
                     //¶ÀÁ¢¶¯»­
                     _ui.m_dialogHead.m_compDressUp.target.visible = false;
@@ -406,7 +407,7 @@ namespace GFGGame
                     _ui.m_dialogHead.m_compDressUp.target.visible = true;
                     _ui.m_dialogHead.m_comphead.target.visible = false;
                     _dressUpObjUI.ResetSceneObj(80, true, false, null, false);
-                    if(storyDialogCfg.suitId > 0)
+                    if (storyDialogCfg.suitId > 0)
                     {
                         _dressUpObjUI.dressUpObj.PutOnSuitCfg(storyDialogCfg.suitId, false, new int[] { ConstDressUpItemType.BEI_JING }, false, false);
                     }

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

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.Main;
+using UI.CommonGame;
 using UnityEngine;
 
 namespace GFGGame
@@ -31,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_comBg.GetChild("btnClose").asCom.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {
@@ -67,7 +69,7 @@ namespace GFGGame
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-
+            item.m_grpRecommend.visible = _cfgs[index].isAdvise == 1;
             item.m_txtDesc.text = string.Format(_cfgs[index].desc, ConstDressUpScoreType.scoreTypeList()[fightCfg.scoreType]);
             if (item.m_btnGo.data == null)
             {

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

@@ -1016,10 +1016,10 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
             RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", 10);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -38);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
             RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -38);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
             RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);

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

@@ -61,9 +61,9 @@ namespace GFGGame
                 BattlePassCfgArray.Instance.GetCfgsByid(BattlePassTaskDataManager.Instance.GetSeasonId());
             var minLevel =
                 (from battlePassCfg in battlePassCfgs
-                    let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
-                    where battlePassCfg.level != 0 && state != 2
-                    select battlePassCfg.level).FirstOrDefault();
+                 let state = BattlePassTaskDataManager.Instance.GetRewardState(battlePassCfg.level)
+                 where battlePassCfg.level != 0 && state != 2
+                 select battlePassCfg.level).FirstOrDefault();
             _ui.m_RewardList.ScrollToView(minLevel - 1);
         }
 
@@ -258,7 +258,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
+            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm(leftTime);
         }
 
         private void SetBattlePassLevel()

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas10!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 77d877fdac379bb43bc5471c7483d102
+guid: dad734f917fc2214196656fbcaa96b6c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m!a.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas10.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 72c695b5422c302439c034a86254b0b0
+guid: 72faf663c4721b54d918d618ba17d091
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m.png.meta → GameClient/Assets/ResIn/UI/Task/Task_atlas0_2!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 277d5c434dbc61f44bfc5d42129145ae
+guid: eece24f6e6a85d54894a242d01d88dc7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png.meta → GameClient/Assets/ResIn/UI/Task/Task_atlas0_2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a3701e1a6a70ff943840c61e82608b26
+guid: 118429f61456a7a4eb4fe0e021f2029f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}