zhaoyang 2 سال پیش
والد
کامیت
1f39ca0ef6

+ 4 - 4
FGUIProject/assets/LuckyBox/components/Button3.xml

@@ -2,10 +2,10 @@
 <component size="90,90" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n6_idkd" name="n6" src="idkdtb1" fileName="imagesNews/zx_yulan_tubiao_bg.png" xy="0,0"/>
-    <image id="n5_idkd" name="n5" src="idkdtb0" fileName="imagesNews/zx_yulan_tubiao.png" xy="22,15"/>
-    <image id="n7_idkd" name="n7" src="idkdtb2" fileName="imagesNews/zx_yulan_xinggui.png" xy="-15,-6"/>
-    <image id="n4_idkd" name="n4" src="idkdtaz" fileName="imagesNews/zx_yulan_diaoshi.png" xy="-9,-92"/>
+    <image id="n6_idkd" name="n6" src="volstbh" fileName="imageNews/zx_yulan_tubiao_bg.png" xy="0,0"/>
+    <image id="n5_idkd" name="n5" src="volstbg" fileName="imageNews/zx_yulan_tubiao.png" xy="22,15"/>
+    <image id="n7_idkd" name="n7" src="volstbi" fileName="imageNews/zx_yulan_xinggui.png" xy="-15,-6"/>
+    <image id="n4_idkd" name="n4" src="volstbf" fileName="imageNews/zx_yulan_diaoshi.png" xy="-9,-92"/>
   </displayList>
   <Button/>
 </component>

+ 2 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -8,7 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public UI_ComModel m_comModel;
-        public UI_Button3 m_btnPreview;
+        public GButton m_btnPreview;
         public GTextField m_txtOwned;
         public GImage m_imgActLuckyBox;
         public GTextField m_txtTime;
@@ -67,7 +67,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
+            m_btnPreview = (GButton)comp.GetChild("btnPreview");
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_imgActLuckyBox = (GImage)comp.GetChild("imgActLuckyBox");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
@@ -83,7 +83,6 @@ namespace UI.LuckyBox
         {
             m_comModel.Dispose();
             m_comModel = null;
-            m_btnPreview.Dispose();
             m_btnPreview = null;
             m_txtOwned = null;
             m_imgActLuckyBox = null;

+ 0 - 112
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox_1.cs

@@ -1,112 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.LuckyBox
-{
-    public partial class UI_ComBox_1
-    {
-        public GComponent target;
-        public UI_ComModel m_comModel;
-        public GButton m_btnPreview;
-        public GButton m_btnExchange;
-        public GTextField m_txtOwned;
-        public GGraph m_holder;
-        public GGraph m_holder1;
-        public GTextField m_txtTime;
-        public UI_ComCost m_comCostOne;
-        public UI_ComCost m_comCostTen;
-        public UI_Button1 m_btnBuyOne;
-        public UI_Button2 m_btnBuyTen;
-        public GImage m_imgSpecial;
-        public GTextField m_txtRemainTimes;
-        public const string URL = "ui://drx9d1usidkdtan";
-        public const string PACKAGE_NAME = "LuckyBox";
-        public const string RES_NAME = "ComBox_1";
-        private static UI_ComBox_1 _proxy;
-
-        public static UI_ComBox_1 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComBox_1();
-            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_ComBox_1 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComBox_1();
-            }
-            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_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_btnPreview = (GButton)comp.GetChild("btnPreview");
-            m_btnExchange = (GButton)comp.GetChild("btnExchange");
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
-            m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
-            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_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comModel.Dispose();
-            m_comModel = null;
-            m_btnPreview = null;
-            m_btnExchange = null;
-            m_txtOwned = null;
-            m_holder = null;
-            m_holder1 = null;
-            m_txtTime = null;
-            m_comCostOne.Dispose();
-            m_comCostOne = null;
-            m_comCostTen.Dispose();
-            m_comCostTen = null;
-            m_btnBuyOne.Dispose();
-            m_btnBuyOne = null;
-            m_btnBuyTen.Dispose();
-            m_btnBuyTen = null;
-            m_imgSpecial = null;
-            m_txtRemainTimes = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

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

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

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

@@ -106,7 +106,6 @@ namespace GFGGame
 
             LuckyBoxDataManager.Instance.InitData(_luckyBoxCfg.id);
             comBox.m_comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[0]);
-            comBox.m_btnPreview.m_c1.selectedIndex = 1;
             LuckyBoxDataManager.Instance.GetOwnedCount(_luckyBoxCfg.id, out int count, out int totalCount);
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
@@ -131,11 +130,11 @@ namespace GFGGame
             comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
             comBox.m_imgActLuckyBox.visible = true;
             comBox.m_grpLuckyBox.visible = false;
-            if (comBox.m_btnPreview.target.data == null)
+            if (comBox.m_btnPreview.data == null)
             {
-                comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
+                comBox.m_btnPreview.onClick.Add(OnClickBtnPreview);
             }
-            comBox.m_btnPreview.target.data = _luckyBoxCfg.id;
+            comBox.m_btnPreview.data = _luckyBoxCfg.id;
 
             comBox.target.data = _luckyBoxCfg.id;
 

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_fui.bytes