zhaoyang 3 жил өмнө
parent
commit
ecffe63cdc
67 өөрчлөгдсөн 1280 нэмэгдсэн , 5 устгасан
  1. 25 0
      FGUIProject/assets/Notice/NoticeActivityShowUI.xml
  2. 14 0
      FGUIProject/assets/Notice/NoticeSystemShowUI.xml
  3. 32 0
      FGUIProject/assets/Notice/NoticeUI.xml
  4. 8 0
      FGUIProject/assets/Notice/components/Button1.xml
  5. 10 0
      FGUIProject/assets/Notice/components/Button2.xml
  6. 10 0
      FGUIProject/assets/Notice/components/Button3.xml
  7. 10 0
      FGUIProject/assets/Notice/components/Button4.xml
  8. 10 0
      FGUIProject/assets/Notice/components/Button5.xml
  9. 6 0
      FGUIProject/assets/Notice/components/ComContent.xml
  10. 10 0
      FGUIProject/assets/Notice/components/ListActivityItem.xml
  11. 11 0
      FGUIProject/assets/Notice/components/ListNoticeItem.xml
  12. 15 0
      FGUIProject/assets/Notice/components/ListShowItem.xml
  13. BIN
      FGUIProject/assets/Notice/images/gg_gg_anniu_1.png
  14. BIN
      FGUIProject/assets/Notice/images/gg_gg_anniu_2.png
  15. BIN
      FGUIProject/assets/Notice/images/gg_gg_anniu_3.png
  16. BIN
      FGUIProject/assets/Notice/images/gg_gg_anniu_4.png
  17. BIN
      FGUIProject/assets/Notice/images/gg_gg_btbt_1.png
  18. BIN
      FGUIProject/assets/Notice/images/gg_gg_btbt_2.png
  19. BIN
      FGUIProject/assets/Notice/images/gg_gg_dtpian.png
  20. BIN
      FGUIProject/assets/Notice/images/gg_gg_fhfh.png
  21. BIN
      FGUIProject/assets/Notice/images/gg_gg_hdhdgth.png
  22. BIN
      FGUIProject/assets/Notice/images/gg_gg_qwqw.png
  23. BIN
      FGUIProject/assets/Notice/images/gg_gg_tpkqw_1.png
  24. BIN
      FGUIProject/assets/Notice/images/gg_gg_tpkqw_2.png
  25. BIN
      FGUIProject/assets/Notice/images/gg_gg_tpkqw_3.png
  26. BIN
      FGUIProject/assets/Notice/images/gg_gg_tpkqw_4.png
  27. BIN
      FGUIProject/assets/Notice/images/gg_gg_tupdi.png
  28. BIN
      FGUIProject/assets/Notice/images/gg_gg_tupk.png
  29. BIN
      FGUIProject/assets/Notice/images/gg_gg_xtxtk.png
  30. 35 0
      FGUIProject/assets/Notice/package.xml
  31. 22 0
      GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs
  32. 7 0
      GameClient/Assets/Game/HotUpdate/Data/NoticeDataManager.cs
  33. 11 0
      GameClient/Assets/Game/HotUpdate/Data/NoticeDataManager.cs.meta
  34. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice.meta
  35. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ComContent.cs
  36. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ComContent.cs.meta
  37. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListActivityItem.cs
  38. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListActivityItem.cs.meta
  39. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListNoticeItem.cs
  40. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListNoticeItem.cs.meta
  41. 86 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListShowItem.cs
  42. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListShowItem.cs.meta
  43. 92 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeActivityShowUI.cs
  44. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeActivityShowUI.cs.meta
  45. 81 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeSystemShowUI.cs
  46. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeSystemShowUI.cs.meta
  47. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeUI.cs
  48. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeUI.cs.meta
  49. 25 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/NoticeSProxy.cs
  50. 11 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/NoticeSProxy.cs.meta
  51. 12 0
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  52. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs
  53. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs
  54. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs.meta
  55. 7 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  56. 8 0
      GameClient/Assets/Game/HotUpdate/Views/Notice.meta
  57. 47 0
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs
  58. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs.meta
  59. 47 0
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs
  60. 11 0
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs.meta
  61. 84 0
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs
  62. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs.meta
  63. 8 0
      GameClient/Assets/ResIn/UI/Notice.meta
  64. BIN
      GameClient/Assets/ResIn/UI/Notice/Notice_atlas0.png
  65. 96 0
      GameClient/Assets/ResIn/UI/Notice/Notice_atlas0.png.meta
  66. BIN
      GameClient/Assets/ResIn/UI/Notice/Notice_fui.bytes
  67. 7 0
      GameClient/Assets/ResIn/UI/Notice/Notice_fui.bytes.meta

+ 25 - 0
FGUIProject/assets/Notice/NoticeActivityShowUI.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <controller name="c1" pages="0,,1," selected="0"/>
+  <displayList>
+    <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"/>
+    <component id="n14_kjq3" name="btnGo" src="kjq3q" fileName="components/Button4.xml" xy="709,1192" group="n15_kjq3"/>
+    <group id="n15_kjq3" name="grpShow1" xy="87,455" size="905,970" group="n23_kjq3" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <image id="n16_kjq3" name="n16" src="kjq3d" fileName="images/gg_gg_btbt_1.png" xy="280,350" group="n21_kjq3"/>
+    <text id="n17_kjq3" name="txtTitle" xy="425,350" pivot="0.5,0" size="228,74" group="n21_kjq3" fontSize="56" color="#8f6e30" text="活动标题"/>
+    <list id="n19_kjq3" name="listShow" xy="87,455" size="905,970" group="n21_kjq3" overflow="scroll" defaultItem="ui://d8t5ezjbkjq3r">
+      <item/>
+      <item/>
+    </list>
+    <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">
+      <relation target="" sidePair="top-middle"/>
+    </group>
+  </displayList>
+</component>

+ 14 - 0
FGUIProject/assets/Notice/NoticeSystemShowUI.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <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="87,455" size="905,862" group="n23_kjq3"/>
+    <text id="n24_kjq3" name="txtName" xy="791,1373" pivot="1,0" size="201,52" group="n23_kjq3" fontSize="38" color="#a09172" text="GFG工作室"/>
+    <group id="n23_kjq3" name="n23" xy="87,350" size="905,1075" advanced="true">
+      <relation target="" sidePair="top-middle"/>
+    </group>
+  </displayList>
+</component>

+ 32 - 0
FGUIProject/assets/Notice/NoticeUI.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1062,1300">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n0_kjq3" name="n0" src="kjq36" fileName="images/gg_gg_dtpian.png" xy="0,-67"/>
+    <list id="n1_kjq3" name="listActivity" xy="72,53" size="927,1074" overflow="scroll" defaultItem="ui://d8t5ezjbkjq3l" align="center">
+      <gearDisplay controller="c1" pages="0"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n2_kjq3" name="listNotice" xy="72,53" size="927,1075" overflow="scroll" lineGap="3" defaultItem="ui://d8t5ezjbkjq3m">
+      <gearDisplay controller="c1" pages="1"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n3_kjq3" name="btnActivity" src="kjq3j" fileName="components/Button1.xml" xy="154,1197" group="n5_kjq3">
+      <Button icon="ui://d8t5ezjbkjq35" selectedIcon="ui://d8t5ezjbkjq32" controller="c1" page="0"/>
+    </component>
+    <component id="n4_kjq3" name="btnNotice" src="kjq3j" fileName="components/Button1.xml" xy="548,1197" group="n5_kjq3">
+      <Button checked="true" icon="ui://d8t5ezjbkjq33" selectedIcon="ui://d8t5ezjbkjq34" controller="c1" page="1"/>
+    </component>
+    <group id="n5_kjq3" name="n5" xy="154,1197" size="735,108" advanced="true" layout="hz" colGap="53" excludeInvisibles="true"/>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Notice/components/Button1.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="341,108" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <loader id="n2_kjq3" name="icon" xy="0,0" size="50,50" autoSize="true"/>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 10 - 0
FGUIProject/assets/Notice/components/Button2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="187,75" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_kjq3" src="kjq3h" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/Notice/components/Button3.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="49,72" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_kjq3" src="kjq3a" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/Notice/components/Button4.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="260,220" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_kjq3" src="kjq39" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/Notice/components/Button5.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="238,201" extention="Button">
+  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <displayList>
+    <image id="n0_kjq3" src="kjq3f" name="n0" xy="0,0">
+      <relation target="" sidePair="width,height"/>
+    </image>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/Notice/components/ComContent.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="905,970" overflow="scroll">
+  <displayList>
+    <text id="n27_kjq3" name="txtContent" xy="0,0" size="905,51" fontSize="38" color="#a09172" autoSize="height" text="GFG工作室"/>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/Notice/components/ListActivityItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="927,320">
+  <displayList>
+    <loader id="n6_kjq3" name="loaShow" xy="2,28" size="906,289"/>
+    <image id="n8_kjq3" name="n8" src="kjq38" fileName="images/gg_gg_tupdi.png" xy="2,28"/>
+    <image id="n9_kjq3" name="imgTips" src="kjq37" fileName="images/gg_gg_hdhdgth.png" xy="870,0"/>
+    <image id="n10_kjq3" name="n10" src="kjq31" fileName="images/gg_gg_tupk.png" xy="7,221"/>
+    <text id="n11_kjq3" name="txtTime" xy="45,232" size="408,56" fontSize="42" color="#83683e" text="限时:20天30时50分"/>
+  </displayList>
+</component>

+ 11 - 0
FGUIProject/assets/Notice/components/ListNoticeItem.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="927,184">
+  <displayList>
+    <image id="n10_kjq3" name="n10" src="kjq3g" fileName="images/gg_gg_xtxtk.png" xy="0,26" group="n15_kjq3"/>
+    <image id="n14_kjq3" name="imgTips" src="kjq37" fileName="images/gg_gg_hdhdgth.png" xy="870,0" group="n15_kjq3"/>
+    <text id="n11_kjq3" name="txtTitle" xy="42,75" size="256,59" group="n15_kjq3" fontSize="44" color="#bb996c" text="主题350678"/>
+    <text id="n12_kjq3" name="txtTime" xy="426,80" size="181,49" group="n15_kjq3" fontSize="36" color="#c8aa84" text="2022/8/8"/>
+    <component id="n13_kjq3" name="btnGo" src="kjq3n" fileName="components/Button2.xml" xy="684,67" group="n15_kjq3"/>
+    <group id="n15_kjq3" name="n15" xy="0,0" size="927,183"/>
+  </displayList>
+</component>

+ 15 - 0
FGUIProject/assets/Notice/components/ListShowItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="905,502">
+  <displayList>
+    <loader id="n21_kjq3" name="loaShow" xy="0,0" size="905,238" group="n23_kjq3"/>
+    <image id="n20_kjq3" name="n20" src="kjq3c" fileName="images/gg_gg_tpkqw_4.png" xy="0,0" group="n23_kjq3"/>
+    <component id="n22_kjq3" name="btnGo" src="kjq3s" fileName="components/Button5.xml" xy="643,22" group="n23_kjq3"/>
+    <group id="n23_kjq3" name="grpShow" xy="0,0" size="905,238" group="n28_kjq3" advanced="true"/>
+    <text id="n24_kjq3" name="txtTitle" xy="42,263" size="285,64" group="n26_kjq3" fontSize="48" color="#8c713a" text="520活动专用"/>
+    <image id="n25_kjq3" name="n25" src="kjq3e" fileName="images/gg_gg_btbt_2.png" xy="22,278" group="n26_kjq3"/>
+    <group id="n26_kjq3" name="grpTitle" xy="22,263" size="305,64" group="n28_kjq3" advanced="true"/>
+    <text id="n27_kjq3" name="txtContent" xy="11,352" size="882,150" group="n28_kjq3" fontSize="38" color="#a09172" autoSize="height" text="上午备课,下午在全民营养周启动仪式上做了个 20分钟的报告,主题是“会烹”。主要内容是:会烹 全谷,会烹少油,会"/>
+    <group id="n28_kjq3" name="n28" xy="0,0" size="905,502" advanced="true" layout="vt" lineGap="25" excludeInvisibles="true"/>
+  </displayList>
+  <relation target="n28_kjq3" sidePair="height-height"/>
+</component>

BIN
FGUIProject/assets/Notice/images/gg_gg_anniu_1.png


BIN
FGUIProject/assets/Notice/images/gg_gg_anniu_2.png


BIN
FGUIProject/assets/Notice/images/gg_gg_anniu_3.png


BIN
FGUIProject/assets/Notice/images/gg_gg_anniu_4.png


BIN
FGUIProject/assets/Notice/images/gg_gg_btbt_1.png


BIN
FGUIProject/assets/Notice/images/gg_gg_btbt_2.png


BIN
FGUIProject/assets/Notice/images/gg_gg_dtpian.png


BIN
FGUIProject/assets/Notice/images/gg_gg_fhfh.png


BIN
FGUIProject/assets/Notice/images/gg_gg_hdhdgth.png


BIN
FGUIProject/assets/Notice/images/gg_gg_qwqw.png


BIN
FGUIProject/assets/Notice/images/gg_gg_tpkqw_1.png


BIN
FGUIProject/assets/Notice/images/gg_gg_tpkqw_2.png


BIN
FGUIProject/assets/Notice/images/gg_gg_tpkqw_3.png


BIN
FGUIProject/assets/Notice/images/gg_gg_tpkqw_4.png


BIN
FGUIProject/assets/Notice/images/gg_gg_tupdi.png


BIN
FGUIProject/assets/Notice/images/gg_gg_tupk.png


BIN
FGUIProject/assets/Notice/images/gg_gg_xtxtk.png


+ 35 - 0
FGUIProject/assets/Notice/package.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packageDescription id="d8t5ezjb">
+  <resources>
+    <image id="kjq31" name="gg_gg_tupk.png" path="/images/"/>
+    <image id="kjq32" name="gg_gg_anniu_1.png" path="/images/"/>
+    <image id="kjq33" name="gg_gg_anniu_2.png" path="/images/"/>
+    <image id="kjq34" name="gg_gg_anniu_3.png" path="/images/"/>
+    <image id="kjq35" name="gg_gg_anniu_4.png" path="/images/"/>
+    <image id="kjq36" name="gg_gg_dtpian.png" path="/images/"/>
+    <image id="kjq37" name="gg_gg_hdhdgth.png" path="/images/"/>
+    <image id="kjq38" name="gg_gg_tupdi.png" path="/images/"/>
+    <image id="kjq39" name="gg_gg_tpkqw_2.png" path="/images/"/>
+    <image id="kjq3a" name="gg_gg_fhfh.png" path="/images/"/>
+    <image id="kjq3b" name="gg_gg_tpkqw_1.png" path="/images/"/>
+    <image id="kjq3c" name="gg_gg_tpkqw_4.png" path="/images/"/>
+    <image id="kjq3d" name="gg_gg_btbt_1.png" path="/images/"/>
+    <image id="kjq3e" name="gg_gg_btbt_2.png" path="/images/"/>
+    <image id="kjq3f" name="gg_gg_tpkqw_3.png" path="/images/"/>
+    <image id="kjq3g" name="gg_gg_xtxtk.png" path="/images/"/>
+    <image id="kjq3h" name="gg_gg_qwqw.png" path="/images/"/>
+    <component id="kjq3i" name="NoticeUI.xml" path="/" exported="true"/>
+    <component id="kjq3j" name="Button1.xml" path="/components/"/>
+    <component id="kjq3l" name="ListActivityItem.xml" path="/components/"/>
+    <component id="kjq3m" name="ListNoticeItem.xml" path="/components/"/>
+    <component id="kjq3n" name="Button2.xml" path="/components/"/>
+    <component id="kjq3o" name="NoticeActivityShowUI.xml" path="/" exported="true"/>
+    <component id="kjq3p" name="Button3.xml" path="/components/"/>
+    <component id="kjq3q" name="Button4.xml" path="/components/"/>
+    <component id="kjq3r" name="ListShowItem.xml" path="/components/"/>
+    <component id="kjq3s" name="Button5.xml" path="/components/"/>
+    <component id="kjq3t" name="NoticeSystemShowUI.xml" path="/" exported="true"/>
+    <component id="kjq3u" name="ComContent.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Notice" packageCount="2" genCode="true"/>
+</packageDescription>

+ 22 - 0
GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -65,6 +65,19 @@ namespace GFGEditor
         public static string CardIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Card/Card/";
         public static string CardMd5FileSaveName = "CardMd5";
 
+        private static string[] ActivitySrcPaths { get { return new string[] { ResRootPath + "activity/activity/" }; } }
+        public static string ActivityTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Activity/";
+        public static string ActivityMd5FileSaveName = "ActivityMd5";
+
+
+        private static string[] ActivityShow1SrcPaths { get { return new string[] { ResRootPath + "activity/show1/" }; } }
+        public static string ActivityShow1TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show1/";
+        public static string ActivityShow1Md5FileSaveName = "ActivityShow1Md5";
+
+
+        private static string[] ActivityShow2SrcPaths { get { return new string[] { ResRootPath + "activity/show2/" }; } }
+        public static string ActivityShow2TargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Show2/";
+        public static string ActivityShow2Md5FileSaveName = "ActivityShow2Md5";
 
         public static string[] DressUpAnimationSrcPaths { get { return new string[] { ResRootPathDressUp + $"ArtProject/{ResPathUtil.ANIMATION_DIR_PATH}/" }; } }
         public static string DressUpAnimationTargetPath = $"{ResPathUtil.ANIMATION_DIR_PATH}/";
@@ -110,6 +123,15 @@ namespace GFGEditor
             //卡牌icon
             EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
             ImportRes(CardIconSrcPaths, CardIconTargetPath, CardMd5FileSaveName);
+            //活动宣传图
+            EditorUtility.DisplayProgressBar("进度", "正在导入活动宣传图", 1);
+            ImportRes(ActivitySrcPaths, ActivityTargetPath, ActivityMd5FileSaveName);
+            //活动展示图1
+            EditorUtility.DisplayProgressBar("进度", "正在导入活动展示图1", 1);
+            ImportRes(ActivityShow1SrcPaths, ActivityShow1TargetPath, ActivityShow1Md5FileSaveName);
+            //活动展示图2
+            EditorUtility.DisplayProgressBar("进度", "正在导入活动展示图2", 1);
+            ImportRes(ActivityShow2SrcPaths, ActivityShow2TargetPath, ActivityShow2Md5FileSaveName);
 
             //清除冗余动画
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);

+ 7 - 0
GameClient/Assets/Game/HotUpdate/Data/NoticeDataManager.cs

@@ -0,0 +1,7 @@
+namespace GFGGame
+{
+    public class NoticeDataManager : SingletonBase<NoticeDataManager>
+    {
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Data/NoticeDataManager.cs.meta

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

+ 8 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c538cd67ec54f154395cdc22e5c8b6c1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ComContent.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_ComContent
+    {
+        public GComponent target;
+        public GTextField m_txtContent;
+        public const string URL = "ui://d8t5ezjbkjq3u";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "ComContent";
+        private static UI_ComContent _proxy;
+
+        public static UI_ComContent Create(GObject gObject = null)
+        {
+            var ui = new UI_ComContent();
+            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_ComContent Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComContent();
+            }
+            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_txtContent = (GTextField)comp.GetChild("txtContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ComContent.cs.meta

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListActivityItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_ListActivityItem
+    {
+        public GComponent target;
+        public GLoader m_loaShow;
+        public GImage m_imgTips;
+        public GTextField m_txtTime;
+        public const string URL = "ui://d8t5ezjbkjq3l";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "ListActivityItem";
+        private static UI_ListActivityItem _proxy;
+
+        public static UI_ListActivityItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListActivityItem();
+            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_ListActivityItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListActivityItem();
+            }
+            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_loaShow = (GLoader)comp.GetChild("loaShow");
+            m_imgTips = (GImage)comp.GetChild("imgTips");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaShow = null;
+            m_imgTips = null;
+            m_txtTime = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListActivityItem.cs.meta

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListNoticeItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_ListNoticeItem
+    {
+        public GComponent target;
+        public GImage m_imgTips;
+        public GTextField m_txtTitle;
+        public GTextField m_txtTime;
+        public GButton m_btnGo;
+        public const string URL = "ui://d8t5ezjbkjq3m";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "ListNoticeItem";
+        private static UI_ListNoticeItem _proxy;
+
+        public static UI_ListNoticeItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListNoticeItem();
+            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_ListNoticeItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListNoticeItem();
+            }
+            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_imgTips = (GImage)comp.GetChild("imgTips");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgTips = null;
+            m_txtTitle = null;
+            m_txtTime = null;
+            m_btnGo = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListNoticeItem.cs.meta

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

+ 86 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListShowItem.cs

@@ -0,0 +1,86 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_ListShowItem
+    {
+        public GComponent target;
+        public GLoader m_loaShow;
+        public GButton m_btnGo;
+        public GGroup m_grpShow;
+        public GTextField m_txtTitle;
+        public GGroup m_grpTitle;
+        public GTextField m_txtContent;
+        public const string URL = "ui://d8t5ezjbkjq3r";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "ListShowItem";
+        private static UI_ListShowItem _proxy;
+
+        public static UI_ListShowItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListShowItem();
+            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_ListShowItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListShowItem();
+            }
+            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_loaShow = (GLoader)comp.GetChild("loaShow");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_grpShow = (GGroup)comp.GetChild("grpShow");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_grpTitle = (GGroup)comp.GetChild("grpTitle");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaShow = null;
+            m_btnGo = null;
+            m_grpShow = null;
+            m_txtTitle = null;
+            m_grpTitle = null;
+            m_txtContent = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_ListShowItem.cs.meta

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

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

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_NoticeActivityShowUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnBack;
+        public GLoader m_loaShow;
+        public GButton m_btnGo;
+        public GGroup m_grpShow1;
+        public GTextField m_txtTitle;
+        public GList m_listShow;
+        public GGroup m_grpShow2;
+        public const string URL = "ui://d8t5ezjbkjq3o";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "NoticeActivityShowUI";
+        private static UI_NoticeActivityShowUI _proxy;
+
+        public static UI_NoticeActivityShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NoticeActivityShowUI();
+            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_NoticeActivityShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NoticeActivityShowUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_loaShow = (GLoader)comp.GetChild("loaShow");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_grpShow1 = (GGroup)comp.GetChild("grpShow1");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_listShow = (GList)comp.GetChild("listShow");
+            m_grpShow2 = (GGroup)comp.GetChild("grpShow2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnBack = null;
+            m_loaShow = null;
+            m_btnGo = null;
+            m_grpShow1 = null;
+            m_txtTitle = null;
+            m_listShow = null;
+            m_grpShow2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

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

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_NoticeSystemShowUI
+    {
+        public GComponent target;
+        public GButton m_btnBack;
+        public GTextField m_txtTitle;
+        public UI_ComContent m_ComContent;
+        public GTextField m_txtName;
+        public const string URL = "ui://d8t5ezjbkjq3t";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "NoticeSystemShowUI";
+        private static UI_NoticeSystemShowUI _proxy;
+
+        public static UI_NoticeSystemShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NoticeSystemShowUI();
+            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_NoticeSystemShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NoticeSystemShowUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_ComContent = (UI_ComContent)UI_ComContent.Create(comp.GetChild("ComContent"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_txtTitle = null;
+            m_ComContent.Dispose();
+            m_ComContent = null;
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Notice
+{
+    public partial class UI_NoticeUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GList m_listActivity;
+        public GList m_listNotice;
+        public GButton m_btnActivity;
+        public GButton m_btnNotice;
+        public const string URL = "ui://d8t5ezjbkjq3i";
+        public const string PACKAGE_NAME = "Notice";
+        public const string RES_NAME = "NoticeUI";
+        private static UI_NoticeUI _proxy;
+
+        public static UI_NoticeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_NoticeUI();
+            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_NoticeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NoticeUI();
+            }
+            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_c1 = comp.GetController("c1");
+            m_listActivity = (GList)comp.GetChild("listActivity");
+            m_listNotice = (GList)comp.GetChild("listNotice");
+            m_btnActivity = (GButton)comp.GetChild("btnActivity");
+            m_btnNotice = (GButton)comp.GetChild("btnNotice");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_listActivity = null;
+            m_listNotice = null;
+            m_btnActivity = null;
+            m_btnNotice = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Notice/UI_NoticeUI.cs.meta

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

+ 25 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/NoticeSProxy.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+
+namespace GFGGame
+{
+    public static class NoticeSProxy
+    {
+        public static async ETTask<bool> ClothingDecompose(List<int> itemIds, List<int> itemNums)
+        {
+            M2C_ClothingDecompose response = null;
+            response = (M2C_ClothingDecompose)await MessageHelper.SendToServer(new C2M_ClothingDecompose() { itemIds = itemIds, itemNums = itemNums });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.bonusList));
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/NoticeSProxy.cs.meta

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

+ 12 - 0
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -104,5 +104,17 @@ namespace GFGGame
         {
             return $"{ANIMATION_DIR_PATH}/Card/{res}/{res}.{extName}";
         }
+        public static string GetActivityPath(string res, string extName = "jpg")
+        {
+            return $"{TEXTURE_DIR_PATH}/Activity/Activity/{res}.{extName}";
+        }
+        public static string GetActivityShow1Path(string res, string extName = "jpg")
+        {
+            return $"{TEXTURE_DIR_PATH}/Activity/Show1/{res}.{extName}";
+        }
+        public static string GetActivityShow2Path(string res, string extName = "jpg")
+        {
+            return $"{TEXTURE_DIR_PATH}/Activity/Show1/{res}.{extName}";
+        }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -70,7 +70,7 @@ namespace GFGGame
 
         private void OnClickBtnNotice()
         {
-            ViewManager.Show<NoticeView>();
+            ViewManager.Show<SystemNoticeView>();
         }
 
         private void OnClickBtnStart()

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Login/NoticeView.cs → GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs

@@ -3,10 +3,10 @@ using UI.Login;
 
 namespace GFGGame
 {
-    public class NoticeView: BaseWindow
+    public class SystemNoticeView : BaseWindow
     {
         private UI_NoticeUI _ui;
-        
+
         public override void Dispose()
         {
             base.Dispose();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs.meta

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

+ 7 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -96,7 +96,7 @@ namespace GFGGame
             _btnTuJian = _ui.m_list.GetChild("btnTuJian").asButton;
             _btnJInShu = _ui.m_list.GetChild("btnJInShu").asButton;
 
-            _btnGongGao.visible = false;
+            // _btnGongGao.visible = false;
             // _btnHaoYou.visible = false;
             _btnRenWu.visible = false;
             _btnPengYouQuan.visible = false;
@@ -115,6 +115,7 @@ namespace GFGGame
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
             _btnYouJian.onClick.Add(OnClickBtnYouJian);
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
+            _btnGongGao.onClick.Add(OnClickBtnGongGao);
 
 
             AddEffect();
@@ -274,6 +275,11 @@ namespace GFGGame
         {
             ViewManager.Show<FriendView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
         }
+        private void OnClickBtnGongGao()
+        {
+            // /null, new object[] { ViewName.MAINUI_VIEW, this.viewData }
+            ViewManager.Show<NoticeView>();
+        }
         private void OnClickHeadBar()
         {
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/Notice.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 31058ae142eda1b458b8edb8a74d9ef6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 47 - 0
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs

@@ -0,0 +1,47 @@
+using UnityEngine;
+using FairyGUI;
+using UI.Notice;
+
+namespace GFGGame
+{
+    public class NoticeActivityShowView : BaseWindow
+    {
+        private UI_NoticeActivityShowUI _ui;
+
+
+        public override void Dispose()
+        {
+
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            packageName = UI_NoticeActivityShowUI.PACKAGE_NAME;
+            _ui = UI_NoticeActivityShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui.m_btnBack.onClick.Add(this.OnHide);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            ViewManager.GoBackFrom(typeof(NoticeActivityShowView).Name);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs.meta

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

+ 47 - 0
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs

@@ -0,0 +1,47 @@
+using UnityEngine;
+using FairyGUI;
+using UI.Notice;
+
+namespace GFGGame
+{
+    public class NoticeSystemShowView : BaseWindow
+    {
+        private UI_NoticeSystemShowUI _ui;
+
+
+        public override void Dispose()
+        {
+
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            packageName = UI_NoticeSystemShowUI.PACKAGE_NAME;
+            _ui = UI_NoticeSystemShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            this.clickBlankToClose = false;
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui.m_btnBack.onClick.Add(this.OnHide);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            // ViewManager.GoBackFrom(typeof(NoticeSystemShowView).Name);
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeSystemShowView.cs.meta

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

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

@@ -0,0 +1,84 @@
+using UnityEngine;
+using FairyGUI;
+using UI.Notice;
+
+namespace GFGGame
+{
+    public class NoticeView : BaseWindow
+    {
+        private UI_NoticeUI _ui;
+
+
+        public override void Dispose()
+        {
+
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+            packageName = UI_NoticeUI.PACKAGE_NAME;
+            _ui = UI_NoticeUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            _ui.m_listActivity.itemRenderer = ListActivityItemRender;
+            _ui.m_listActivity.onClick.Add(OnListActivityClick);
+
+            _ui.m_listNotice.itemRenderer = ListNoticeItemRender;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_listActivity.visible = true;
+            _ui.m_listNotice.visible = true;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            // ViewManager.GoBackFrom(typeof(NoticeView).Name);
+        }
+
+        private void ListActivityItemRender(int index, GObject obj)
+        {
+            UI_ListActivityItem item = UI_ListActivityItem.Proxy(obj);
+            item.m_loaShow.url = ResPathUtil.GetActivityPath("");
+            item.target.data = index;
+        }
+
+        private void OnListActivityClick(EventContext context)
+        {
+            _ui.m_listActivity.visible = false;
+            _ui.m_listNotice.visible = false;
+            //(context.data as GObject).data
+            ViewManager.Show<NoticeActivityShowView>(null, new object[] { typeof(NoticeView).Name, this.viewData });
+        }
+
+        private void ListNoticeItemRender(int index, GObject obj)
+        {
+            UI_ListNoticeItem item = UI_ListNoticeItem.Proxy(obj);
+            if (item.m_btnGo.data == null)
+            {
+
+                item.m_btnGo.onClick.Add(OnListNoticeBtnGoClick);
+            }
+        }
+        private void OnListNoticeBtnGoClick(EventContext context)
+        {
+            _ui.m_listActivity.visible = false;
+            _ui.m_listNotice.visible = false;
+            //(context.data as GObject).data
+            ViewManager.Show<NoticeSystemShowView>(null, new object[] { typeof(NoticeView).Name, this.viewData });
+        }
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Login/NoticeView.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 88c2e4d099776854ab8b134be4928e94
+guid: ec37d6d4f0b396d4f92a84cad2c6a8b4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 8 - 0
GameClient/Assets/ResIn/UI/Notice.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59d664db32b272540bb0467e2dd0efc0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/Notice/Notice_atlas0.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Notice/Notice_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b62ebd8a3dd979045b717c6433710edf
+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: 

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


+ 7 - 0
GameClient/Assets/ResIn/UI/Notice/Notice_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce72b48174449794c92896600ba474a1
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: