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

FGUIProject/assets/Task/BattlePassRewardUI.xml

@@ -1,48 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" opaque="false">
-  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="0"/>
+  <controller name="c1" pages="0,打开购买通行证,1,关闭购买通行证" selected="1"/>
   <displayList>
     <image id="n15_nd17" name="n15" src="uxxstmf" fileName="images/sj_dk.png" xy="0,240">
       <relation target="" sidePair="left-right"/>
     </image>
     <text id="n19_nd17" name="LeftTime" xy="37,240" size="200,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fffaec" autoSize="none" text="15天24时60分"/>
     <component id="n16_nd17" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="246,233" size="61,61"/>
-    <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,601">
+    <component id="n18_nd17" name="LevelProcess" src="e3m1tnl" fileName="components/ExpProcess.xml" xy="107,604">
       <relation target="" sidePair="left-left"/>
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,570">
+    <component id="n56_itts" name="btnBuyLevel" src="ittstnj" fileName="components/ButtonBuyBattlePassLevel.xml" xy="778,573">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="right-right"/>
       <property target="text" propertyId="0" value="购买等级"/>
     </component>
-    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,570">
+    <component id="n49_nd17" name="btnOpen" src="nd1745" fileName="components/ButtonOpenBattlePass.xml" xy="778,573">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,683" size="1080,1263"/>
-    <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,691"/>
-    <text id="n21_nd17" name="n21" xy="35,701" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
-    <image id="n35_nd17" name="n35" src="uxxstmh" fileName="images/jdt_bg.png" xy="49,737"/>
-    <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,691"/>
-    <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,739" size="254,961"/>
-    <text id="n37_nd17" name="n37" xy="198,698" size="132,50" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
-    <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,692"/>
-    <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,725" size="691,974"/>
-    <text id="n30_nd17" name="n30" xy="667,701" size="132,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="特别织造"/>
-    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,714"/>
-    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,714" flip="hz"/>
-    <list id="n48_nd17" name="RewardList" xy="2,747" size="1080,790" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+    <image id="n33_nd17" name="n33" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,670" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <image id="n20_nd17" name="n20" src="uxxstn1" fileName="images/bt_db_dj.png" xy="14,690" group="n59_emat"/>
+    <text id="n21_nd17" name="n21" xy="35,700" size="68,44" group="n59_emat" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" autoSize="none" text="等级"/>
+    <image id="n35_nd17" name="n35" src="uxxstmh" fileName="images/jdt_bg.png" xy="49,736" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <image id="n32_nd17" name="n32" src="uxxstm3" fileName="images/bt_db_ptzz.png" xy="143,690" group="n59_emat"/>
+    <image id="n31_nd17" name="n31" src="uxxstmp" fileName="images/txz_jlzz_db_pt.png" xy="136,738" size="254,961" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <text id="n37_nd17" name="n37" xy="198,697" size="132,50" group="n59_emat" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#bd697a" align="center" autoSize="none" text="普通织造"/>
+    <image id="n27_nd17" name="n27" src="uxxstml" fileName="images/bt_db_jlzz.png" xy="405,691" group="n59_emat"/>
+    <image id="n25_nd17" name="n25" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="388,724" size="691,974" group="n59_emat">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
+    <text id="n30_nd17" name="n30" xy="667,700" size="132,44" group="n59_emat" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ae7034" align="center" autoSize="none" text="特别织造"/>
+    <image id="n29_nd17" name="n29" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="517,713" group="n59_emat"/>
+    <image id="n28_nd17" name="n28" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" pkg="eg2y0ldp" xy="822,713" group="n59_emat" flip="hz"/>
+    <list id="n48_nd17" name="RewardList" xy="2,746" size="1080,790" group="n59_emat" overflow="scroll" lineGap="10" defaultItem="ui://5mpsibzznd173u" autoClearItems="true">
+      <relation target="" sidePair="height-height"/>
       <item/>
       <item/>
     </list>
-    <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,736" size="14,869"/>
-    <image id="n26_nd17" name="n26" src="uxxstmc" fileName="images/txz_jlzz_db_jlzz.png" xy="1,1538" size="1080,217"/>
-    <component id="n51_nd17" name="btnGetAll" src="rv091o" fileName="components/Button11.xml" pkg="eg2y0ldp" xy="408,1781" size="266,70">
+    <image id="n36_nd17" name="n36" src="uxxstmu" fileName="images/zsx_flower.png" xy="755,735" size="14,869" group="n59_emat">
+      <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">
       <Button title="一键领取"/>
     </component>
-    <component id="n52_or80" name="SpecialReward" src="or80tlw" fileName="components/BattlePassReward.xml" xy="5,1577"/>
-    <image id="n53_or80" name="n53" src="9jv66j" fileName="imagesNew/lm_zsx0.png" pkg="eg2y0ldp" xy="139,1548"/>
-    <text id="n54_or80" name="n54" xy="412,1549" size="196,44" fontSize="32" color="#915e15" text="下个特别大奖"/>
+    <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"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Task/CombTaskUI.xml

@@ -5,6 +5,9 @@
     <remark page="1" value="织造任务"/>
   </controller>
   <displayList>
+    <image id="n28_emat" name="n28" src="uxxstme" fileName="images/txz_nr_db.png" xy="0,608">
+      <relation target="" sidePair="bottomext-bottom"/>
+    </image>
     <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

@@ -5,9 +5,10 @@
     <remark page="2" value="锦罗织造"/>
   </controller>
   <displayList>
-    <loader id="n13_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    <loader 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,181"/>
     <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="2,36" controller="c1,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>

FGUIProject/assets/Task/components/ExpProcess.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="346,22" extention="ProgressBar">
-  <controller name="c1" pages="0,未满,1,已满" selected="1"/>
+  <controller name="c1" pages="0,未满,1,已满" selected="0"/>
   <displayList>
-    <image id="n0_e3m1" name="n0" src="uxxstn2" fileName="images/jyt_dk.png" xy="0,0" size="346,22">
+    <image id="n0_e3m1" name="n0" src="uxxstmw" fileName="images/jyt_dk_2.png" xy="-7,0" size="346,22">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="0,0" size="346,19"/>
+    <image id="n1_e3m1" name="bar" src="uxxstmi" fileName="images/jyt_yellow.png" xy="-7,1" size="346,19"/>
     <image id="n3_e3m1" name="n3" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="-103,-54"/>
     <text id="n4_e3m1" name="n4" xy="-56,-27" size="40,31" font="ui://eg2y0ldpa0cftks" fontSize="20" color="#c48624" autoSize="none" text="LV."/>
     <text id="n5_e3m1" name="Level" xy="-80,-18" size="73,62" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#c48624" align="center" autoSize="none" text="000"/>

FGUIProject/assets/Task/package.xml

@@ -60,6 +60,7 @@
     <component id="e3m1tnm" name="ButtonAdd.xml" path="/components/"/>
     <component id="e3m1tnn" name="ButtonReduce.xml" path="/components/"/>
     <image id="8paktno" name="jdt_pink_2.jpg" path="/images/"/>
+    <image id="emattnp" name="txz_bn_cscs.png" path="/images/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Task" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -34,7 +34,7 @@ namespace GFGGame
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_txz");
             _ui.m_c1.onChanged.Add(OnCtrlChange);
         }