zhaoyang 2 жил өмнө
parent
commit
955276095d

+ 12 - 12
FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -4,18 +4,18 @@
     <loader id="n17_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>
-    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,452" group="n15_ga16"/>
-    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,452" group="n15_ga16"/>
-    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,790" group="n15_ga16"/>
-    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,790" group="n15_ga16"/>
-    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,790" group="n15_ga16"/>
-    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,1128" group="n15_ga16"/>
-    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1128" group="n15_ga16"/>
-    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,1128" group="n15_ga16"/>
-    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,1466" group="n15_ga16"/>
-    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,1466" group="n15_ga16"/>
-    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,978" group="n15_ga16"/>
-    <group id="n15_ga16" name="n15" xy="37,306" size="1006,1307" advanced="true">
+    <component id="n1_ga16" name="item0" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,406" group="n15_ga16"/>
+    <component id="n5_ga16" name="item1" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,406" group="n15_ga16"/>
+    <component id="n6_ga16" name="item2" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,744" group="n15_ga16"/>
+    <component id="n7_ga16" name="item3" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,744" group="n15_ga16"/>
+    <component id="n8_ga16" name="item4" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,744" group="n15_ga16"/>
+    <component id="n9_ga16" name="item5" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="182,1082" group="n15_ga16"/>
+    <component id="n10_ga16" name="item6" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="540,1082" group="n15_ga16"/>
+    <component id="n11_ga16" name="item7" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="898,1082" group="n15_ga16"/>
+    <component id="n12_ga16" name="item8" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="360,1420" group="n15_ga16"/>
+    <component id="n13_ga16" name="item9" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="718,1420" group="n15_ga16"/>
+    <component id="n14_ga16" name="itemOne" src="ga16g" fileName="components/LuckyBoxBonusItem.xml" xy="539,932" group="n15_ga16"/>
+    <group id="n15_ga16" name="n15" xy="-10,213" size="1101,1399" advanced="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>

+ 4 - 4
FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="4"/>
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
-      <gearDisplay controller="c1" pages="4"/>
+      <gearDisplay controller="c1" pages="0,4"/>
     </image>
     <image id="n11_v95q" name="n11" src="v95q2v" fileName="images/cj_hd_hdh_2.png" xy="58,60" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
@@ -15,7 +15,7 @@
       <gearDisplay controller="c1" pages="1"/>
     </image>
     <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="100,270" group="n9_v95q">
-      <gearDisplay controller="c1" pages="4"/>
+      <gearDisplay controller="c1" pages="0,4"/>
     </image>
     <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="100,270" group="n9_v95q">
       <gearDisplay controller="c1" pages="3"/>
@@ -30,7 +30,7 @@
     <loader id="n3_ga16" name="icon" xy="115,120" size="158,158" group="n9_v95q" aspect="true" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
     <loader id="n4_ga16" name="rarity" xy="278,62" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
     <text id="n2_ga16" name="txtName" xy="163,267" size="60,39" group="n9_v95q" fontSize="28" color="#bf9e73" align="center" text="物品">
-      <gearColor controller="c1" pages="1,2,3,4" values="#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000" default="#efe4af,#000000"/>
+      <gearColor controller="c1" pages="0,1,2,3,4" values="#bf9e73,#000000|#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000"/>
     </text>
     <group id="n9_v95q" name="n9" xy="58,60" size="270,270"/>
   </displayList>

+ 1 - 1
FGUIProject/assets/LuckyBox/components/LuckyBoxBonusItem.xml

@@ -4,7 +4,7 @@
   <displayList>
     <image id="n13_v95q" name="n13" src="v95q2t" fileName="images/cj_glglgl.png" xy="0,0"/>
     <image id="n9_v95q" name="n9" src="v95q2y" fileName="images/cj_hd_kdi_1.png" xy="58,60">
-      <gearDisplay controller="c1" pages="4"/>
+      <gearDisplay controller="c1" pages="0,4"/>
     </image>
     <image id="n10_v95q" name="n10" src="v95q2z" fileName="images/cj_hd_kdi_2.png" xy="58,60">
       <gearDisplay controller="c1" pages="3"/>

+ 2 - 10
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -121,16 +121,6 @@ namespace GFGGame
                             Timers.inst.Add(0.1f, 1, (object param) =>
                             {
                                 _ui.m_loaBg.touchable = true;
-
-                                // List<ItemData> list = LuckyBoxDataManager.Instance.GetFirstClothingList();
-                                // if (list.Count > 0)
-                                // {
-                                //     ViewManager.Show(ViewName.LUCKY_BOX_CARD_VIEW, new object[] { list, FirstGetCardViewType.CANNOT_JUMP_CANNOT_SUIT });
-                                // }
-                                // else
-                                // {
-                                // GetSuitItemController.TryShow(0);
-                                // }
                             });
                         }
                     }, i);
@@ -186,6 +176,8 @@ namespace GFGGame
                 itemName += "x" + itemData.num;
             }
             itemUI.m_comIcon.m_txtName.text = itemName;
+            itemUI.m_c1.selectedIndex = itemCfg.rarity;
+            itemUI.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(itemUI.m_comIcon.m_rarity, itemData.id, false);
             itemUI.target.data = itemData.id;
             itemUI.m_comIcon.target.SetScale(0, 0);

BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes