zhaoyang %!s(int64=3) %!d(string=hai) anos
pai
achega
e88e3ccb80

+ 13 - 6
FGUIProject/assets/ClothingFoster/SuitListUI.xml

@@ -2,23 +2,30 @@
 <component size="1080,1920">
   <displayList>
     <image id="n0_py5g" name="n0" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240"/>
-    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,73"/>
-    <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,43"/>
-    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207">
+    <component id="n1_py5g" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="156,105">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <component id="n2_py5g" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <component id="n3_py5g" name="comBoxSort" src="j5a5x" fileName="components/ComboBox1.xml" xy="555,207" group="n10_rbxq">
       <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
         <item title="1"/>
         <item title="2"/>
         <item title="3"/>
       </ComboBox>
     </component>
-    <component id="n4_py5g" name="btnNotGet" src="py5g1" fileName="components/Button2.xml" xy="124,207">
+    <component id="n4_py5g" name="btnNotGet" src="py5g1" fileName="components/Button2.xml" xy="124,207" group="n10_rbxq">
       <Button checked="true" title="未获得"/>
     </component>
-    <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="372,207">
+    <component id="n5_py5g" name="btnHaveGot" src="py5g1" fileName="components/Button2.xml" xy="372,207" group="n10_rbxq">
       <Button title="已获得"/>
     </component>
+    <group id="n10_rbxq" name="n10" xy="124,207" size="773,70" advanced="true">
+      <relation target="" sidePair="left-left,top-top"/>
+    </group>
     <list id="n9_py5g" name="listSuit" xy="31,377" size="1016,1537" layout="flow_hz" overflow="scroll" lineGap="48" colGap="26" defaultItem="ui://uicwtr5bpy5g8" align="center" autoClearItems="true">
-      <relation target="" sidePair="bottomext-bottom"/>
+      <relation target="" sidePair="top-top,bottomext-bottom"/>
       <item/>
       <item/>
       <item/>

BIN=BIN
FGUIProject/assets/CommonGame/imagesExport/hd_sxicon_1.png


BIN=BIN
FGUIProject/assets/CommonGame/imagesExport/hd_sxicon_2.png


BIN=BIN
FGUIProject/assets/CommonGame/imagesExport/hd_sxicon_3.png


BIN=BIN
FGUIProject/assets/CommonGame/imagesExport/hd_sxicon_4.png


+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitListView.cs

@@ -25,7 +25,7 @@ namespace GFGGame
             packageName = UI_SuitListUI.PACKAGE_NAME;
             _ui = UI_SuitListUI.Create();
             this.viewCom = _ui.target;
-            this.viewCom.Center();
+            // this.viewCom.Center();
             isfullScreen = true;
 
             // this.modal = true;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -116,7 +116,7 @@ namespace GFGGame
         private void UpdateView()
         {
             SuitCfg cfg = SuitCfgArray.Instance.GetCfg(_suitId);
-            _ui.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + (5 - cfg.rarity));// "ui://LuckyBox/;
+            _ui.m_loaRarity.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + cfg.rarity);// "ui://LuckyBox/;
             UpdateArrows();
             UpdateSuitView();
             UpdateFoster();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxCardView.cs

@@ -46,7 +46,7 @@ namespace GFGGame
             if (_rewardList.Count - 1 < 0) return;
             ItemData itemdata = _rewardList[_rewardList.Count - 1];
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemdata.id);
-            _ui.m_comCard.m_loaType.url = "ui://LuckyBox/hd_sxicon_" + (5 - itemCfg.rarity);
+            _ui.m_comCard.m_loaType.url = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + itemCfg.rarity);
             _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             int mainScore = 0;
             int mainScoreValue = 0;

BIN=BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


BIN=BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN=BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN=BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes