zhaoyang 2 năm trước cách đây
mục cha
commit
fe8a1ee0b3
31 tập tin đã thay đổi với 610 bổ sung37 xóa
  1. 38 0
      FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml
  2. 1 1
      FGUIProject/assets/LuckyBox/LuckBoxBonusUI.xml
  3. 28 23
      FGUIProject/assets/LuckyBox/components/Component2.xml
  4. 9 0
      FGUIProject/assets/LuckyBox/components/LuckyBoxBonusShowItem.xml
  5. BIN
      FGUIProject/assets/LuckyBox/imageNews/zx_wp_jin_jiaobiao.png
  6. BIN
      FGUIProject/assets/LuckyBox/imageNews/zx_wp_lan_grey.png
  7. 4 1
      FGUIProject/assets/LuckyBox/package.xml
  8. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Component2.cs
  9. 130 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs
  10. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs.meta
  11. 75 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs
  12. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs.meta
  13. 93 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs
  14. 11 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs.meta
  15. 3 11
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs
  16. 1 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  17. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  18. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  19. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  21. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  23. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png
  25. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png
  27. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png
  28. 96 0
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png.meta
  29. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png
  30. 96 0
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png.meta
  31. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 38 - 0
FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <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"/>
+    </loader>
+    <component id="n14_ga16" name="itemOne" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,960">
+      <gearDisplay controller="c1" pages="0"/>
+    </component>
+    <component id="n1_ga16" name="item0" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,475" group="n21_e050"/>
+    <component id="n5_ga16" name="item1" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,475" group="n21_e050"/>
+    <group id="n21_e050" name="n21" xy="210,300" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <component id="n6_ga16" name="item2" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,798" group="n22_e050"/>
+    <component id="n7_ga16" name="item3" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,798" group="n22_e050"/>
+    <component id="n8_ga16" name="item4" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,798" group="n22_e050"/>
+    <group id="n22_e050" name="n22" xy="45,623" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n9_ga16" name="item5" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="220,1121" group="n23_e050"/>
+    <component id="n10_ga16" name="item6" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,1121" group="n23_e050"/>
+    <component id="n11_ga16" name="item7" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="860,1121" group="n23_e050"/>
+    <group id="n23_e050" name="n23" xy="45,946" size="990,350" group="n15_ga16" advanced="true" layout="hz" colGap="-30" excludeInvisibles="true"/>
+    <component id="n12_ga16" name="item8" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="385,1444" group="n24_e050"/>
+    <component id="n13_ga16" name="item9" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="695,1444" group="n24_e050"/>
+    <group id="n24_e050" name="n24" xy="210,1269" size="660,350" group="n15_ga16" advanced="true" layout="hz" colGap="-40" excludeInvisibles="true"/>
+    <group id="n15_ga16" name="grpItems" xy="45,300" size="990,1319" advanced="true" layout="vt" lineGap="-27">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </group>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n14_ga16" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n15_ga16" tween="true" startValue="0" endValue="1" duration="18" 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>

+ 1 - 1
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="0"/>
+  <controller name="c1" pages="0,,1," selected="1"/>
   <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"/>

+ 28 - 23
FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="1"/>
+  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4," selected="4"/>
   <displayList>
-    <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
+    <graph id="n19_e050" name="holder" xy="187,187" size="10,10" group="n9_v95q" type="rect">
+      <gearDisplay controller="c1" pages="1,2"/>
+    </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,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"/>
-    </image>
-    <image id="n12_v95q" name="n12" src="v95q2w" fileName="images/cj_hd_hdh_3.png" xy="58,60" group="n9_v95q">
+    <image id="n12_v95q" name="n12" src="volstay" fileName="imageNews/zx_wp_fen_bg.png" xy="98,117" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="3"/>
     </image>
-    <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="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="0,4"/>
-    </image>
-    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="67,268" group="n9_v95q">
-      <gearDisplay controller="c1" pages="3"/>
+    <image id="n18_e050" name="n18" src="volstb8" fileName="imageNews/zx_wp_lan_diguang.png" xy="87,90" group="n9_v95q">
+      <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="67,268" group="n9_v95q">
+    <image id="n11_v95q" name="n11" src="volstb7" fileName="imageNews/zx_wp_lan_bg.png" xy="129,111" pivot="0.5,0.5" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="67,268" group="n9_v95q">
+    <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>
-    <text id="n2_ga16" name="txtName" xy="106,268" pivot="0.5,0" size="172,39" group="n9_v95q" fontSize="28" color="#b0967d" align="center" text="岭南荔夏·闲">
-      <gearColor controller="c1" pages="0,1,2,3,4" values="#bf9e73,#000000|#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000"/>
-      <relation target="" sidePair="center-center"/>
+    <loader id="n3_ga16" name="icon" xy="194,195" pivot="0.5,0.5" anchor="true" size="200,200" 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="120,120,1,1|116,116,1,1|138,138,1,1|200,200,1,1" default="158,158,1,1"/>
+    </loader>
+    <loader id="n4_ga16" name="rarity" xy="253,76" 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|224,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="56,93" 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,331" pivot="0.5,0" anchor="true" size="173,32" group="n9_v95q">
+      <relation target="n21_e050" sidePair="width-width,center-center,middle-middle"/>
+    </image>
+    <text id="n21_e050" name="txtName" xy="195,347" pivot="0.5,0.5" anchor="true" size="136,39" group="n9_v95q" fontSize="28" 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="58,60" size="270,270"/>
+    <group id="n9_v95q" name="n9" xy="42,57" size="300,310"/>
   </displayList>
 </component>

+ 9 - 0
FGUIProject/assets/LuckyBox/components/LuckyBoxBonusShowItem.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="350,350" pivot="0.5,0.5" anchor="true">
+  <displayList>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="175,157" pivot="0.5,0.5" anchor="true" controller="c1,3"/>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Scale" target="n1_ga16" tween="true" startValue="0,0" endValue="1,1" duration="6" ease="Linear"/>
+  </transition>
+</component>

BIN
FGUIProject/assets/LuckyBox/imageNews/zx_wp_jin_jiaobiao.png


BIN
FGUIProject/assets/LuckyBox/imageNews/zx_wp_lan_grey.png


+ 4 - 1
FGUIProject/assets/LuckyBox/package.xml

@@ -93,7 +93,7 @@
     <image id="volstb6" name="zx_wp_jin_xian.png" path="/imageNews/"/>
     <image id="volstb7" name="zx_wp_lan_bg.png" path="/imageNews/"/>
     <image id="volstb8" name="zx_wp_lan_diguang.png" path="/imageNews/"/>
-    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/"/>
+    <image id="volstb9" name="zx_wp_mingcheng_bg.png" path="/imageNews/" scale="9grid" scale9grid="23,8,98,16"/>
     <image id="volstba" name="zx_yuan_tx_diandian.png" path="/imageNews/"/>
     <image id="volstbb" name="zx_yuan_tx_hengguang.png" path="/imageNews/"/>
     <image id="volstbc" name="zx_yuan_tx_neiquan.png" path="/imageNews/"/>
@@ -155,6 +155,9 @@
     <component id="duuftec" name="Component3.xml" path="/components/"/>
     <image id="duuftf0" name="zx_title_1.png" path="/imageNews/" exported="true"/>
     <image id="duuftf2" name="zx_bg.png" path="/imageNews/" atlas="alone_npot"/>
+    <component id="e050tf3" name="LuckBoxBonusShowUI.xml" path="/" exported="true"/>
+    <component id="e050tf4" name="LuckyBoxBonusShowItem.xml" path="/components/"/>
+    <image id="e050tf5" name="zx_wp_lan_grey.png" path="/imageNews/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_holder;
         public GLoader m_icon;
         public GLoader m_rarity;
         public GImage m_imgNew;
@@ -60,6 +61,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_icon = (GLoader)comp.GetChild("icon");
             m_rarity = (GLoader)comp.GetChild("rarity");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -68,6 +70,7 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_holder = null;
             m_icon = null;
             m_rarity = null;
             m_imgNew = null;

+ 130 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs

@@ -0,0 +1,130 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckBoxBonusShowUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaBg;
+        public UI_LuckyBoxBonusShowItem m_itemOne;
+        public UI_LuckyBoxBonusShowItem m_item0;
+        public UI_LuckyBoxBonusShowItem m_item1;
+        public UI_LuckyBoxBonusShowItem m_item2;
+        public UI_LuckyBoxBonusShowItem m_item3;
+        public UI_LuckyBoxBonusShowItem m_item4;
+        public UI_LuckyBoxBonusShowItem m_item5;
+        public UI_LuckyBoxBonusShowItem m_item6;
+        public UI_LuckyBoxBonusShowItem m_item7;
+        public UI_LuckyBoxBonusShowItem m_item8;
+        public UI_LuckyBoxBonusShowItem m_item9;
+        public GGroup m_grpItems;
+        public GButton m_btnPass;
+        public Transition m_t0;
+        public Transition m_t1;
+        public const string URL = "ui://drx9d1use050tf3";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckBoxBonusShowUI";
+        private static UI_LuckBoxBonusShowUI _proxy;
+
+        public static UI_LuckBoxBonusShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckBoxBonusShowUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LuckBoxBonusShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckBoxBonusShowUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_itemOne = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("itemOne"));
+            m_item0 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item0"));
+            m_item1 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item1"));
+            m_item2 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item2"));
+            m_item3 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item3"));
+            m_item4 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item4"));
+            m_item5 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item5"));
+            m_item6 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item6"));
+            m_item7 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item7"));
+            m_item8 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item8"));
+            m_item9 = (UI_LuckyBoxBonusShowItem)UI_LuckyBoxBonusShowItem.Create(comp.GetChild("item9"));
+            m_grpItems = (GGroup)comp.GetChild("grpItems");
+            m_btnPass = (GButton)comp.GetChild("btnPass");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaBg = null;
+            m_itemOne.Dispose();
+            m_itemOne = null;
+            m_item0.Dispose();
+            m_item0 = null;
+            m_item1.Dispose();
+            m_item1 = null;
+            m_item2.Dispose();
+            m_item2 = null;
+            m_item3.Dispose();
+            m_item3 = null;
+            m_item4.Dispose();
+            m_item4 = null;
+            m_item5.Dispose();
+            m_item5 = null;
+            m_item6.Dispose();
+            m_item6 = null;
+            m_item7.Dispose();
+            m_item7 = null;
+            m_item8.Dispose();
+            m_item8 = null;
+            m_item9.Dispose();
+            m_item9 = null;
+            m_grpItems = null;
+            m_btnPass = null;
+            m_t0 = null;
+            m_t1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckBoxBonusShowUI.cs.meta

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

+ 75 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_LuckyBoxBonusShowItem
+    {
+        public GComponent target;
+        public UI_Component2 m_comIcon;
+        public Transition m_t0;
+        public const string URL = "ui://drx9d1use050tf4";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "LuckyBoxBonusShowItem";
+        private static UI_LuckyBoxBonusShowItem _proxy;
+
+        public static UI_LuckyBoxBonusShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_LuckyBoxBonusShowItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_LuckyBoxBonusShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LuckyBoxBonusShowItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comIcon.Dispose();
+            m_comIcon = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusShowItem.cs.meta

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

+ 93 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs

@@ -0,0 +1,93 @@
+using UnityEngine;
+using FairyGUI;
+using UI.LuckyBox;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace GFGGame
+{
+    public class LuckyBoxBonusShowView : BaseWindow
+    {
+        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 GameObject _gameobject;
+        private GoWrapper _wrapper;
+        private int _effectIndex = 0;
+        public override void Dispose()
+        {
+            base.Dispose();
+            for (int i = 0; i < _gameobjects.Count; i++)
+            {
+                SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
+
+            }
+            SceneController.DestroyObjectFromView(_gameobject, _wrapper);
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_LuckBoxBonusShowUI.PACKAGE_NAME;
+            _ui = UI_LuckBoxBonusShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_loaBg.onClick.Add(this.Hide);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zx_bg");
+
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _rewardList.AddRange(this.viewData as List<ItemData>);
+            _ui.m_c1.selectedIndex = _rewardList.Count == 1 ? 0 : 1;
+            _effectIndex = 0;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+
+        }
+
+        private void UpdateItem(GComponent com, int index)
+        {
+            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(com);
+
+            ItemData itemData = _rewardList[index];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_comIcon.m_c1.selectedIndex = itemData.rarity;
+            item.m_comIcon.m_txtName.text = itemCfg.name;
+            item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            if (itemData.rarity > 2)
+            {
+                string resPath = ResPathUtil.GetViewEffectPath("ui_LuckyBox", itemData.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_02" : "CK_all_01");
+                if (_effectIndex >= _gameobjects.Count)
+                {
+                    GameObject gameObject = _gameobjects[_effectIndex];
+                    GoWrapper wrapper = _wrappers[_effectIndex];
+                    SceneController.AddObjectToView(gameObject, wrapper, item.m_comIcon.m_holder, resPath, out gameObject, out wrapper);
+                }
+                else
+                {
+                    SceneController.AddObjectToView(null, null, item.m_comIcon.m_holder, resPath, out GameObject gameObject, out GoWrapper wrapper);
+                    _gameobjects.Add(gameObject);
+                    _wrappers.Add(wrapper);
+                }
+                _effectIndex++;
+            }
+
+            UI_LuckyBoxBonusShowItem.ProxyEnd();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs.meta

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

+ 3 - 11
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -58,8 +58,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
-            _rewardList = this.viewData as List<ItemData>;
+            _rewardList.AddRange(this.viewData as List<ItemData>);
             _ui.m_btnPass.visible = false;
             _newRewardList.Clear();
             _oldRewardList.Clear();
@@ -74,13 +73,7 @@ namespace GFGGame
                     _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();
@@ -190,8 +183,6 @@ namespace GFGGame
         }
         private void OnClickBtnPass()
         {
-
-            ViewManager.Show(ViewName.LUCKY_BOX_BONUS_VIEW, new object[] { (this.viewData as object[])[0], _rewardList });
             this.Hide();
         }
         protected override void OnHide()
@@ -200,6 +191,7 @@ namespace GFGGame
             _ui.m_t_open.Stop(true, false);
             _rewardList.Clear();
             base.OnHide();
+            ViewManager.Show<LuckyBoxBonusShowView>(this.viewData);
         }
     }
 }

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

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

BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


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


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


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 42c9d001c86a8c94aa7474f5c42ed700
+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: 

BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png


+ 96 - 0
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_6.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 48a483de93f7a6b45b4ca5d3443a996a
+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: 

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