zhaoyang 2 жил өмнө
parent
commit
c9661b2283

+ 1 - 0
FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -8,6 +8,7 @@
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
     </text>
+    <graph id="n3_e050" name="holder" xy="158,51" size="10,10" type="rect"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>

+ 3 - 3
FGUIProject/assets/LuckyBox/LuckBoxBonusShowUI.xml

@@ -5,13 +5,13 @@
     <loader id="n17_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
     <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"/>
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     </loader>
-    <graph id="n25_e050" name="holder_star" xy="535,210" size="10,10" type="rect">
+    <graph id="n25_e050" name="holder_star" xy="535,210" size="10,10">
       <relation target="" sidePair="center-center,top-top"/>
       <relation target="" sidePair="center-center,top-top"/>
     </graph>
     </graph>
-    <graph id="n26_e050" name="holder_bg" xy="535,955" size="10,10" type="rect">
+    <graph id="n26_e050" name="holder_bg" xy="535,955" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     </graph>
-    <graph id="n27_e050" name="holder_cloud" xy="535,1810" size="10,10" type="rect">
+    <graph id="n27_e050" name="holder_cloud" xy="535,1810" size="10,10">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </graph>
     </graph>
     <component id="n14_ga16" name="itemOne" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,960">
     <component id="n14_ga16" name="itemOne" src="e050tf4" fileName="components/LuckyBoxBonusShowItem.xml" xy="540,960">

+ 3 - 3
FGUIProject/assets/LuckyBox/LuckyBoxNewDressUI.xml

@@ -4,13 +4,13 @@
     <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
     <loader id="n4_duuf" name="loaBg" xy="0,-240" size="1080,2400" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
     </loader>
     </loader>
-    <graph id="n10_e050" name="holder_star" xy="535,210" size="10,10" type="rect">
+    <graph id="n10_e050" name="holder_star" xy="535,210" size="10,10">
       <relation target="" sidePair="center-center,top-top"/>
       <relation target="" sidePair="center-center,top-top"/>
     </graph>
     </graph>
-    <graph id="n11_e050" name="holder_bg" xy="535,955" size="10,10" type="rect">
+    <graph id="n11_e050" name="holder_bg" xy="535,955" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     </graph>
-    <graph id="n12_e050" name="holder_cloud" xy="535,1810" size="10,10" type="rect">
+    <graph id="n12_e050" name="holder_cloud" xy="535,1810" size="10,10">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </graph>
     </graph>
     <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>
     <image id="n5_duuf" name="n5" src="volstat" fileName="imageNews/zx_tx_qianjing.png" xy="9,411" group="n9_duuf"/>

+ 6 - 6
FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
 <component size="1080,1920" designImage="ui://drx9d1usw1qi2n" designImageOffsetY="-240">
-  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="1">
+  <controller name="ctrlBuyType" alias="购买类型" pages="0,,1," selected="0">
     <remark page="0" value="买一次"/>
     <remark page="0" value="买一次"/>
     <remark page="1" value="买十次"/>
     <remark page="1" value="买十次"/>
   </controller>
   </controller>
-  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="2"/>
+  <controller name="ctrlRewardsType" alias="奖池类型" pages="0,,1,,2," selected="0"/>
   <displayList>
   <displayList>
-    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391g" fill="scaleMatchWidth">
+    <loader id="n0_l5nz" name="bg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://drx9d1uso1391h" fill="scaleMatchWidth">
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <gearIcon controller="ctrlRewardsType" pages="0,1,2" values="ui://drx9d1uso1391h|ui://drx9d1uso1391i|ui://drx9d1uso1391g"/>
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     </loader>
-    <graph id="n54_e050" name="holder_star" xy="535,210" size="10,10" type="rect">
+    <graph id="n54_e050" name="holder_star" xy="535,210" size="10,10">
       <relation target="" sidePair="center-center,top-top"/>
       <relation target="" sidePair="center-center,top-top"/>
     </graph>
     </graph>
-    <graph id="n55_e050" name="holder_bg" xy="535,955" size="10,10" type="rect">
+    <graph id="n55_e050" name="holder_bg" xy="535,955" size="10,10">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     </graph>
-    <graph id="n56_e050" name="holder_cloud" xy="535,1810" size="10,10" type="rect">
+    <graph id="n56_e050" name="holder_cloud" xy="535,1810" size="10,10">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </graph>
     </graph>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n9_l5nz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>

+ 5 - 3
FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -38,12 +38,14 @@
     <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
     <component id="n58_vols" name="btnBuyTen" src="volstng" fileName="components/BtnStyle006.xml" pkg="eg2y0ldp" xy="618,1675" group="n61_vols">
       <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
       <Button title="摘星十次" icon="ui://eg2y0ldpvolstnk"/>
     </component>
     </component>
-    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n61_vols">
-      <relation target="n58_vols" sidePair="left-left,top-top"/>
-    </image>
     <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数:{v1=0}">
     <text id="n60_vols" name="txtRemainTimes" xy="539,1538" pivot="0.5,0" anchor="true" size="303,54" group="n61_vols" fontSize="40" color="#915e15" align="center" vars="true" text="今日剩余次数:{v1=0}">
       <relation target="" sidePair="center-center"/>
       <relation target="" sidePair="center-center"/>
     </text>
     </text>
+    <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n84_e050"/>
+    <graph id="n83_e050" name="holder" xy="919,1675" size="10,10" group="n84_e050" type="rect"/>
+    <group id="n84_e050" name="grpSpecial" xy="865,1623" size="112,123" group="n61_vols" advanced="true">
+      <relation target="n58_vols" sidePair="right-right,top-top"/>
+    </group>
     <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
     <group id="n61_vols" name="n61" xy="140,1538" size="837,287" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
     </group>

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnStyle006.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_BtnStyle006
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public const string URL = "ui://eg2y0ldpvolstng";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "BtnStyle006";
+        private static UI_BtnStyle006 _proxy;
+
+        public static UI_BtnStyle006 Create(GObject gObject = null)
+        {
+            var ui = new UI_BtnStyle006();
+            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_BtnStyle006 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_BtnStyle006();
+            }
+            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/CommonGame/UI_BtnStyle006.cs.meta

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

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

@@ -18,8 +18,10 @@ namespace UI.LuckyBox
         public UI_ComCost m_comCostTen;
         public UI_ComCost m_comCostTen;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyOne;
         public GButton m_btnBuyTen;
         public GButton m_btnBuyTen;
-        public GImage m_imgSpecial;
         public GTextField m_txtRemainTimes;
         public GTextField m_txtRemainTimes;
+        public GImage m_imgSpecial;
+        public GGraph m_holder;
+        public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usduuftcr";
         public const string URL = "ui://drx9d1usduuftcr";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox1";
         public const string RES_NAME = "ComBox1";
@@ -78,8 +80,10 @@ namespace UI.LuckyBox
             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_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -97,8 +101,10 @@ namespace UI.LuckyBox
             m_comCostTen = null;
             m_comCostTen = null;
             m_btnBuyOne = null;
             m_btnBuyOne = null;
             m_btnBuyTen = null;
             m_btnBuyTen = null;
-            m_imgSpecial = null;
             m_txtRemainTimes = null;
             m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

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

@@ -14,21 +14,12 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
         private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
         private Dictionary<int, LuckyBoxController> _lcukyBoxCtrl = new Dictionary<int, LuckyBoxController>();
 
 
-        //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 GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
         private DressUpObjUI _dressUpObjUIXiHe;
         private DressUpObjUI _dressUpObjUIXiHe;
 
 
-        //private GameObject _scenePrefab;
-        //private GameObject _sceneObject;
-        //private GoWrapper _wrapper4;
-        //private DressUpObj _dressUpObj;
         private DressUpObjUI _dressUpObjUIChangXi;
         private DressUpObjUI _dressUpObjUIChangXi;
 
 
         private bool isActiveBoxOpen = false;
         private bool isActiveBoxOpen = false;
@@ -57,11 +48,8 @@ namespace GFGGame
                 _dressUpObjUIChangXi.Dispose();
                 _dressUpObjUIChangXi.Dispose();
                 _dressUpObjUIChangXi = null;
                 _dressUpObjUIChangXi = null;
             }
             }
-
-            //SceneController.DestroyObjectFromView(_gameObject, _wrapper);
-            //SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
-            //SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            //SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
 
 
             if (_ui != null)
             if (_ui != null)
             {
             {
@@ -222,6 +210,14 @@ namespace GFGGame
 
 
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             LuckyBoxDataManager.Instance.GetOwnedCount(boxId, out int count, out int totalCount);
             comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
             comBox.m_imgSpecial.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            GGraph holder = comBox.m_btnBuyTen.GetChild("holder").asGraph;
+            holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            comBox.m_holder.visible = boxId != LuckyBoxDataManager.BOX_ID_3;
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "Button_Glow");
+            SceneController.AddObjectToView(null, null, holder, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_LuckyBox", "but_text_dc");
+            SceneController.AddObjectToView(null, null, comBox.m_holder, resPath1, out _gameObject1, out _wrapper1);
+
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v1", "" + count).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             comBox.m_txtOwned.SetVar("v2", "" + totalCount).FlushVars();
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(cfg.numericType);
@@ -267,6 +263,13 @@ namespace GFGGame
             }
             }
             UI_ComBox1.ProxyEnd();
             UI_ComBox1.ProxyEnd();
         }
         }
+
+        private void UpdateEffect()
+        {
+
+
+
+        }
         private void CheckTime(object param = null)
         private void CheckTime(object param = null)
         {
         {
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;
             if (LuckyBoxDataManager.Instance.currentBoxId != _activeBoxId) return;

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


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