浏览代码

抽卡添加特效

zhaoyang 3 年之前
父节点
当前提交
7e3eec21b1
共有 28 个文件被更改,包括 249 次插入22 次删除
  1. 2 1
      FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml
  2. 1 0
      FGUIProject/assets/LuckyBox/components/Button1.xml
  3. 1 0
      FGUIProject/assets/LuckyBox/components/Button2.xml
  4. 14 5
      FGUIProject/assets/LuckyBox/components/ComListBgItem.xml
  5. 1 0
      FGUIProject/assets/LuckyBox/components/ComStar.xml
  6. 二进制
      FGUIProject/assets/LuckyBox/images/cj_zizi_2.png
  7. 二进制
      FGUIProject/assets/LuckyBox/imagesExport/cj_bj_4.jpg
  8. 二进制
      FGUIProject/assets/LuckyBox/imagesExport/cj_tp_1.jpg
  9. 二进制
      FGUIProject/assets/LuckyBox/imagesExport/cj_tp_2.jpg
  10. 二进制
      FGUIProject/assets/LuckyBox/imagesExport/cj_tp_3.jpg
  11. 二进制
      FGUIProject/assets/LuckyBox/imagesExport/jiyuet_bg.jpg
  12. 2 0
      FGUIProject/assets/LuckyBox/package.xml
  13. 1 0
      FGUIProject/assets/Main/package.xml
  14. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button1.cs
  15. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button1.cs.meta
  16. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button2.cs
  17. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button2.cs.meta
  18. 12 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComListBgItem.cs
  19. 4 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs
  20. 6 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxUI.cs
  21. 41 9
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  22. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  23. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  24. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_eshh1f.png
  25. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391g.png
  26. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391h.png
  27. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391i.png
  28. 二进制
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 2 - 1
FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -45,7 +45,8 @@
     <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="789,1158" group="n25_iakb"/>
     <component id="n39_o139" name="comStar1_1_5" src="l5nzq" fileName="components/ComStar.xml" xy="789,1158" group="n25_iakb"/>
     <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="228,1363" group="n25_iakb"/>
     <component id="n40_o139" name="comStar1_1_6" src="l5nzq" fileName="components/ComStar.xml" xy="228,1363" group="n25_iakb"/>
     <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="487,1692" group="n25_iakb"/>
     <component id="n41_o139" name="comStar1_1_7" src="l5nzq" fileName="components/ComStar.xml" xy="487,1692" group="n25_iakb"/>
-    <group id="n25_iakb" name="grpComStar1" xy="158,186" size="670,1545" advanced="true">
+    <component id="n49_qi04" name="comStar1_1_8" src="l5nzq" fileName="components/ComStar.xml" xy="902,102" group="n25_iakb"/>
+    <group id="n25_iakb" name="grpComStar1" xy="158,63" size="783,1668" advanced="true">
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay controller="ctrlBuyType" pages="1"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="1" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
       <relation target="" sidePair="left-center,top-middle"/>

+ 1 - 0
FGUIProject/assets/LuckyBox/components/Button1.xml

@@ -5,6 +5,7 @@
     <image id="n0_ga16" name="n0" src="fka70" fileName="images/cj_anniu_1.png" xy="0,0">
     <image id="n0_ga16" name="n0" src="fka70" fileName="images/cj_anniu_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
+    <graph id="n1_qi04" name="holder" xy="201,47" size="10,10"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
 </component>
 </component>

+ 1 - 0
FGUIProject/assets/LuckyBox/components/Button2.xml

@@ -5,6 +5,7 @@
     <image id="n0_ga16" name="n0" src="fka71" fileName="images/cj_anniu_2.png" xy="0,0">
     <image id="n0_ga16" name="n0" src="fka71" fileName="images/cj_anniu_2.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
+    <graph id="n1_qi04" name="holder" xy="201,47" size="10,10"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
 </component>
 </component>

+ 14 - 5
FGUIProject/assets/LuckyBox/components/ComListBgItem.xml

@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
+<component size="1080,1920" overflow="hidden" designImageLayer="1">
   <displayList>
   <displayList>
     <loader id="n25_vek8" name="loaBg" xy="0,-240" size="1080,2400" url="ui://drx9d1useshh1f" autoSize="true">
     <loader id="n25_vek8" name="loaBg" xy="0,-240" size="1080,2400" url="ui://drx9d1useshh1f" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
-    <loader id="n26_vek8" name="loaImg" xy="0,1378" size="1080,542" url="ui://drx9d1usvek8s" autoSize="true">
-      <relation target="" sidePair="bottom-bottom"/>
-    </loader>
-    <text id="n28_vek8" name="txtTime" xy="324,409" size="90,902" fontSize="40" color="#fffbdd" align="center" vAlign="middle" autoSize="none" text="剩余813天">
+    <graph id="n31_qi04" name="holder1" xy="653,759" size="100,100" lineSize="0">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <image id="n30_qi04" name="imgTitle" src="qi041k" fileName="images/cj_zizi_2.png" xy="83,365">
+      <relation target="" sidePair="top-middle"/>
+    </image>
+    <graph id="n29_qi04" name="holder" xy="164,689" size="100,100" lineSize="0">
+      <relation target="" sidePair="top-middle"/>
+    </graph>
+    <text id="n28_vek8" name="txtTime" xy="324,409" size="90,902" fontSize="40" color="#fffbdd" align="center" vAlign="middle" autoSize="none" text="shengyu ">
       <relation target="" sidePair="height-height,top-top"/>
       <relation target="" sidePair="height-height,top-top"/>
     </text>
     </text>
+    <loader id="n26_vek8" name="loaImg" xy="0,1378" size="1080,542" visible="false" url="ui://drx9d1usvek8s" autoSize="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </loader>
   </displayList>
   </displayList>
   <customProperty target="loaBg" propertyId="1"/>
   <customProperty target="loaBg" propertyId="1"/>
 </component>
 </component>

+ 1 - 0
FGUIProject/assets/LuckyBox/components/ComStar.xml

@@ -3,6 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
   <displayList>
     <image id="n4_l5nz" name="imgLine" src="l5nzp" fileName="images/cj_xk_xian.png" xy="38,33" pivot="0,0.5" size="2,12"/>
     <image id="n4_l5nz" name="imgLine" src="l5nzp" fileName="images/cj_xk_xian.png" xy="38,33" pivot="0,0.5" size="2,12"/>
+    <image id="n7_qi04" name="n7" src="l5nzn" fileName="images/cj_xk_xx.png" xy="0,0"/>
     <graph id="n5_tt1q" name="holder" xy="38,38" size="1,1">
     <graph id="n5_tt1q" name="holder" xy="38,38" size="1,1">
       <gearDisplay controller="c1" pages="0"/>
       <gearDisplay controller="c1" pages="0"/>
     </graph>
     </graph>

二进制
FGUIProject/assets/LuckyBox/images/cj_zizi_2.png


二进制
FGUIProject/assets/LuckyBox/imagesExport/cj_bj_4.jpg


二进制
FGUIProject/assets/LuckyBox/imagesExport/cj_tp_1.jpg


二进制
FGUIProject/assets/LuckyBox/imagesExport/cj_tp_2.jpg


二进制
FGUIProject/assets/LuckyBox/imagesExport/cj_tp_3.jpg


二进制
FGUIProject/assets/LuckyBox/imagesExport/jiyuet_bg.jpg


+ 2 - 0
FGUIProject/assets/LuckyBox/package.xml

@@ -47,6 +47,8 @@
     <image id="o1391g" name="cj_tp_3.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391g" name="cj_tp_3.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391h" name="cj_tp_1.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391h" name="cj_tp_1.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391i" name="cj_tp_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="o1391i" name="cj_tp_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
+    <image id="qi041j" name="jiyuet_bg.jpg" path="/imagesExport/"/>
+    <image id="qi041k" name="cj_zizi_2.png" path="/images/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 1 - 0
FGUIProject/assets/Main/package.xml

@@ -369,6 +369,7 @@
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
+    <image id="qi04de" name="beijing2_bg.jpg" path="/imagesStory/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button1.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_Button1
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public const string URL = "ui://drx9d1usga16b";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "Button1";
+        private static UI_Button1 _proxy;
+
+        public static UI_Button1 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_Button2
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public const string URL = "ui://drx9d1usga16c";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 12 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComListBgItem.cs

@@ -8,8 +8,11 @@ namespace UI.LuckyBox
     {
     {
         public GComponent target;
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaBg;
-        public GLoader m_loaImg;
+        public GGraph m_holder1;
+        public GImage m_imgTitle;
+        public GGraph m_holder;
         public GTextField m_txtTime;
         public GTextField m_txtTime;
+        public GLoader m_loaImg;
         public const string URL = "ui://drx9d1usvek811";
         public const string URL = "ui://drx9d1usvek811";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComListBgItem";
         public const string RES_NAME = "ComListBgItem";
@@ -58,14 +61,20 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         private void Init(GComponent comp)
         {
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_loaImg = (GLoader)comp.GetChild("loaImg");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_imgTitle = (GImage)comp.GetChild("imgTitle");
+            m_holder = (GGraph)comp.GetChild("holder");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_loaImg = (GLoader)comp.GetChild("loaImg");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
             m_loaBg = null;
             m_loaBg = null;
-            m_loaImg = null;
+            m_holder1 = null;
+            m_imgTitle = null;
+            m_holder = null;
             m_txtTime = null;
             m_txtTime = null;
+            m_loaImg = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 4 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -32,6 +32,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_1_5;
         public UI_ComStar m_comStar1_1_5;
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_6;
         public UI_ComStar m_comStar1_1_7;
         public UI_ComStar m_comStar1_1_7;
+        public UI_ComStar m_comStar1_1_8;
         public GGroup m_grpComStar1;
         public GGroup m_grpComStar1;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_0;
         public UI_ComStar m_comStar1_2_1;
         public UI_ComStar m_comStar1_2_1;
@@ -115,6 +116,7 @@ namespace UI.LuckyBox
             m_comStar1_1_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_5"));
             m_comStar1_1_5 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_5"));
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_6 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_6"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
             m_comStar1_1_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_7"));
+            m_comStar1_1_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_1_8"));
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_grpComStar1 = (GGroup)comp.GetChild("grpComStar1");
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_0 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_0"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
             m_comStar1_2_1 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_1"));
@@ -174,6 +176,8 @@ namespace UI.LuckyBox
             m_comStar1_1_6 = null;
             m_comStar1_1_6 = null;
             m_comStar1_1_7.Dispose();
             m_comStar1_1_7.Dispose();
             m_comStar1_1_7 = null;
             m_comStar1_1_7 = null;
+            m_comStar1_1_8.Dispose();
+            m_comStar1_1_8 = null;
             m_grpComStar1 = null;
             m_grpComStar1 = null;
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0.Dispose();
             m_comStar1_2_0 = null;
             m_comStar1_2_0 = null;

+ 6 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxUI.cs

@@ -18,8 +18,8 @@ namespace UI.LuckyBox
         public GGroup m_grpTop;
         public GGroup m_grpTop;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostOne;
         public UI_ComCost m_comCostTen;
         public UI_ComCost m_comCostTen;
-        public GButton m_btnBuyOne;
-        public GButton m_btnBuyTen;
+        public UI_Button1 m_btnBuyOne;
+        public UI_Button2 m_btnBuyTen;
         public GImage m_imgSpecial;
         public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
         public GTextField m_txtRemainTimes;
         public GGroup m_grpBottom;
         public GGroup m_grpBottom;
@@ -83,8 +83,8 @@ namespace UI.LuckyBox
             m_grpTop = (GGroup)comp.GetChild("grpTop");
             m_grpTop = (GGroup)comp.GetChild("grpTop");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
             m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
-            m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
-            m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
+            m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
+            m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
             m_grpBottom = (GGroup)comp.GetChild("grpBottom");
             m_grpBottom = (GGroup)comp.GetChild("grpBottom");
@@ -106,7 +106,9 @@ namespace UI.LuckyBox
             m_comCostOne = null;
             m_comCostOne = null;
             m_comCostTen.Dispose();
             m_comCostTen.Dispose();
             m_comCostTen = null;
             m_comCostTen = null;
+            m_btnBuyOne.Dispose();
             m_btnBuyOne = null;
             m_btnBuyOne = null;
+            m_btnBuyTen.Dispose();
             m_btnBuyTen = null;
             m_btnBuyTen = null;
             m_imgSpecial = null;
             m_imgSpecial = null;
             m_txtRemainTimes = null;
             m_txtRemainTimes = null;

+ 41 - 9
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -2,6 +2,8 @@ using FairyGUI;
 using UI.LuckyBox;
 using UI.LuckyBox;
 using UI.CommonGame;
 using UI.CommonGame;
 using System;
 using System;
+using System.Collections.Generic;
+using UnityEngine;
 
 
 namespace GFGGame
 namespace GFGGame
 {
 {
@@ -10,7 +12,16 @@ namespace GFGGame
         private UI_LuckyBoxUI _ui;
         private UI_LuckyBoxUI _ui;
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
 
 
+        private GameObject _gameObject;
+        private GoWrapper _wrapper;
+        private GameObject _gameObject1;
+        private GoWrapper _wrapper1;
+        private GameObject _gameObject2;
+        private GoWrapper _wrapper2;
+        private GameObject _gameObject3;
+        private GoWrapper _wrapper3;
 
 
+        private bool isActiveBoxOpen = false;
         private int _selectedIndex = 0;
         private int _selectedIndex = 0;
 
 
         public override void Dispose()
         public override void Dispose()
@@ -32,8 +43,8 @@ namespace GFGGame
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
-            _ui.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
-            _ui.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
+            _ui.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
+            _ui.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
             _ui.m_btnPreview.onClick.Add(OnClickBtnPreview);
             _ui.m_btnPreview.onClick.Add(OnClickBtnPreview);
             _ui.m_btnExchange.onClick.Add(OnClickBtnExChange);
             _ui.m_btnExchange.onClick.Add(OnClickBtnExChange);
             _ui.m_btnLeft.onClick.Add(() => { onClickChange(-1); });
             _ui.m_btnLeft.onClick.Add(() => { onClickChange(-1); });
@@ -65,8 +76,9 @@ namespace GFGGame
                     boxId = (int)this.viewData;
                     boxId = (int)this.viewData;
                 }
                 }
             }
             }
-            // int boxId = this.viewData != null ? (int)this.viewData : LuckyBoxDataManager.Instance.luckyBoxIds[0];
+
             LuckyBoxBonusDataCache.currentBoxId = boxId;
             LuckyBoxBonusDataCache.currentBoxId = boxId;
+            isActiveBoxOpen = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1) >= 0;
 
 
             _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Length;
             _ui.m_listBg.numItems = LuckyBoxDataManager.Instance.luckyBoxIds.Length;
             _ui.m_listBg.ScrollToView(Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxBonusDataCache.currentBoxId));
             _ui.m_listBg.ScrollToView(Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxBonusDataCache.currentBoxId));
@@ -78,8 +90,9 @@ namespace GFGGame
             _valueBarController.Controller(4);
             _valueBarController.Controller(4);
 
 
             onClickChange(0);
             onClickChange(0);
-
+            updateActiveBox();
         }
         }
+
         private void RenderListBgItem(int index, GObject obj)
         private void RenderListBgItem(int index, GObject obj)
         {
         {
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(obj);
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(obj);
@@ -88,8 +101,8 @@ namespace GFGGame
         }
         }
         private void CheckTime(object param = null)
         private void CheckTime(object param = null)
         {
         {
-            int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
-            if (index < 0)
+            // int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
+            if (!isActiveBoxOpen)
             {
             {
                 //活动未开启
                 //活动未开启
                 LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
                 LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[0];
@@ -107,7 +120,10 @@ namespace GFGGame
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(_ui.m_c1.selectedIndex));
             UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(_ui.m_c1.selectedIndex));
             LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_ui.m_c1.selectedIndex];
             LuckyBoxBonusDataCache.currentBoxId = LuckyBoxDataManager.Instance.luckyBoxIds[_ui.m_c1.selectedIndex];
             item.m_txtTime.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             item.m_txtTime.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
+            item.m_imgTitle.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             item.m_loaImg.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_3;
             item.m_loaImg.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_3;
+            item.m_holder.visible = isActiveBoxOpen && LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
+            item.m_holder1.visible = isActiveBoxOpen && LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
 
 
             onClickChange(0);
             onClickChange(0);
             UpdateNormal();
             UpdateNormal();
@@ -137,13 +153,29 @@ namespace GFGGame
             _ui.m_imgSpecial.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             _ui.m_imgSpecial.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             _ui.m_btnRight.visible = _ui.m_c1.selectedIndex != _ui.m_listBg.numItems - 1;
             _ui.m_btnRight.visible = _ui.m_c1.selectedIndex != _ui.m_listBg.numItems - 1;
             _ui.m_btnLeft.visible = _ui.m_c1.selectedIndex != 0;
             _ui.m_btnLeft.visible = _ui.m_c1.selectedIndex != 0;
+            _ui.m_btnBuyOne.m_holder.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
+            _ui.m_btnBuyTen.m_holder.visible = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
         }
         }
 
 
+        private void updateActiveBox()
+        {
+            if (isActiveBoxOpen)
+            {
+                int index = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.BOX_ID_1);
+                UI_ComListBgItem item = UI_ComListBgItem.Proxy(_ui.m_listBg.GetChildAt(index));
+                string resPath = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_bt");
+                SceneController.AddObjectToView(_gameObject, _wrapper, item.m_holder, resPath, out _gameObject, out _wrapper);
+                string resPath3 = ResPathUtil.GetDressUpAnimationPath("dz_jiyuet");
+                SceneController.AddObjectToView(_gameObject3, _wrapper3, item.m_holder1, resPath3, out _gameObject3, out _wrapper3, 120);
 
 
+                string resPath1 = ResPathUtil.GetViewEffectPath("ui_cj", "ui_cj_sl");
+                SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_btnBuyOne.m_holder, resPath1, out _gameObject1, out _wrapper1);
+                SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_btnBuyTen.m_holder, resPath1, out _gameObject2, out _wrapper2);
+
+            }
+        }
         private void OnClickBtnExChange()
         private void OnClickBtnExChange()
         {
         {
-            // int storeId = ConstStoreId.CLOTHING_STORE_ID;
-
             int storeId = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
             int storeId = LuckyBoxBonusDataCache.currentBoxId == LuckyBoxDataManager.BOX_ID_1 ? ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID : ConstStoreId.LUCKY_BOX_STORE_ID;
             ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, LuckyBoxBonusDataCache.currentBoxId });
             ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { storeId }, new object[] { ViewName.LUCKY_BOX_VIEW, LuckyBoxBonusDataCache.currentBoxId });
             this.Hide();
             this.Hide();
@@ -193,7 +225,7 @@ namespace GFGGame
             {
             {
                 if (GRoot.inst.GetTopWindow() == this.viewCom)
                 if (GRoot.inst.GetTopWindow() == this.viewCom)
                 {
                 {
-                    if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
+                    if (GuideController.TryGuideByGuideId(_ui.m_btnBuyTen.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, true, "点击摘取十次"))
                     {
                     {
                         Timers.inst.Remove(UpdateToCheckGuide);
                         Timers.inst.Remove(UpdateToCheckGuide);
                     }
                     }

二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_eshh1f.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391g.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391h.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_o1391i.png


二进制
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes