抽卡

FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <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"/>
@@ -21,9 +21,20 @@
     <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"/>
-    <group id="n15_ga16" name="n15" xy="-10,259" size="1101,1399" advanced="true">
+    <group id="n15_ga16" name="grpItems" xy="-10,259" size="1101,1399" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
+    <loader id="n19_v95q" name="loaMask" 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>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n14_ga16" tween="true" startValue="0" endValue="1" duration="24" ease="Linear"/>
+    <item time="0" type="Alpha" target="n15_ga16" tween="true" startValue="0" endValue="1" duration="24" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n14_ga16" value="0"/>
+    <item time="0" type="Alpha" target="n15_ga16" value="0"/>
+  </transition>
 </component>

FGUIProject/assets/LuckyBox/LuckyBoxNewCardUI.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n6_v95q" name="loaBg" xy="-180,0" pivot="0.5,0" size="1440,1920" url="ui://drx9d1usv95q3a" align="center" vAlign="middle" fill="scaleMatchHeight">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    </loader>
+    <image id="n4_v95q" name="n4" src="v95q39" fileName="images/hdkp_xhd.png" xy="0,0">
+      <relation target="" sidePair="top-top"/>
+    </image>
+    <image id="n7_v95q" name="n7" src="v95q3b" fileName="images/hdkp_dj.png" xy="23,1783">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+  <transition name="t_open"/>
+  <transition name="t_close"/>
+</component>

FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usvek811">
+    <list id="n23_vek8" name="listBg" xy="0,0" size="1080,1920" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="154" defaultItem="ui://drx9d1usnjmn2p">
       <relation target="" sidePair="height-height,center-center,middle-middle"/>
     </list>
     <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n32_vek8">

FGUIProject/assets/LuckyBox/components/ComListBgItem.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <loader id="n25_vek8" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1useshh1f" fill="scaleMatchWidth">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <loader id="n26_vek8" name="loaImg" xy="0,1378" size="1080,542" url="ui://drx9d1usvek8s" autoSize="true">
-      <relation target="" sidePair="bottom-bottom"/>
-    </loader>
-    <graph id="n31_qi04" name="holder1" xy="697,779" size="100,100">
-      <relation target="" sidePair="top-middle"/>
-    </graph>
-    <graph id="n30_qi04" name="holder" xy="312,700" size="100,100">
-      <relation target="" sidePair="top-middle"/>
-    </graph>
-    <image id="n29_qi04" name="imgTitle" src="qi041j" fileName="images/cj_zizi_2.png" xy="92,337">
-      <relation target="" sidePair="top-middle"/>
-    </image>
-    <text id="n33_ez2u" name="n33" xy="336,727" size="61,108" group="n36_ez2u" fontSize="41" color="#fffbdd" align="center" vAlign="middle" ubb="true" autoSize="height" text="剩余">
-      <relation target="" sidePair="height-height,top-top"/>
-    </text>
-    <text id="n34_ez2u" name="txtTime" xy="326,835" size="80,55" group="n36_ez2u" fontSize="41" color="#fffbdd" align="center" vAlign="middle" ubb="true" text="811">
-      <relation target="" sidePair="height-height,top-top"/>
-    </text>
-    <text id="n35_ez2u" name="txtTimeStr" xy="336,890" size="61,108" group="n36_ez2u" fontSize="41" color="#fffbdd" align="center" vAlign="middle" ubb="true" autoSize="height" text="小时">
-      <relation target="" sidePair="height-height,top-top"/>
-    </text>
-    <group id="n36_ez2u" name="grpTime" xy="326,727" size="80,271" advanced="true" layout="vt" excludeInvisibles="true">
-      <relation target="n29_qi04" sidePair="top-top"/>
-    </group>
-  </displayList>
-  <customProperty target="loaBg" propertyId="1"/>
-</component>

FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,6 +1,6 @@
 <?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="0,4"/>
@@ -14,6 +14,9 @@
     <image id="n13_v95q" name="n13" src="v95q2x" fileName="images/cj_hd_hdh_4.png" xy="58,60" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>
