zhaoyang 2 жил өмнө
parent
commit
981bf26c33

+ 2 - 2
FGUIProject/assets/Task/components/BattlePassReward.xml

@@ -9,9 +9,9 @@
   <controller name="c2" pages="0,能前往,1,不能前往" selected="0"/>
   <displayList>
     <image id="n6_nd17" name="n6" src="uxxstm7" fileName="imagesNew/txz_lvl_db.png" pkg="eg2y0ldp" xy="9,10"/>
-    <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItemBlue.xml" pkg="eg2y0ldp" xy="203,11"/>
+    <component id="n7_nd17" name="NormalReward" src="mdmdtn5" fileName="components/ComItem001_1.xml" pkg="eg2y0ldp" xy="203,11"/>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" vAlign="middle">
       <item/>
       <item/>
     </list>

+ 2 - 2
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="1">
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="3">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
@@ -30,7 +30,7 @@
       <gearDisplay controller="c1" pages="2"/>
     </group>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
-    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" align="center" vAlign="middle">
+    <list id="n18_vixc" name="RewardList" xy="450,10" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" defaultItem="ui://eg2y0ldp9jv6tls" vAlign="middle">
       <item/>
       <item/>
     </list>

+ 1 - 1
FGUIProject/assets/Task/components/ExpProcess.xml

@@ -10,7 +10,7 @@
     <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"/>
     <text id="n6_e3m1" name="NumProcess" xy="45,-47" size="76,44" group="n8_cj0b" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#7a4e22" align="center" letterSpacing="-1" vars="true" text="{value=0}/{maxValue=100}"/>
-    <loader id="n7_e3m1" name="icon" xy="2,-40" size="33,31" group="n8_cj0b" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
+    <loader id="n7_e3m1" name="loaIcon" xy="2,-40" size="33,31" group="n8_cj0b" url="ui://eg2y0ldpa0cf2h" align="center" vAlign="middle"/>
     <group id="n8_cj0b" name="n8" xy="2,-47" size="119,44" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_ExpProcess.cs

@@ -10,7 +10,7 @@ namespace UI.Task
         public Controller m_c1;
         public GTextField m_Level;
         public GTextField m_NumProcess;
-        public GLoader m_icon;
+        public GLoader m_loaIcon;
         public const string URL = "ui://5mpsibzze3m1tnl";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "ExpProcess";
@@ -61,14 +61,14 @@ namespace UI.Task
             m_c1 = comp.GetController("c1");
             m_Level = (GTextField)comp.GetChild("Level");
             m_NumProcess = (GTextField)comp.GetChild("NumProcess");
-            m_icon = (GLoader)comp.GetChild("icon");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_Level = null;
             m_NumProcess = null;
-            m_icon = null;
+            m_loaIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             _ui.m_SpecialReward.m_RewardList.itemRenderer = SpecialRewardRender;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
             _ui.m_tip.data = 300012;
-            _ui.m_LevelProcess.m_NumProcess.icon =
+            _ui.m_LevelProcess.m_loaIcon.url =
                 ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(ConstItemID.BATTLE_PASS_CURRENCY).res);
         }
 

BIN
GameClient/Assets/ResIn/UI/Task/Task_fui.bytes