zhaoyang 3 년 전
부모
커밋
ed05368a11

+ 8 - 0
FGUIProject/assets/ClothingShop/components/ComSelect.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="250,325" opaque="false">
+  <displayList>
+    <image id="n35_lj7e" name="n35" src="lj7e63" fileName="images/hd.png" xy="-29,-42" group="n37_jpnf"/>
+    <movieclip id="n34_lj7e" name="n34" src="lj7e62" fileName="effect/MovieClip2.jta" xy="-73,-39" size="396,400" group="n37_jpnf" blend="screen"/>
+    <group id="n37_jpnf" name="n37" xy="-73,-42" size="396,413"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/ClothingShop/effect/MovieClip2.jta


BIN
FGUIProject/assets/ClothingShop/images/hd.png


BIN
FGUIProject/assets/CommonGame/effect/MovieClip1.jta


+ 1 - 1
FGUIProject/assets/LuckyBox/LuckyBoxUI.xml

@@ -10,7 +10,7 @@
     <component id="n3_fka7" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90" group="n32_vek8">
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n8_fka7" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="862,177" group="n32_vek8">
+    <component id="n8_fka7" name="btnPreview" src="ga16d" fileName="components/Button3.xml" xy="862,177" group="n32_vek8" controller="c1,0">
       <Button icon="ui://drx9d1usvek8v"/>
     </component>
     <component id="n22_vek8" name="btnExchange" src="ga16d" fileName="components/Button3.xml" xy="966,177" group="n32_vek8">

+ 8 - 1
FGUIProject/assets/LuckyBox/components/Button3.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="94,95" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" exported="true" pages="0,,1,,2," selected="0"/>
   <displayList>
     <loader id="n1_vek8" name="icon" xy="0,0" size="94,95" url="ui://drx9d1usvek8v" autoSize="true"/>
+    <movieclip id="n2_jpnf" name="n2" src="jpnf1x" fileName="effect/MovieClip1.jta" xy="-53,-11">
+      <gearDisplay controller="c1" pages="1"/>
+    </movieclip>
+    <movieclip id="n3_jpnf" name="n3" src="jpnf26" fileName="effect/MovieClip2.jta" xy="-53,-10">
+      <gearDisplay controller="c1" pages="0"/>
+    </movieclip>
   </displayList>
   <Button/>
 </component>

BIN
FGUIProject/assets/LuckyBox/effect/MovieClip1.jta


BIN
FGUIProject/assets/LuckyBox/effect/MovieClip2.jta


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

@@ -47,9 +47,8 @@
     <image id="o1391i" name="cj_tp_2.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="qi041j" name="cj_zizi_2.png" path="/images/"/>
     <component id="xg6g1k" name="ComHolder.xml" path="/components/" exported="true"/>
-    <image id="lj7e1l" name="ui_ck_zwt_yl.png" path="/effect/"/>
-    <image id="lj7e1m" name="ui_ck_tst_yl.png" path="/effect/"/>
-    <movieclip id="lj7e1o" name="MovieClip1.jta" path="/effect/"/>
+    <movieclip id="jpnf1x" name="MovieClip1.jta" path="/effect/"/>
+    <movieclip id="jpnf26" name="MovieClip2.jta" path="/effect/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

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

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

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

@@ -12,8 +12,8 @@ namespace UI.LuckyBox
         public GButton m_btnBack;
         public GButton m_btnHome;
         public GComponent m_valueBar;
-        public GButton m_btnPreview;
-        public GButton m_btnExchange;
+        public UI_Button3 m_btnPreview;
+        public UI_Button3 m_btnExchange;
         public GTextField m_txtOwned;
         public GGroup m_grpTop;
         public UI_ComCost m_comCostOne;
@@ -77,8 +77,8 @@ namespace UI.LuckyBox
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnHome = (GButton)comp.GetChild("btnHome");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_btnPreview = (GButton)comp.GetChild("btnPreview");
-            m_btnExchange = (GButton)comp.GetChild("btnExchange");
+            m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
+            m_btnExchange = (UI_Button3)UI_Button3.Create(comp.GetChild("btnExchange"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_grpTop = (GGroup)comp.GetChild("grpTop");
             m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
@@ -98,7 +98,9 @@ namespace UI.LuckyBox
             m_btnBack = null;
             m_btnHome = null;
             m_valueBar = null;
+            m_btnPreview.Dispose();
             m_btnPreview = null;
+            m_btnExchange.Dispose();
             m_btnExchange = null;
             m_txtOwned = null;
             m_grpTop = null;

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

@@ -46,8 +46,8 @@ namespace GFGGame
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
             _ui.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
             _ui.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
-            _ui.m_btnPreview.onClick.Add(OnClickBtnPreview);
-            _ui.m_btnExchange.onClick.Add(OnClickBtnExChange);
+            _ui.m_btnPreview.target.onClick.Add(OnClickBtnPreview);
+            _ui.m_btnExchange.target.onClick.Add(OnClickBtnExChange);
             _ui.m_btnLeft.onClick.Add(() => { onClickChange(-1); });
             _ui.m_btnRight.onClick.Add(() => { onClickChange(1); });
 
@@ -127,6 +127,7 @@ namespace GFGGame
             item.m_holder1.visible = isActiveBoxOpen && LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_1;
             item.m_loaImg.visible = LuckyBoxDataManager.Instance.currentBoxId == LuckyBoxDataManager.BOX_ID_3;
 
+
             onClickChange(0);
             UpdateNormal();
         }
@@ -141,6 +142,8 @@ namespace GFGGame
             _ui.m_comCostOne.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
             _ui.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(luckyBoxCfg.costID).res);
 
+            _ui.m_btnPreview.m_c1.selectedIndex = _ui.m_c1.selectedIndex;
+            _ui.m_btnExchange.m_c1.selectedIndex = _ui.m_c1.selectedIndex;
 
             int count = LuckyBoxDataManager.Instance.GetOwnedCount();
             _ui.m_txtOwned.SetVar("v1", "" + count).FlushVars();

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.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_fui.bytes