+    <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="272,68" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
+    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="76,99" group="n9_v95q" visible="false"/>
     <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="0,4"/>
     </image>
@@ -23,9 +26,6 @@
     <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="100,270" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
     </image>
-    <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="272,68" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
-    <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="76,99" group="n9_v95q" visible="false"/>
     <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="100,270" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>

FGUIProject/assets/LuckyBox/package.xml

@@ -20,10 +20,9 @@
     <image id="vek8s" name="cj_ditua.png" path="/images/"/>
     <image id="vek8t" name="cj_duihuan.png" path="/images/"/>
     <image id="vek8v" name="cj_yulan.png" path="/images/"/>
-    <component id="vek811" name="ComListBgItem.xml" path="/components/"/>
     <component id="vek812" name="ComCost.xml" path="/components/"/>
     <image id="qdrt14" name="hd_dkdk_1.png" path="/images/"/>
-    <component id="qdrt19" name="LuckyBoxCardUI.xml" path="/" exported="true"/>
+    <component id="qdrt19" name="LuckyBoxNewDressUI.xml" path="/" exported="true"/>
     <component id="qdrt1a" name="ComCard.xml" path="/components/"/>
     <image id="qdrt1b" name="hd_tiaoguo.png" path="/images/"/>
     <component id="qdrt1c" name="Button4.xml" path="/components/"/>
@@ -56,6 +55,11 @@
     <image id="v95q36" name="cj_hd_zik_4.png" path="/images/"/>
     <component id="dcrotaa" name="Component2.xml" path="/components/"/>
     <component id="ga16g" name="LuckyBoxBonusItem.xml" path="/components/"/>
+    <component id="v95q37" name="LuckyBoxNewCardUI.xml" path="/" exported="true"/>
+    <image id="v95q38" name="yd_tykuang_1.png" path="/images/"/>
+    <image id="v95q39" name="hdkp_xhd.png" path="/images/"/>
+    <image id="v95q3a" name="kp_lanshan.jpg" path="/images/"/>
+    <image id="v95q3b" name="hdkp_dj.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusUI.cs

@@ -21,6 +21,10 @@ namespace UI.LuckyBox
         public UI_LuckyBoxBonusItem m_item7;
         public UI_LuckyBoxBonusItem m_item8;
         public UI_LuckyBoxBonusItem m_item9;
+        public GGroup m_grpItems;
+        public GLoader m_loaMask;
+        public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://drx9d1usfka7a";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckBoxBonusUI";
@@ -82,6 +86,10 @@ namespace UI.LuckyBox
             m_item7 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item7"));
             m_item8 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item8"));
             m_item9 = (UI_LuckyBoxBonusItem)UI_LuckyBoxBonusItem.Create(comp.GetChild("item9"));
+            m_grpItems = (GGroup)comp.GetChild("grpItems");
+            m_loaMask = (GLoader)comp.GetChild("loaMask");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -110,6 +118,10 @@ namespace UI.LuckyBox
             m_item8 = null;
             m_item9.Dispose();
             m_item9 = null;
+            m_grpItems = null;
+            m_loaMask = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComListBgItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewCardUI.cs

@@ -4,25 +4,20 @@ using FairyGUI;
 
 namespace UI.LuckyBox
 {
-    public partial class UI_ComListBgItem
+    public partial class UI_LuckyBoxNewCardUI
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GLoader m_loaImg;
-        public GGraph m_holder1;
-        public GGraph m_holder;
-        public GImage m_imgTitle;
-        public GTextField m_txtTime;
-        public GTextField m_txtTimeStr;
-        public GGroup m_grpTime;
-        public const string URL = "ui://drx9d1usvek811";
+        public Transition m_t_open;
+        public Transition m_t_close;
+        public const string URL = "ui://drx9d1usv95q37";
         public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "ComListBgItem";
-        private static UI_ComListBgItem _proxy;
+        public const string RES_NAME = "LuckyBoxNewCardUI";
+        private static UI_LuckyBoxNewCardUI _proxy;
 
-        public static UI_ComListBgItem Create(GObject gObject = null)
+        public static UI_LuckyBoxNewCardUI Create(GObject gObject = null)
         {
-            var ui = new UI_ComListBgItem();
+            var ui = new UI_LuckyBoxNewCardUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -31,11 +26,11 @@ namespace UI.LuckyBox
             return ui;
         }
 
-        public static UI_ComListBgItem Proxy(GObject gObject = null)
+        public static UI_LuckyBoxNewCardUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComListBgItem();
+                _proxy = new UI_LuckyBoxNewCardUI();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -63,24 +58,14 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaImg = (GLoader)comp.GetChild("loaImg");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_imgTitle = (GImage)comp.GetChild("imgTitle");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_txtTimeStr = (GTextField)comp.GetChild("txtTimeStr");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_t_open = comp.GetTransition("t_open");
+            m_t_close = comp.GetTransition("t_close");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_loaImg = null;
-            m_holder1 = null;
-            m_holder = null;
-            m_imgTitle = null;
-            m_txtTime = null;
-            m_txtTimeStr = null;
-            m_grpTime = null;
+            m_t_open = null;
+            m_t_close = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxCardUI.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewCardUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5b798e4beedec34faf42975205434be
+guid: 1b4802b309483a84f9b227979a405e25
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxCardUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.LuckyBox
 {
-    public partial class UI_LuckyBoxCardUI
+    public partial class UI_LuckyBoxNewDressUI
     {
         public GComponent target;
         public GGraph m_bg;
@@ -14,12 +14,12 @@ namespace UI.LuckyBox
         public Transition m_t_close;
         public const string URL = "ui://drx9d1usqdrt19";
         public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "LuckyBoxCardUI";
-        private static UI_LuckyBoxCardUI _proxy;
+        public const string RES_NAME = "LuckyBoxNewDressUI";
+        private static UI_LuckyBoxNewDressUI _proxy;
 
-        public static UI_LuckyBoxCardUI Create(GObject gObject = null)
+        public static UI_LuckyBoxNewDressUI Create(GObject gObject = null)
         {
-            var ui = new UI_LuckyBoxCardUI();
+            var ui = new UI_LuckyBoxNewDressUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -28,11 +28,11 @@ namespace UI.LuckyBox
             return ui;
         }
 
-        public static UI_LuckyBoxCardUI Proxy(GObject gObject = null)
+        public static UI_LuckyBoxNewDressUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_LuckyBoxCardUI();
+                _proxy = new UI_LuckyBoxNewDressUI();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxCardView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxNewDressUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6684583066d8718459377b96fed7461e
+guid: 3a307fbf0b773cb428456c884241ad0f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     {
         private UI_LuckBoxBonusUI _ui;
         private List<ItemData> itemList;
-
+        private GComponent _curComItem;
         private int openCount = 0;
 
         private List<GameObject> _effects = new List<GameObject>();
@@ -53,9 +53,10 @@ namespace GFGGame
             base.OnShown();
 
             itemList = (viewData as object[])[0] as List<ItemData>;
+            _ui.m_loaOpen.visible = true;
+            _ui.m_loaMask.visible = true;
             if (itemList != null)
             {
-                _ui.m_loaOpen.visible = true;
                 int count = itemList.Count;
                 if (count == 10)
                 {
@@ -71,11 +72,16 @@ namespace GFGGame
             {
                 _ui.m_loaOpen.visible = false;
             }
+            _ui.m_t0.Play(UpdateView);
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            // _ui.m_grpItems.visible = false;
+            // _ui.m_itemOne.target.visible = false;
+            _ui.m_t1.Play();
+            openCount = 0;
         }
 
         private void OnClickBg()
@@ -83,8 +89,16 @@ namespace GFGGame
             this.Hide();
             ViewManager.Show(ViewName.LUCKY_BOX_VIEW, ViewManager.GetGoBackDatas(ViewName.LUCKY_BOX_STAR_VIEW));
             GetSuitItemController.TryShow(0);
+            _ui.m_t0.Stop(true, false);
         }
+        private void UpdateView()
+        {
 
+            _ui.m_loaMask.visible = false;
+            int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
+            List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
+            ViewManager.Show<LuckyBoxNewDressView>(new object[] { itemDatas });
+        }
         private void ShowBonusList()
         {
             if (itemList.Count > 1)
@@ -104,18 +118,18 @@ namespace GFGGame
             }
         }
 
-        private void HideAllItem()
-        {
-            _ui.m_itemOne.target.visible = false;
-            for (int i = 0; i < 10; i++)
-            {
-                GObject itemObject = _ui.target.GetChild("item" + i);
-                if (itemObject != null)
-                {
-                    itemObject.visible = false;
-                }
-            }
-        }
+        // private void HideAllItem()
+        // {
+        //     _ui.m_itemOne.target.visible = false;
+        //     for (int i = 0; i < 10; i++)
+        //     {
+        //         GObject itemObject = _ui.target.GetChild("item" + i);
+        //         if (itemObject != null)
+        //         {
+        //             itemObject.visible = false;
+        //         }
+        //     }
+        // }
 
         private void UpdateItem(int index, GObject obj)
         {
@@ -148,7 +162,7 @@ namespace GFGGame
             itemUI.m_comIcon.m_c1.selectedIndex = itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(itemUI.m_comIcon.m_rarity, itemData.id, false);
             itemUI.m_comIcon.m_icon.data = itemData.id;
-
+            itemUI.target.data = itemData;
             // itemUI.m_comIcon.target.SetScale(0, 0);
             itemUI.m_t0.Play();
             UI_LuckyBoxBonusItem.ProxyEnd();
@@ -176,10 +190,16 @@ namespace GFGGame
         private void OnClickItem(EventContext context)
         {
             GComponent item = context.sender as GComponent;
+
             PlayOpenAni(item);
         }
         private void OnClickOpen()
         {
+            if (itemList.Count == 1)
+            {
+                PlayOpenAni(_ui.m_itemOne.target);
+                return;
+            }
             for (int i = 0; i < itemList.Count; i++)
             {
                 GComponent component = _ui.target.GetChild("item" + i).asCom;
@@ -196,12 +216,36 @@ namespace GFGGame
             Transition transition = component.GetTransition("t1");
             GComponent comIcon = component.GetChild("comIcon").asCom;
             if (transition.playing || comIcon.skew == Vector2.zero) return false;
+            GImage imgNew = component.GetChild("comIcon").asCom.GetChild("imgNew").asImage;
+            if (imgNew.visible)
+            {
+                _ui.m_loaMask.visible = true;
+
+            }
+            _curComItem = component;
             transition.Play(UpdateOpenCount);
             return true;
         }
         private void UpdateOpenCount()
         {
+            GImage imgNew = _curComItem.GetChild("comIcon").asCom.GetChild("imgNew").asImage;
+            if (imgNew.visible)
+            {
+                ItemData itemData = _curComItem.data as ItemData;
+                ItemCfg cfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+                if (cfg.itemType == ConstItemType.DRESS_UP)
+                {
+                    List<ItemData> itemDatas = ItemUtil.CreateItemDataList(itemData.id, itemData.num);
+                    ViewManager.Show<LuckyBoxNewDressView>(new object[] { itemDatas });
+                }
+                else if (cfg.itemType == ConstItemType.CARD)
+                {
+                    ViewManager.Show<LuckyBoxNewDressView>(itemData.id);
+                }
+            }
             openCount++;
+            _ui.m_loaMask.visible = false;
+
             if (openCount == itemList.Count)
             {
                 _ui.m_loaOpen.visible = false;

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs

@@ -0,0 +1,59 @@
+using ET;
+using FairyGUI;
+using UI.LuckyBox;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LuckyBoxNewCardView : BaseWindow
+    {
+        private UI_LuckyBoxNewCardUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LuckyBoxNewCardUI.PACKAGE_NAME;
+            _ui = UI_LuckyBoxNewCardUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.onClick.Add(this.Hide);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            int cardId = (int)this.viewData;
+            ItemCfg cfg = ItemCfgArray.Instance.GetCfg(cardId);
+
+            _ui.m_loaBg.url = ResPathUtil.GetCardPath(cfg.res);
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComListBgItem.cs.meta → GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewCardView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1ce99a67a3241cc4eb0ce424b4ac5acd
+guid: 180e77ed5042c9e4ca338758a35f3e93
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxCardView.cs → GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -8,13 +8,13 @@ using System.Linq;
 namespace GFGGame
 {
 
-    public class LuckyBoxCardView : BaseWindow
+    public class LuckyBoxNewDressView : BaseWindow
     {
-        private UI_LuckyBoxCardUI _ui;
+        private UI_LuckyBoxNewDressUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
-        private List<ItemData> _newRewardList = new List<ItemData>();
-        private List<ItemData> _oldRewardList = new List<ItemData>();
-        private List<ItemData> _showRewardList = new List<ItemData>();
+        // private List<ItemData> _newRewardList = new List<ItemData>();
+        // private List<ItemData> _oldRewardList = new List<ItemData>();
+        // private List<ItemData> _showRewardList = new List<ItemData>();
 
         // private int _type = 0;//弹窗类型：0可跳过，1：首次获得物品不可跳过,2首次获得物品不可跳过,不弹获得套装界面
 
@@ -34,8 +34,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_LuckyBoxUI.PACKAGE_NAME;
-            _ui = UI_LuckyBoxCardUI.Create();
+            packageName = UI_LuckyBoxNewDressUI.PACKAGE_NAME;
+            _ui = UI_LuckyBoxNewDressUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
 
@@ -52,37 +52,48 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _rewardList = (this.viewData as object[])[0] as List<ItemData>;
-
-            _newRewardList.Clear();
-            _oldRewardList.Clear();
-            for (int i = 0; i < _rewardList.Count; i++)
+            List<ItemData> rewardList = (this.viewData as object[])[0] as List<ItemData>;
+            if (_rewardList.Count > 0)
             {
-                if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
-                {
-                    _newRewardList.Add(_rewardList[i]);
-                }
-                else
-                {
-                    _oldRewardList.Add(_rewardList[i]);
-                }
+                _rewardList.AddRange(rewardList);
+                return;
             }
-            if (LuckyBoxDataManager.Instance.luckyBoxId > 0)//必展示必掉奖励
+            else
             {
-                int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
-                List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
-                _newRewardList.AddRange(itemDatas);
-                LuckyBoxDataManager.Instance.luckyBoxId = 0;
+                _rewardList = rewardList;
             }
+            _ui.m_btnPass.visible = false;
+            // _newRewardList.Clear();
+            // _oldRewardList.Clear();
+            // for (int i = 0; i < _rewardList.Count; i++)
+            // {
+            //     if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
+            //     {
+            //         _newRewardList.Add(_rewardList[i]);
+            //     }
+            //     else
+            //     {
+            //         _oldRewardList.Add(_rewardList[i]);
+            //     }
+            // }
+            // if (LuckyBoxDataManager.Instance.luckyBoxId > 0)//必展示必掉奖励
+            // {
+            //     int[][] bonus = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxDataManager.Instance.luckyBoxId).bonusArr;
+            //     List<ItemData> itemDatas = ItemUtil.CreateItemDataList(bonus, LuckyBoxDataManager.Instance.times);
+            //     _newRewardList.AddRange(itemDatas);
+            //     LuckyBoxDataManager.Instance.luckyBoxId = 0;
+            // }
+            LuckyBoxDataManager.Instance.luckyBoxId = 0;
 
             UpdateView();
         }
         private void UpdateView()
         {
-            _ui.m_btnPass.visible = _newRewardList.Count <= 1;
-            _showRewardList = _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
-            if (_showRewardList.Count - 1 < 0) return;
-            ItemData itemdata = _showRewardList[_showRewardList.Count - 1];
+            // _ui.m_btnPass.visible = _newRewardList.Count <= 1;
+            // _newRewardList.Count > 0 ? _newRewardList : _oldRewardList;
+
+            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 = ResPathUtil.GetCommonGameResPath("hd_sxicon_" + itemCfg.rarity);
             _ui.m_comCard.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
@@ -95,27 +106,27 @@ namespace GFGGame
             _ui.m_comCard.m_txtDiscribe.text = itemCfg.desc;
             _ui.m_comCard.m_holder.visible = true;
 
-            if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_showRewardList.Count - 1) == true)
+            if (LuckyBoxDataManager.Instance.FirstRewardList.ContainsKey(_rewardList.Count - 1) == true)
             {
-                LuckyBoxDataManager.Instance.FirstRewardList.Remove(_showRewardList.Count - 1);
+                LuckyBoxDataManager.Instance.FirstRewardList.Remove(_rewardList.Count - 1);
             }
-            _showRewardList.RemoveAt(_showRewardList.Count - 1);
+            _rewardList.RemoveAt(_rewardList.Count - 1);
 
         }
 
         private void OnClickBg()
         {
-            if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
+            if (_rewardList.Count == 0)
             {
-                // if (_type == (int)FirstGetCardViewType.JUMP)
-                // {
-                ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0] as List<ItemData>, _rewardList });
-                // }
-                // else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
-                // {
-                //     GetSuitItemController.TryShow(0);
-
-                // }
+                //     // if (_type == (int)FirstGetCardViewType.JUMP)
+                //     // {
+                //     ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0] as List<ItemData>, _rewardList });
+                //     // }
+                //     // else if (_type == (int)FirstGetCardViewType.CANNOT_JUMP)
+                //     // {
+                //     //     GetSuitItemController.TryShow(0);
+
+                //     // }
                 this.Hide();
                 return;
             }
@@ -142,9 +153,9 @@ namespace GFGGame
         }
         private bool IsAddToNewRewardList(int itemId)
         {
-            for (int i = 0; i < _newRewardList.Count; i++)
+            for (int i = 0; i < _rewardList.Count; i++)
             {
-                if (itemId == _newRewardList[i].id)
+                if (itemId == _rewardList[i].id)
                 {
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af5d144dfd5a4b745a528cb1e1b173fa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -320,7 +320,7 @@ namespace GFGGame
             {
 
                 RemoveListener();
-                ViewManager.Show(ViewName.LUCKY_BOX_CARD_VIEW, new object[] { _rewardList });
+                ViewManager.Show<LuckyBoxBonusView>(new object[] { _rewardList });
                 this.Hide();
             }
         }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -144,7 +144,7 @@ namespace GFGGame
             GLoader loaCost = (obj as GComponent).GetChild("comCostOne").asCom.GetChild("loaCost").asLoader;
             loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
             GTextField txtCostTen = (obj as GComponent).GetChild("comCostTen").asCom.GetChild("txtCost").asTextField;
-            txtCostTen.text = cfg.costNum.ToString();
+            txtCostTen.text = cfg.costNumTen.ToString();
             GLoader loaCostTen = (obj as GComponent).GetChild("comCostTen").asCom.GetChild("loaCost").asLoader;
             loaCostTen.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(cfg.costID).res);
 

GameClient/Assets/Game/HotUpdate/Views/ViewName.cs

@@ -28,7 +28,6 @@ namespace GFGGame
         public static string LUCKY_BOX_BONUS_VIEW = "GFGGame.LuckyBoxBonusView";
         public static string LUCKY_BOX_PRE_SHOW_VIEW = "GFGGame.LuckyBoxPreShowView";
         public static string LUCKY_BOX_STAR_VIEW = "GFGGame.LuckyBoxStarView";
-        public static string LUCKY_BOX_CARD_VIEW = "GFGGame.LuckyBoxCardView";
         public static string GET_SUIT_ITEM_VIEW = "GFGGame.GetSuitItemVIew";
         public static string CLOTHING_SHOP_VIEW = "GFGGame.ClothingShopView";
         public static string BUY_COUNT_VIEW = "GFGGame.BuyCountView";

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: ecf19c3abc6f104479c34dd9168fc155
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 618dc551eb9f5c641b25d48a9bae6d9e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: