Переглянути джерело

查看公告详情时,点击空白处也可关闭公告界面

zhaoyang 3 роки тому
батько
коміт
f0383d9904

+ 4 - 1
FGUIProject/assets/Notice/NoticeActivityShowUI.xml

@@ -2,6 +2,9 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
+    <loader id="n24_fz8v" name="btnBg" xy="0,0" size="1080,1920" group="n23_kjq3">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <component id="n12_kjq3" name="btnBack" src="kjq3p" fileName="components/Button3.xml" xy="99,364" group="n23_kjq3"/>
     <loader id="n13_kjq3" name="loaShow" xy="87,455" size="905,970" group="n15_kjq3"/>
     <image id="n11_kjq3" name="n11" src="kjq3b" fileName="images/gg_gg_tpkqw_1.png" xy="87,455" group="n15_kjq3"/>
@@ -18,7 +21,7 @@
     <group id="n21_kjq3" name="grpShow2" xy="87,350" size="905,1075" group="n23_kjq3" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
     </group>
-    <group id="n23_kjq3" name="n23" xy="87,350" size="905,1075" advanced="true">
+    <group id="n23_kjq3" name="n23" xy="0,0" size="1080,1920" advanced="true">
       <relation target="" sidePair="top-middle"/>
     </group>
   </displayList>

+ 7 - 1
FGUIProject/assets/Notice/NoticeSystemShowUI.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
+    <loader id="n29_fz8v" name="btnBg" xy="0,0" size="1080,1920" group="n23_kjq3">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <component id="n12_kjq3" name="btnBack" src="kjq3p" fileName="components/Button3.xml" xy="99,364" group="n23_kjq3"/>
     <image id="n16_kjq3" name="n16" src="kjq3d" fileName="images/gg_gg_btbt_1.png" xy="280,350" group="n28_kjq3"/>
     <text id="n17_kjq3" name="txtTitle" xy="425,350" pivot="0.5,0" size="228,74" group="n28_kjq3" fontSize="56" color="#8f6e30" text="活动标题"/>
     <group id="n28_kjq3" name="n28" xy="280,350" size="519,85" group="n23_kjq3"/>
     <component id="n27_kjq3" name="ComContent" src="kjq3u" fileName="components/ComContent.xml" xy="95,455" group="n23_kjq3"/>
-    <group id="n23_kjq3" name="n23" xy="95,350" size="890,1075" advanced="true">
+    <loader id="n30_fz8v" name="n30" xy="95,1426" size="890,192" group="n23_kjq3">
+      <relation target="n27_kjq3" sidePair="top-bottom"/>
+    </loader>
+    <group id="n23_kjq3" name="n23" xy="0,0" size="1080,1920" advanced="true">
       <relation target="" sidePair="top-middle"/>
     </group>
   </displayList>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeActivityShowUI.cs

@@ -8,6 +8,7 @@ namespace UI.Notice
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_btnBg;
         public GButton m_btnBack;
         public GLoader m_loaShow;
         public GButton m_btnGo;
@@ -63,6 +64,7 @@ namespace UI.Notice
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_btnBg = (GLoader)comp.GetChild("btnBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_loaShow = (GLoader)comp.GetChild("loaShow");
             m_btnGo = (GButton)comp.GetChild("btnGo");
@@ -74,6 +76,7 @@ namespace UI.Notice
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_btnBg = null;
             m_btnBack = null;
             m_loaShow = null;
             m_btnGo = null;

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeSystemShowUI.cs

@@ -7,6 +7,7 @@ namespace UI.Notice
     public partial class UI_NoticeSystemShowUI
     {
         public GComponent target;
+        public GLoader m_btnBg;
         public GButton m_btnBack;
         public GTextField m_txtTitle;
         public UI_ComContent m_ComContent;
@@ -57,12 +58,14 @@ namespace UI.Notice
 
         private void Init(GComponent comp)
         {
+            m_btnBg = (GLoader)comp.GetChild("btnBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_ComContent = (UI_ComContent)UI_ComContent.Create(comp.GetChild("ComContent"));
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnBg = null;
             m_btnBack = null;
             m_txtTitle = null;
             m_ComContent.Dispose();

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs

@@ -23,13 +23,15 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             this.clickBlankToClose = false;
-
+            // this.modal = true;
+            // viewAnimationType = EnumViewAnimationType.None;
         }
 
         protected override void OnInit()
         {
             base.OnInit();
             _ui.m_btnBack.onClick.Add(this.OnHide);
+            _ui.m_btnBg.onClick.Add(this.OnHide);
         }
 
         protected override void OnShown()

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -76,11 +76,11 @@ namespace GFGGame
 
         private void OnListActivityClick(EventContext context)
         {
-            _ui.m_listActivity.visible = false;
-            _ui.m_listNotice.visible = false;
+            // _ui.m_listActivity.visible = false;
+            // _ui.m_listNotice.visible = false;
             // int noticeId = (int)(context.data as GObject).data;
 
-            ViewManager.Show<NoticeActivityShowView>(null, new object[] { typeof(NoticeView).Name, this.viewData });
+            // ViewManager.Show<NoticeActivityShowView>(null, new object[] { typeof(NoticeView).Name, this.viewData });
         }
 
         private void ListNoticeItemRender(int index, GObject obj)

BIN
GameClient/Assets/ResIn/UI/Notice/Notice_fui.bytes