浏览代码

关闭按钮

zhaoyang 2 年之前
父节点
当前提交
f42339e952
共有 49 个文件被更改,包括 130 次插入222 次删除
  1. 3 3
      FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml
  2. 3 3
      FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml
  3. 2 2
      FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml
  4. 2 2
      FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml
  5. 二进制
      FGUIProject/assets/CommonGame/componentsBg/tanchuang_2.png
  6. 1 1
      FGUIProject/assets/CommonGame/package.xml
  7. 1 3
      FGUIProject/assets/League/components/ListSkillItem.xml
  8. 1 0
      FGUIProject/assets/Main/components/ProgressBarTargetScore.xml
  9. 1 0
      FGUIProject/assets/Main/package.xml
  10. 3 3
      FGUIProject/assets/Store/StoreBlackCardRewardUI.xml
  11. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs
  12. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs
  13. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs
  14. 6 2
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs
  15. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs.meta
  17. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBlackCardRewardUI.cs
  18. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs
  19. 2 1
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs
  20. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs
  21. 二进制
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png
  22. 二进制
      GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes
  23. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png
  24. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png
  25. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png
  26. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png
  27. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png
  28. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png
  29. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png
  30. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png
  31. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png
  32. 0 96
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta
  33. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png
  34. 0 96
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png.meta
  35. 二进制
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  36. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  37. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  38. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  39. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  40. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  41. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  42. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  43. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  44. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  45. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  46. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  47. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  48. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes
  49. 二进制
      GameClient/Assets/ResIn/UI/Store/Store_fui.bytes

+ 3 - 3
FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1b"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,-2" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,17" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,-2" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

+ 3 - 3
FGUIProject/assets/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1344">
   <displayList>
-    <component id="n1_mbf1" name="comBg" src="mbf1tn5" fileName="componentsBg/ComBg001.xml" pkg="eg2y0ldp" xy="0,0" size="1080,1344">
-      <property target="loaTitle" propertyId="1" value="ui://ubfk2kobmbf1c"/>
-    </component>
+    <image id="n5_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,1346" group="n7_e050"/>
+    <component id="n6_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n7_e050"/>
+    <group id="n7_e050" name="n7" xy="0,0" size="1021,1346"/>
     <list id="n3_mbf1" name="list" xy="98,173" size="883,1055" overflow="scroll" lineGap="22" defaultItem="ui://ubfk2kobmbf19" align="center" vAlign="middle">
       <item/>
       <item/>

+ 2 - 2
FGUIProject/assets/CommonGame/componentsBg/ComBg000.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0"/>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,992"/>
+    <component id="n1_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" xy="897,16"/>
     <image id="n2_qik1" name="n2" src="9jv65m" fileName="imagesNew/lm_dt_zsx1.png" xy="220,111" group="n5_qik1"/>
     <text id="n4_qik1" name="txtTitle" xy="380,92" pivot="0.5,0" size="348,54" group="n5_qik1" fontSize="40" color="#8d6f45" align="center" vAlign="middle" leading="1" text="稀有升星材料(自选)"/>
     <image id="n3_qik1" name="n3" src="qik1tca" fileName="componentsBg/lm_dt_zsx2.png" xy="758,111" group="n5_qik1"/>

+ 2 - 2
FGUIProject/assets/CommonGame/componentsBg/ComBg001.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <image id="n0_qik1" name="n0" src="qik1tm6" fileName="componentsBg/tanchuang_2.png" xy="0,0">
+    <image id="n0_qik1" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" xy="0,0" size="1021,989">
       <relation target="" sidePair="height-height"/>
     </image>
-    <component id="n1_qik1" name="btnClose" src="cu9wtmj" fileName="components/BtnCancel.xml" pkg="2bsz6nel" xy="896,8"/>
+    <component id="n1_qik1" name="btnClose" src="e050tob" fileName="componentsBg/Component2.xml" xy="896,17"/>
     <loader id="n6_mbf1" name="loaTitle" xy="264,94" pivot="0.5,0" size="560,34" url="ui://eg2y0ldpmbf1tn6" autoSize="true"/>
   </displayList>
   <customProperty target="loaTitle" propertyId="1"/>

二进制
FGUIProject/assets/CommonGame/componentsBg/tanchuang_2.png


+ 1 - 1
FGUIProject/assets/CommonGame/package.xml

@@ -318,7 +318,6 @@
     <image id="qik1tm3" name="jjsjs_txk_2.png" path="/images/"/>
     <image id="qik1tm4" name="pmts_xtk_1.png" path="/images/"/>
     <image id="qik1tm5" name="phbphb_txkk.png" path="/images/"/>
-    <image id="qik1tm6" name="tanchuang_2.png" path="/componentsBg/" scale="9grid" scale9grid="254,247,510,329"/>
     <component id="qik1tcb" name="ComBg000.xml" path="/componentsBg/" exported="true"/>
     <image id="qik1tca" name="lm_dt_zsx2.png" path="/componentsBg/"/>
     <image id="9jv65m" name="lm_dt_zsx1.png" path="/imagesNew/" exported="true"/>
@@ -363,6 +362,7 @@
     <image id="e050to6" name="tb_yajijiangzhang.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
+    <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 3
FGUIProject/assets/League/components/ListSkillItem.xml

@@ -3,9 +3,7 @@
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n16_gfx4" name="n16" src="miy37n" fileName="images/lm_ch_dldb.png" xy="0,0" pivot="0.5,0"/>
-    <loader id="n23_miy3" name="loaIcon" xy="25,25" pivot="0.5,0.5" size="112,112" url="ui://eg2y0ldpu2u3tkq" autoSize="true">
-      <gearIcon controller="c1" pages="0" values="ui://eg2y0ldpu2u3tkq" default=""/>
-    </loader>
+    <loader id="n23_miy3" name="loaIcon" xy="22,22" pivot="0.5,0.5" size="115,115" url="ui://tw70qm9de05086" autoSize="true"/>
     <image id="n20_miy3" name="n20" src="miy37i" fileName="images/lm_ch_szdk.png" xy="-7,127"/>
     <loader id="n10_pvb4" name="loaScore" xy="28,3" size="44,44" group="n13_pvb4" url="ui://eg2y0ldp842s6h"/>
     <text id="n11_pvb4" name="txtScore" xy="73,0" size="60,50" group="n13_pvb4" font="ui://eg2y0ldpa0cftks" fontSize="37" color="#7c561e" letterSpacing="-2" text="+10"/>

+ 1 - 0
FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -2,6 +2,7 @@
 <component size="850,33" extention="ProgressBar">
   <displayList>
     <image id="n11_fqor" name="n11" src="qkjsla" fileName="imagesNew/pro_bk_in.png" xy="-36,0"/>
+    <image id="n22_e050" name="n22" src="e050oz" fileName="imagesNew/jdt_shuangrenzd.png" xy="0,4"/>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,4"/>
     <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="849,16" pivot="0.518,0.438" anchor="true" alpha="0.76">
       <relation target="n1_uj53" sidePair="right-right"/>

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

@@ -647,6 +647,7 @@
     <component id="t6j1ow" name="BtnModle2.xml" path="/components/"/>
     <image id="t6j1ox" name="zd_shanghai_db.png" path="/imagesNew/"/>
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
+    <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 3 - 3
FGUIProject/assets/Store/StoreBlackCardRewardUI.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,992">
   <displayList>
-    <component id="n0_qik1" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" pkg="eg2y0ldp" xy="0,0">
-      <property target="txtTitle" propertyId="0" value="黑金卡专属"/>
-    </component>
+    <image id="n15_e050" name="imgBg" src="o9gh40" fileName="imagesNew/tanchuang.png" pkg="eg2y0ldp" xy="0,0" size="1021,992" group="n17_e050"/>
+    <component id="n16_e050" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="896,16" group="n17_e050"/>
+    <group id="n17_e050" name="n17" xy="0,0" size="1021,992"/>
     <image id="n6_qik1" name="n6" src="wm603t" fileName="imagesNew/lm_zhuangshixian_duan.png" pkg="eg2y0ldp" xy="132,796"/>
     <text id="n7_qik1" name="n7" xy="241,822" size="682,86" fontSize="32" color="#a88656" align="center" autoSize="none" text="黑金卡玩家,每月1日5点起,可免费领取黑金卡 专属单品,请注意及时领取,逾期失效。"/>
     <list id="n14_qik1" name="list" xy="147,176" size="809,590" layout="flow_hz" lineGap="10" colGap="20" defaultItem="ui://p9mtgheoqik1tcj" autoClearItems="true">

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxBonusUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxBonusUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf16";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxTaskUI.cs

@@ -7,7 +7,8 @@ namespace UI.ActivityThemeLuckyBox
     public partial class UI_ActivityThemeLuckyBoxTaskUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://ubfk2kobmbf1d";
         public const string PACKAGE_NAME = "ActivityThemeLuckyBox";
@@ -56,12 +57,14 @@ namespace UI.ActivityThemeLuckyBox
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg000.cs

@@ -7,6 +7,7 @@ namespace UI.CommonGame
     public partial class UI_ComBg000
     {
         public GComponent target;
+        public GImage m_imgBg;
         public GButton m_btnClose;
         public GTextField m_txtTitle;
         public const string URL = "ui://eg2y0ldpqik1tcb";
@@ -56,11 +57,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
+            m_imgBg = (GImage)comp.GetChild("imgBg");
             m_btnClose = (GButton)comp.GetChild("btnClose");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
             m_btnClose = null;
             m_txtTitle = null;
             if(disposeTarget && target != null)

+ 6 - 2
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComBg001.cs

@@ -7,7 +7,8 @@ namespace UI.CommonGame
     public partial class UI_ComBg001
     {
         public GComponent target;
-        public GButton m_btnClose;
+        public GImage m_imgBg;
+        public UI_Component2 m_btnClose;
         public GLoader m_loaTitle;
         public const string URL = "ui://eg2y0ldpmbf1tn5";
         public const string PACKAGE_NAME = "CommonGame";
@@ -56,11 +57,14 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (UI_Component2)UI_Component2.Create(comp.GetChild("btnClose"));
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_imgBg = null;
+            m_btnClose.Dispose();
             m_btnClose = null;
             m_loaTitle = null;
             if(disposeTarget && target != null)

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.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_Component2
+    {
+        public GComponent target;
+        public GButton m_btnClose;
+        public const string URL = "ui://eg2y0ldpe050tob";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Component2";
+        private static UI_Component2 _proxy;
+
+        public static UI_Component2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Component2();
+            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_Component2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Component2();
+            }
+            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_btnClose = (GButton)comp.GetChild("btnClose");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnClose = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Component2.cs.meta

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

+ 6 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Store/UI_StoreBlackCardRewardUI.cs

@@ -7,7 +7,8 @@ namespace UI.Store
     public partial class UI_StoreBlackCardRewardUI
     {
         public GComponent target;
-        public GComponent m_comBg;
+        public GImage m_imgBg;
+        public GButton m_btnClose;
         public GList m_list;
         public const string URL = "ui://p9mtgheoqik1tc8";
         public const string PACKAGE_NAME = "Store";
@@ -56,12 +57,14 @@ namespace UI.Store
 
         private void Init(GComponent comp)
         {
-            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_imgBg = (GImage)comp.GetChild("imgBg");
+            m_btnClose = (GButton)comp.GetChild("btnClose");
             m_list = (GList)comp.GetChild("list");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comBg = null;
+            m_imgBg = null;
+            m_btnClose = null;
             m_list = null;
             if(disposeTarget && target != null)
             {

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxTaskView.cs

@@ -3,6 +3,7 @@ using ET;
 using FairyGUI;
 using UI.ActivityThemeLuckyBox;
 using UnityEngine;
+using UI.CommonGame;
 
 namespace GFGGame
 {
@@ -32,7 +33,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = RenderListItem;
-
+            _ui.m_btnClose.onClick.Add(Hide);
         }
         protected override void AddEventListener()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/StoreBlackCardRewardView.cs

@@ -30,8 +30,8 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
-            _ui.m_comBg.GetChild("btnClose").asCom.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_btnClose.onClick.Add(Hide);
 
         }
         protected override void AddEventListener()

二进制
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_atlas0.png


二进制
GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3.png


二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 90bfe14dd02f1e54da1366d0fd6cc64a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png


+ 0 - 96
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_4.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: f18dec6fa30e23d43ab84b08888016ef
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes


二进制
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes