huangxiaoyue 1 жил өмнө
parent
commit
2ba97d615a
22 өөрчлөгдсөн 115 нэмэгдсэн , 27 устгасан
  1. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button5.cs
  2. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button5.cs.meta
  3. 9 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs
  4. 9 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs
  5. 6 6
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  6. 9 9
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  7. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0!a.png
  8. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png
  9. BIN
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes
  10. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0!a.png
  11. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0.png
  12. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_1.png
  14. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_2.png
  16. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_4.png
  18. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_7.png
  20. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png
  22. BIN
      GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_Button5.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_Button5
+    {
+        public GButton target;
+        public Controller m_buttonType;
+        public const string URL = "ui://drx9d1usmbf1taf";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "Button5";
+        private static UI_Button5 _proxy;
+
+        public static UI_Button5 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button5();
+            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_Button5 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button5();
+            }
+            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_buttonType = comp.GetController("buttonType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_buttonType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 9 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -13,10 +13,10 @@ namespace UI.LuckyBox
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public GGroup m_grpTitle;
-        public GButton m_btnGiftBag;
+        public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
-        public GButton m_btnShop;
-        public GButton m_btnReward;
+        public UI_Button5 m_btnShop;
+        public UI_Button5 m_btnReward;
         public GButton m_btnPreview;
         public GTextField m_txtOwned;
         public UI_comLuckBoxBtn m_comLuckBoxBtn;
@@ -77,10 +77,10 @@ namespace UI.LuckyBox
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
             m_grpTitle = (GGroup)comp.GetChild("grpTitle");
-            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
+            m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
-            m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
+            m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
             m_btnPreview = (GButton)comp.GetChild("btnPreview");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_comLuckBoxBtn = (UI_comLuckBoxBtn)UI_comLuckBoxBtn.Create(comp.GetChild("comLuckBoxBtn"));
@@ -98,10 +98,13 @@ namespace UI.LuckyBox
             m_txtTime = null;
             m_grpTime = null;
             m_grpTitle = null;
+            m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_btnReward.Dispose();
             m_btnReward = null;
             m_btnPreview = null;
             m_txtOwned = null;

+ 9 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxActivityUI.cs

@@ -15,10 +15,10 @@ namespace UI.LuckyBox
         public UI_Button9 m_btnLuckyDiscount;
         public UI_ComBagTime m_comDiscountTime;
         public GGroup m_comLuckyDiscount;
-        public GButton m_btnGiftBag;
+        public UI_Button5 m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
-        public GButton m_btnShop;
-        public GButton m_btnReward;
+        public UI_Button5 m_btnShop;
+        public UI_Button5 m_btnReward;
         public const string URL = "ui://drx9d1usmbf1tad";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxActivityUI";
@@ -74,10 +74,10 @@ namespace UI.LuckyBox
             m_btnLuckyDiscount = (UI_Button9)UI_Button9.Create(comp.GetChild("btnLuckyDiscount"));
             m_comDiscountTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comDiscountTime"));
             m_comLuckyDiscount = (GGroup)comp.GetChild("comLuckyDiscount");
-            m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
+            m_btnGiftBag = (UI_Button5)UI_Button5.Create(comp.GetChild("btnGiftBag"));
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
-            m_btnShop = (GButton)comp.GetChild("btnShop");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnShop = (UI_Button5)UI_Button5.Create(comp.GetChild("btnShop"));
+            m_btnReward = (UI_Button5)UI_Button5.Create(comp.GetChild("btnReward"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -92,10 +92,13 @@ namespace UI.LuckyBox
             m_comDiscountTime.Dispose();
             m_comDiscountTime = null;
             m_comLuckyDiscount = null;
+            m_btnGiftBag.Dispose();
             m_btnGiftBag = null;
             m_comBagTime.Dispose();
             m_comBagTime = null;
+            m_btnShop.Dispose();
             m_btnShop = null;
+            m_btnReward.Dispose();
             m_btnReward = null;
             if(disposeTarget && target != null)
             {

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -63,9 +63,9 @@ namespace GFGGame
             _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_btnReward.onClick.Add(OnClickBtnReward);
-            _ui.m_btnShop.onClick.Add(OnClickBtnShop);
-            _ui.m_btnGiftBag.onClick.Add(OnClickBtnGiftBag);
+            _ui.m_btnReward.target.onClick.Add(OnClickBtnReward);
+            _ui.m_btnShop.target.onClick.Add(OnClickBtnShop);
+            _ui.m_btnGiftBag.target.onClick.Add(OnClickBtnGiftBag);
             _ui.m_btnLuckyDiscount.target.onClick.Add(OnClickBtnLuckyDiscount);
             _effectUIDic.Add("Button_public", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_btnBuyTen_eff, "ui_LuckyBox", "Button_public"));
             _effectUIDic.Add("Button_Text_DianCang", EffectUIPool.CreateEffectUI(_ui.m_comBox.m_Special_eff, "ui_LuckyBox", "Button_Text_DianCang"));
@@ -364,9 +364,9 @@ namespace GFGGame
 
         private void UpdateRedDot()
         {
-            RedDotController.Instance.SetComRedDot(_ui.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnShop, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnReward.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(_activityType), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnShop.target, RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -18, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnGiftBag.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed(), "", -18, 11);
         }
 
         protected override void UpdateToCheckGuide(object param)

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

@@ -245,13 +245,13 @@ namespace GFGGame
                 comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
             comBox.m_btnPreview.data = boxId;
 
-            if (comBox.m_btnReward.data == null)
+            if (comBox.m_btnReward.target.data == null)
             {
-                comBox.m_btnReward.onClick.Add(OnClikcBtnReward);
-                comBox.m_btnShop.onClick.Add(OnClikcBtnShop);
-                comBox.m_btnGiftBag.onClick.Add(OnClikcBtnGiftBag);
+                comBox.m_btnReward.target.onClick.Add(OnClikcBtnReward);
+                comBox.m_btnShop.target.onClick.Add(OnClikcBtnShop);
+                comBox.m_btnGiftBag.target.onClick.Add(OnClikcBtnGiftBag);
             }
-            comBox.m_btnReward.data = boxId;
+            comBox.m_btnReward.target.data = boxId;
 
             obj.data = boxId;
             comBox.m_grpTime.visible = (boxId == _activeBoxId);
@@ -337,7 +337,7 @@ namespace GFGGame
             if (_curIndex == 1) { 
                 GObject obj = _ui.m_listBg.GetChildAt(_curIndex);
                 UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
-                RedDotController.Instance.SetComRedDot(comBox.m_btnReward, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy), "", -21, 18);
+                RedDotController.Instance.SetComRedDot(comBox.m_btnReward.target, RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitTsy), "", -21, 18);
 
                 comBox.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastTsyDrawCount.ToString()).FlushVars();
                 UI_ComBox1.ProxyEnd();
@@ -368,7 +368,7 @@ namespace GFGGame
             if (list.Count == 0)
             {
                 comBox.m_comBagTime.target.visible = false;
-                comBox.m_btnGiftBag.visible = false;
+                comBox.m_btnGiftBag.target.visible = false;
             }
             else
             {
@@ -393,13 +393,13 @@ namespace GFGGame
                 if (isSoldOut)
                 {
                     comBox.m_comBagTime.target.visible = false;
-                    comBox.m_btnGiftBag.visible = false;
+                    comBox.m_btnGiftBag.target.visible = false;
                 }
                 else
                 {
                     comBox.m_comBagTime.m_txtGiftBagTime.text = TimeUtil.GetTimeLeft(TimeInfo.Instance.ServerNow(), list[0].EndTime);
                     comBox.m_comBagTime.target.visible = true;
-                    comBox.m_btnGiftBag.visible = true;
+                    comBox.m_btnGiftBag.target.visible = true;
                 }
             }
             UpdateBtnReward();

BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png


BIN
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes


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_4!a.png


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


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


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


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


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


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