zhaoyang 2 rokov pred
rodič
commit
2034ff1bb6

+ 11 - 8
FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
-  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4," selected="3"/>
+  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4," selected="0"/>
   <displayList>
     <graph id="n19_e050" name="holder" xy="192,187" size="10,10" group="n9_v95q" type="rect">
-      <gearDisplay controller="c1" pages="3,4"/>
+      <gearDisplay controller="c1" pages="3"/>
+    </graph>
+    <graph id="n22_o4m7" name="holder1" xy="192,187" size="10,10" group="n9_v95q" type="rect">
+      <gearDisplay controller="c1" pages="4"/>
     </graph>
     <image id="n10_v95q" name="n10" src="volstb2" fileName="imageNews/zx_wp_jin_bg.png" xy="42,57" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="0"/>
@@ -20,24 +23,24 @@
     <image id="n13_v95q" name="n13" src="e050tf5" fileName="imageNews/zx_wp_lan_grey.png" xy="88,94" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <loader id="n3_ga16" name="icon" xy="194,195" pivot="0.5,0.5" anchor="true" size="116,116" group="n9_v95q" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scale" shrinkOnly="true">
+    <loader id="n3_ga16" name="icon" xy="194,195" pivot="0.5,0.5" anchor="true" size="158,158" group="n9_v95q" aspect="true" url="ui://eg2y0ldpm9wm8v" align="center" vAlign="middle" fill="scale" shrinkOnly="true">
       <gearSize controller="c1" pages="1,2,3,4" values="98,98,1,1|100,100,1,1|116,116,1,1|180,180,1,1" default="158,158,1,1"/>
     </loader>
-    <loader id="n4_ga16" name="rarity" xy="229,109" pivot="0.5,0" size="38,88" group="n9_v95q" aspect="true" url="ui://eg2y0ldpo9ghtll" align="center" fill="scale">
+    <loader id="n4_ga16" name="rarity" xy="272,68" pivot="0.5,0" size="42,96" group="n9_v95q" aspect="true" url="ui://eg2y0ldpo9ghtll" align="center" fill="scale">
       <gearXY controller="c1" pages="1,2,3,4" values="230,131|229,130|229,109|253,76" default="272,68"/>
       <gearSize controller="c1" pages="1,2,3" values="26,59,1,1|26,60,1,1|38,88,1,1" default="42,96,1,1"/>
     </loader>
-    <image id="n7_pzq1" name="imgNew" src="volstb5" fileName="imageNews/zx_wp_jin_jiaobiao.png" xy="90,121" pivot="0.5,0.5" size="77,44" group="n9_v95q" aspect="true" visible="false">
+    <image id="n7_pzq1" name="imgNew" src="volstb5" fileName="imageNews/zx_wp_jin_jiaobiao.png" xy="76,99" pivot="0.5,0.5" size="91,52" group="n9_v95q" aspect="true" visible="false">
       <gearXY controller="c1" pages="1,2,3,4" values="108,137|108,137|90,121|56,93" default="76,99"/>
       <gearSize controller="c1" pages="1,2,3" values="63,36,1,1|63,36,1,1|77,44,1,1" default="91,52,1,1"/>
     </image>
-    <image id="n20_e050" name="n20" src="volstb9" fileName="imageNews/zx_wp_mingcheng_bg.png" xy="192,289" pivot="0.5,0" anchor="true" size="133,32" group="n9_v95q">
+    <image id="n20_e050" name="n20" src="volstb9" fileName="imageNews/zx_wp_mingcheng_bg.png" xy="192,310" pivot="0.5,0" anchor="true" size="133,32" group="n9_v95q">
       <relation target="n21_e050" sidePair="width-width,center-center,middle-middle"/>
     </image>
-    <text id="n21_e050" name="txtName" xy="195,305" pivot="0.5,0.5" anchor="true" size="96,29" group="n9_v95q" fontSize="20" color="#ffffff" align="center" letterSpacing="-2" text="孔雀东南飞">
+    <text id="n21_e050" name="txtName" xy="195,326" pivot="0.5,0.5" anchor="true" size="96,29" group="n9_v95q" fontSize="20" color="#ffffff" align="center" letterSpacing="-2" text="孔雀东南飞">
       <gearFontSize controller="c1" pages="4" values="28" default="20"/>
       <relation target="n3_ga16" sidePair="center-center,top-bottom"/>
     </text>
-    <group id="n9_v95q" name="n9" xy="42,57" size="300,270"/>
+    <group id="n9_v95q" name="n9" xy="42,57" size="300,285"/>
   </displayList>
 </component>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Component2.cs

@@ -9,6 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public Controller m_c1;
         public GGraph m_holder;
+        public GGraph m_holder1;
         public GLoader m_icon;
         public GLoader m_rarity;
         public GImage m_imgNew;
@@ -62,6 +63,7 @@ namespace UI.LuckyBox
         {
             m_c1 = comp.GetController("c1");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -71,6 +73,7 @@ namespace UI.LuckyBox
         {
             m_c1 = null;
             m_holder = null;
+            m_holder1 = null;
             m_icon = null;
             m_rarity = null;
             m_imgNew = null;

+ 22 - 17
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs

@@ -10,8 +10,9 @@ namespace GFGGame
     {
         private UI_LuckBoxBonusShowUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
-        private List<GameObject> _gameobjects = new List<GameObject>();
-        private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        // private List<GameObject> _gameobjects = new List<GameObject>();
+        private Dictionary<int, Dictionary<int, GameObject>> _gameobjects = new Dictionary<int, Dictionary<int, GameObject>>();
+        private Dictionary<int, Dictionary<int, GoWrapper>> _wrappers = new Dictionary<int, Dictionary<int, GoWrapper>>();
         private GameObject _gameobject;
         private GoWrapper _wrapper;
         private GameObject _gameObject0;
@@ -24,10 +25,17 @@ namespace GFGGame
         public override void Dispose()
         {
             base.Dispose();
-            for (int i = 0; i < _gameobjects.Count; i++)
-            {
-                SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
+            // for (int i = 0; i < _gameobjects.Count; i++)
+            // {
+            //     SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
 
+            // }
+            foreach (int key in _gameobjects.Keys)
+            {
+                foreach (int key1 in _gameobjects[key].Keys)
+                {
+                    SceneController.DestroyObjectFromView(_gameobjects[key][key1], _wrappers[key][key1]);
+                }
             }
             SceneController.DestroyObjectFromView(_gameobject, _wrapper);
             SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
@@ -101,22 +109,19 @@ namespace GFGGame
             item.m_comIcon.m_txtName.text = itemCfg.name;
             item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
-            if (itemCfg.rarity > 2)
+            if (itemCfg.rarity > 2 && (!_gameobjects.ContainsKey(itemCfg.rarity) || !_gameobjects[itemCfg.rarity].ContainsKey(index)))
             {
                 string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02");
-                if (_effectIndex > _gameobjects.Count)
+                if (!_gameobjects.ContainsKey(itemCfg.rarity))
                 {
-                    GameObject gameObject = _gameobjects[_effectIndex];
-                    GoWrapper wrapper = _wrappers[_effectIndex];
-                    SceneController.AddObjectToView(gameObject, wrapper, item.m_comIcon.m_holder, resPath, out gameObject, out wrapper);
+                    _gameobjects[itemCfg.rarity] = new Dictionary<int, GameObject>();
+                    _wrappers[itemCfg.rarity] = new Dictionary<int, GoWrapper>();
                 }
-                else
-                {
-                    SceneController.AddObjectToView(null, null, item.m_comIcon.m_holder, resPath, out GameObject gameObject, out GoWrapper wrapper);
-                    _gameobjects.Add(gameObject);
-                    _wrappers.Add(wrapper);
-                }
-                _effectIndex++;
+                GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
+                SceneController.AddObjectToView(null, null, holder, resPath, out GameObject gameObject, out GoWrapper wrapper);
+                _gameobjects[itemCfg.rarity][index] = gameObject;
+                _wrappers[itemCfg.rarity][index] = wrapper;
+
             }
             int count = 0;
             bool isFirst = false;

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