zhaoyang 3 жил өмнө
parent
commit
0c9e73edf2
66 өөрчлөгдсөн 1092 нэмэгдсэн , 73 устгасан
  1. 2 1
      FGUIProject/assets/ClothingFoster/components/comFosterAni.xml
  2. 0 15
      FGUIProject/assets/CommonGame/components/ListRewardItem1.xml
  3. 0 1
      FGUIProject/assets/CommonGame/package.xml
  4. 7 0
      FGUIProject/assets/DailyLogin/DailyLoginUI.xml
  5. 6 0
      FGUIProject/assets/DailyLogin/components/ListItem.xml
  6. 5 1
      FGUIProject/assets/DailyLogin/package.xml
  7. 11 0
      FGUIProject/assets/DailyTask/DailyTaskRewardUI.xml
  8. 19 0
      FGUIProject/assets/DailyTask/DailyTaskUI.xml
  9. 10 0
      FGUIProject/assets/DailyTask/components/Button1.xml
  10. 10 0
      FGUIProject/assets/DailyTask/components/Button2.xml
  11. 12 0
      FGUIProject/assets/DailyTask/components/ListItem.xml
  12. 15 0
      FGUIProject/assets/DailyTask/components/ListRewardItem.xml
  13. BIN
      FGUIProject/assets/DailyTask/images/sc_cwcw_1.png
  14. BIN
      FGUIProject/assets/DailyTask/images/sc_cwcw_2.png
  15. BIN
      FGUIProject/assets/DailyTask/images/sc_cwcw_3.png
  16. 12 1
      FGUIProject/assets/DailyTask/package.xml
  17. 3 0
      FGUIProject/assets/Main/MainUI.xml
  18. 9 0
      GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs
  19. 1 1
      GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs.meta
  20. 9 0
      GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs
  21. 11 0
      GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs.meta
  22. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_comFosterAni.cs
  23. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BuyCountUI.cs
  24. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin.meta
  25. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs
  26. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs.meta
  27. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs
  28. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs.meta
  29. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask.meta
  30. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskRewardUI.cs
  31. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskRewardUI.cs.meta
  32. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskUI.cs
  33. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskUI.cs.meta
  34. 22 25
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs
  35. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs.meta
  36. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListRewardItem.cs
  37. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListRewardItem.cs.meta
  38. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs
  39. 4 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  40. 25 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs
  41. 11 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs.meta
  42. 25 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/DailyTaskSProxy.cs
  43. 11 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/DailyTaskSProxy.cs.meta
  44. 5 2
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs
  45. 8 0
      GameClient/Assets/Game/HotUpdate/Views/DailyLogin.meta
  46. 53 0
      GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs
  47. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs.meta
  48. 8 0
      GameClient/Assets/Game/HotUpdate/Views/DailyTask.meta
  49. 52 0
      GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskRewardView.cs
  50. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskRewardView.cs.meta
  51. 60 0
      GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs
  52. 11 0
      GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs.meta
  53. 3 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  54. 55 22
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  55. BIN
      GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes
  56. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  57. 8 0
      GameClient/Assets/ResIn/UI/DailyLogin.meta
  58. BIN
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_fui.bytes
  59. 7 0
      GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_fui.bytes.meta
  60. 8 0
      GameClient/Assets/ResIn/UI/DailyTask.meta
  61. BIN
      GameClient/Assets/ResIn/UI/DailyTask/DailyTask_atlas0.png
  62. 96 0
      GameClient/Assets/ResIn/UI/DailyTask/DailyTask_atlas0.png.meta
  63. BIN
      GameClient/Assets/ResIn/UI/DailyTask/DailyTask_fui.bytes
  64. 7 0
      GameClient/Assets/ResIn/UI/DailyTask/DailyTask_fui.bytes.meta
  65. BIN
      GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes
  66. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 2 - 1
FGUIProject/assets/ClothingFoster/components/comFosterAni.xml

@@ -5,6 +5,7 @@
     <component id="n36_nk8d" name="proFoster" src="py5ga" fileName="images/ProgressBar1.xml" xy="0,108">
       <ProgressBar max="100"/>
     </component>
-    <text id="n37_bd1c" name="txtContent" xy="8,179" size="209,42" fontSize="30" text="服装浆洗中......"/>
+    <text id="n37_bd1c" name="txtContent" xy="8,179" size="209,41" fontSize="30" text="服装浆洗中......"/>
+    <graph id="n38_lh8v" name="holder" xy="115,56" size="1,1" type="rect"/>
   </displayList>
 </component>

+ 0 - 15
FGUIProject/assets/CommonGame/components/ListRewardItem1.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="192,280">
-  <displayList>
-    <image id="n11_ehs9" name="n11" src="j48o99" fileName="components/kp_sjsj_di_3.png" xy="0,0"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="96,96" pivot="0.5,0.5" anchor="true" size="160,160" aspect="true" fill="scale">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </loader>
-    <image id="n13_ehs9" name="n13" src="j48o9a" fileName="components/kp_sjsj_di_4.png" xy="16,162"/>
-    <text id="n14_ehs9" name="txtName" xy="95,194" pivot="0.5,0" anchor="true" size="105,46" fontSize="34" color="#9b7f61" text="赵钱孙"/>
-    <text id="n15_ehs9" name="txtCount" xy="95,159" pivot="0.5,0" anchor="true" size="49,34" fontSize="24" color="#fff8ea" text="500"/>
-    <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="components/yx_yilq.png" xy="7,80"/>
-    <text id="n17_j48o" name="txtHasCount" xy="96,243" pivot="0.5,0" anchor="true" size="105,36" fontSize="26" color="#a28d77" vars="true" text="已拥有:{count=0}"/>
-    <loader id="n18_j48o" name="loaRarity" xy="148,0" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-  </displayList>
-</component>

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

@@ -148,7 +148,6 @@
     <image id="srnc9i" name="hc_anniu_2.png" path="/images/"/>
     <image id="ehs93" name="yx_btzs.png" path="/images/" exported="true"/>
     <image id="ehs99" name="yx_xiant_1.png" path="/images/" exported="true" scale="9grid" scale9grid="212,2,424,4"/>
-    <component id="c21g9j" name="ListRewardItem1.xml" path="/components/" exported="true"/>
     <image id="k6he1x" name="hz_kuangxian.png" path="/imagesExport/"/>
     <image id="q08xq" name="hz_tzkuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="86,88,172,176"/>
     <image id="q08xp" name="hz_tzkuang.png" path="/imagesExport/" exported="true"/>

+ 7 - 0
FGUIProject/assets/DailyLogin/DailyLoginUI.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="522,412">
+  <displayList>
+    <list id="n0_lh8v" name="list" xy="36,48" size="459,300" overflow="scroll" defaultItem="ui://5uawdql9jyml7"/>
+    <text id="n2_jyml" name="txtTitle" xy="133,0" size="256,49" fontSize="36" align="center" text="七天登录领套装"/>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/DailyLogin/components/ListItem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="256,49">
+  <displayList>
+    <text id="n1_jyml" name="txtTitle" xy="0,0" size="256,49" fontSize="36" align="center" text="七天登录领套装"/>
+  </displayList>
+</component>

+ 5 - 1
FGUIProject/assets/DailyLogin/package.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="5uawdql9">
-  <resources/>
+  <resources>
+    <component id="lh8v6" name="DailyLoginUI.xml" path="/" exported="true"/>
+    <component id="jyml7" name="ListItem.xml" path="/components/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyLogin" packageCount="2" genCode="true"/>
 </packageDescription>

+ 11 - 0
FGUIProject/assets/DailyTask/DailyTaskRewardUI.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="624,400">
+  <displayList>
+    <list id="n0_lh8v" name="list" xy="0,102" size="624,243" layout="row" overflow="scroll" colGap="20" defaultItem="ui://eg2y0ldpj48o98">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 19 - 0
FGUIProject/assets/DailyTask/DailyTaskUI.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="800,600">
+  <displayList>
+    <list id="n0_lh8v" name="list" xy="126,167" size="522,412" overflow="scroll" lineGap="20" defaultItem="ui://5mpsibzzlh8v5" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <list id="n1_lh8v" name="listReward" xy="127,31" size="546,88" layout="row" colGap="20" defaultItem="ui://5mpsibzzlh8v6">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/DailyTask/components/Button1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,40" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n3_lh8v" name="title" xy="0,0" size="150,49" fontSize="36" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,40" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n3_lh8v" name="title" xy="0,0" size="150,49" fontSize="36" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 12 - 0
FGUIProject/assets/DailyTask/components/ListItem.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="533,90">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <displayList>
+    <text id="n1_lh8v" name="txtDesc" xy="0,0" size="292,49" fontSize="36" text="任务描述任务描述"/>
+    <component id="n3_lh8v" name="btnGet" src="lh8v3" fileName="components/Button1.xml" xy="383,50">
+      <Button title="领取"/>
+    </component>
+    <component id="n4_lh8v" name="btnGo" src="lh8v4" fileName="components/Button2.xml" xy="383,50"/>
+    <text id="n5_lh8v" name="txtCount" xy="424,0" size="70,49" fontSize="36" align="center" text="0/5"/>
+  </displayList>
+</component>

+ 15 - 0
FGUIProject/assets/DailyTask/components/ListRewardItem.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="90,82">
+  <controller name="c1" pages="0,,1,,2," selected="2"/>
+  <displayList>
+    <image id="n2_lh8v" name="n2" src="lh8v0" fileName="images/sc_cwcw_1.png" xy="0,0" size="90,82" aspect="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n3_lh8v" name="n3" src="lh8v1" fileName="images/sc_cwcw_2.png" xy="0,0" size="90,82" aspect="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n4_lh8v" name="n4" src="lh8v2" fileName="images/sc_cwcw_3.png" xy="0,0" size="90,82" aspect="true">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+  </displayList>
+</component>

BIN
FGUIProject/assets/DailyTask/images/sc_cwcw_1.png


BIN
FGUIProject/assets/DailyTask/images/sc_cwcw_2.png


BIN
FGUIProject/assets/DailyTask/images/sc_cwcw_3.png


+ 12 - 1
FGUIProject/assets/DailyTask/package.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="5mpsibzz">
-  <resources/>
+  <resources>
+    <component id="lh8v27" name="DailyTaskUI.xml" path="/" exported="true"/>
+    <component id="lh8v3" name="Button1.xml" path="/components/"/>
+    <component id="lh8v4" name="Button2.xml" path="/components/"/>
+    <component id="lh8v5" name="ListItem.xml" path="/components/"/>
+    <image id="lh8v0" name="sc_cwcw_1.png" path="/images/"/>
+    <image id="lh8v1" name="sc_cwcw_2.png" path="/images/"/>
+    <image id="lh8v2" name="sc_cwcw_3.png" path="/images/"/>
+    <component id="lh8v6" name="ListRewardItem.xml" path="/components/"/>
+    <component id="lh8v7" name="DailyTaskRewardUI.xml" path="/" exported="true"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyTask" packageCount="2" genCode="true"/>
 </packageDescription>

+ 3 - 0
FGUIProject/assets/Main/MainUI.xml

@@ -10,6 +10,9 @@
     <image id="n9_q08x" name="n9" src="q08xk" fileName="images/zjm_yying.png" xy="0,1491" size="1080,429">
       <relation target="" sidePair="bottom-bottom"/>
     </image>
+    <component id="n46_lh8v" name="btnDailyLogin" src="q08xu" fileName="components/ButtonModle1.xml" xy="6,508">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
     <component id="n7_q08x" name="btnXiuFang" src="q08xu" fileName="components/ButtonModle1.xml" xy="6,790">
       <relation target="" sidePair="bottom-bottom"/>
     </component>

+ 9 - 0
GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class ActivityDataManager : SingletonBase<ActivityDataManager>
+    {
+
+    }
+}

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListRewardItem1.cs.meta → GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 81c42c22d334ca8498f93ffe398a1104
+guid: 44d72542712c5d146840de78c83a0829
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 9 - 0
GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class DailyTaskDataManager : SingletonBase<DailyTaskDataManager>
+    {
+
+    }
+}

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

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_comFosterAni.cs

@@ -9,6 +9,7 @@ namespace UI.ClothingFoster
         public GComponent target;
         public GProgressBar m_proFoster;
         public GTextField m_txtContent;
+        public GGraph m_holder;
         public const string URL = "ui://uicwtr5bnk8d17";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "comFosterAni";
@@ -58,11 +59,13 @@ namespace UI.ClothingFoster
         {
             m_proFoster = (GProgressBar)comp.GetChild("proFoster");
             m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_proFoster = null;
             m_txtContent = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,7 +7,6 @@ namespace UI.CommonGame
     public partial class UI_BuyCountUI
     {
         public GComponent target;
-        public Controller m_c1;
         public GImage m_bg;
         public GButton m_btnAll;
         public GLoader m_icon;
@@ -68,7 +67,6 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
             m_bg = (GImage)comp.GetChild("bg");
             m_btnAll = (GButton)comp.GetChild("btnAll");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -85,7 +83,6 @@ namespace UI.CommonGame
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
             m_bg = null;
             m_btnAll = null;
             m_icon = null;

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

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyLogin
+{
+    public partial class UI_DailyLoginUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://5uawdql9lh8v6";
+        public const string PACKAGE_NAME = "DailyLogin";
+        public const string RES_NAME = "DailyLoginUI";
+        private static UI_DailyLoginUI _proxy;
+
+        public static UI_DailyLoginUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailyLoginUI();
+            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_DailyLoginUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailyLoginUI();
+            }
+            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_list = (GList)comp.GetChild("list");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            m_txtTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs

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

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_ListItem.cs.meta

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

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskRewardUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyTask
+{
+    public partial class UI_DailyTaskRewardUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://5mpsibzzlh8v7";
+        public const string PACKAGE_NAME = "DailyTask";
+        public const string RES_NAME = "DailyTaskRewardUI";
+        private static UI_DailyTaskRewardUI _proxy;
+
+        public static UI_DailyTaskRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailyTaskRewardUI();
+            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_DailyTaskRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailyTaskRewardUI();
+            }
+            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_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskRewardUI.cs.meta

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

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskUI.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyTask
+{
+    public partial class UI_DailyTaskUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public GList m_listReward;
+        public const string URL = "ui://5mpsibzzlh8v27";
+        public const string PACKAGE_NAME = "DailyTask";
+        public const string RES_NAME = "DailyTaskUI";
+        private static UI_DailyTaskUI _proxy;
+
+        public static UI_DailyTaskUI Create(GObject gObject = null)
+        {
+            var ui = new UI_DailyTaskUI();
+            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_DailyTaskUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_DailyTaskUI();
+            }
+            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_list = (GList)comp.GetChild("list");
+            m_listReward = (GList)comp.GetChild("listReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            m_listReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_DailyTaskUI.cs.meta

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

+ 22 - 25
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListRewardItem1.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs

@@ -2,25 +2,24 @@
 
 using FairyGUI;
 
-namespace UI.CommonGame
+namespace UI.DailyTask
 {
-    public partial class UI_ListRewardItem1
+    public partial class UI_ListItem
     {
         public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtName;
+        public Controller m_c1;
+        public GTextField m_txtDesc;
+        public GButton m_btnGet;
+        public GButton m_btnGo;
         public GTextField m_txtCount;
-        public GImage m_imgGot;
-        public GTextField m_txtHasCount;
-        public GLoader m_loaRarity;
-        public const string URL = "ui://eg2y0ldpc21g9j";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ListRewardItem1";
-        private static UI_ListRewardItem1 _proxy;
+        public const string URL = "ui://5mpsibzzlh8v5";
+        public const string PACKAGE_NAME = "DailyTask";
+        public const string RES_NAME = "ListItem";
+        private static UI_ListItem _proxy;
 
-        public static UI_ListRewardItem1 Create(GObject gObject = null)
+        public static UI_ListItem Create(GObject gObject = null)
         {
-            var ui = new UI_ListRewardItem1();
+            var ui = new UI_ListItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -29,11 +28,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ListRewardItem1 Proxy(GObject gObject = null)
+        public static UI_ListItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ListRewardItem1();
+                _proxy = new UI_ListItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -60,21 +59,19 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_c1 = comp.GetController("c1");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
-            m_imgGot = (GImage)comp.GetChild("imgGot");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_loaIcon = null;
-            m_txtName = null;
+            m_c1 = null;
+            m_txtDesc = null;
+            m_btnGet = null;
+            m_btnGo = null;
             m_txtCount = null;
-            m_imgGot = null;
-            m_txtHasCount = null;
-            m_loaRarity = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs.meta

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListRewardItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DailyTask
+{
+    public partial class UI_ListRewardItem
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public const string URL = "ui://5mpsibzzlh8v6";
+        public const string PACKAGE_NAME = "DailyTask";
+        public const string RES_NAME = "ListRewardItem";
+        private static UI_ListRewardItem _proxy;
+
+        public static UI_ListRewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListRewardItem();
+            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_ListRewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListRewardItem();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListRewardItem.cs.meta

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

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Friend/UI_FriendUI.cs

@@ -8,6 +8,7 @@ namespace UI.Friend
     {
         public GComponent target;
         public GButton m_btnBack;
+        public GButton m_btnAdd;
         public const string URL = "ui://wez2ujnnjdju0";
         public const string PACKAGE_NAME = "Friend";
         public const string RES_NAME = "FriendUI";
@@ -56,10 +57,12 @@ namespace UI.Friend
         private void Init(GComponent comp)
         {
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnBack = null;
+            m_btnAdd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 4 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -10,6 +10,7 @@ namespace UI.Main
         public Controller m_c1;
         public UI_ComponentHeadBar m_headBar;
         public GComponent m_valueBar;
+        public UI_ButtonModle1 m_btnDailyLogin;
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnMain;
         public UI_ButtonModle1 m_btnHuanZhuang;
@@ -69,6 +70,7 @@ namespace UI.Main
             m_c1 = comp.GetController("c1");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnDailyLogin = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnDailyLogin"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
@@ -85,6 +87,8 @@ namespace UI.Main
             m_headBar.Dispose();
             m_headBar = null;
             m_valueBar = null;
+            m_btnDailyLogin.Dispose();
+            m_btnDailyLogin = null;
             m_btnXiuFang.Dispose();
             m_btnXiuFang = null;
             m_btnMain.Dispose();

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

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+
+namespace GFGGame
+{
+    public static class ActivitySProxy
+    {
+        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/ActivitySProxy.cs.meta

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

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

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using ET;
+using GFGGame;
+
+
+namespace GFGGame
+{
+    public static class DailyTaskSProxy
+    {
+        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/DailyTaskSProxy.cs.meta

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

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -15,6 +15,8 @@ namespace GFGGame
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
         private GoWrapper _wrapper;
+        private GameObject _gameobject1;
+        private GoWrapper _wrapper1;
         private DressUpObjDataCache _dressUpObjDataCache;
         private bool _actionIsPic;
 
@@ -246,8 +248,9 @@ namespace GFGGame
             _ui.m_comFosterAni.target.visible = true;
             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
             _ui.m_comFosterAni.m_proFoster.value = 0;
-
-            _ui.m_comFosterAni.m_proFoster.TweenValue(100, 2f).OnComplete(() =>
+            string resPath = ResPathUtil.GetViewEffectPath("ui_gcdh", "ui_gcdh_" + (_index + 1));
+            SceneController.AddObjectToView(_gameobject1, _wrapper1, _ui.m_comFosterAni.m_holder, resPath, out _gameobject1, out _wrapper1);
+            _ui.m_comFosterAni.m_proFoster.TweenValue(100, 4f).OnComplete(() =>
             {
                 ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
                 UpdateFoster();

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

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

+ 53 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -0,0 +1,53 @@
+
+using System.Collections.Generic;
+using FairyGUI;
+using UI.DailyLogin;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailyLoginView : BaseWindow
+    {
+        private UI_DailyLoginUI _ui;
+        private List<FieldTaskCfg> _cfgs;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_DailyLoginUI.PACKAGE_NAME;
+            _ui = UI_DailyLoginUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = ListItemRender;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfgs = FieldDataManager.Instance.GetTaskCfgs();
+            _ui.m_list.numItems = _cfgs.Count;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+            // UI_ListItem item = UI_ListItem.Proxy(obj);
+
+
+            // UI_ListItem.ClearProxy();
+        }
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs.meta

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

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

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

+ 52 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskRewardView.cs

@@ -0,0 +1,52 @@
+
+using System.Collections.Generic;
+using FairyGUI;
+using UI.DailyTask;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailyTaskRewardView : BaseWindow
+    {
+        private UI_DailyTaskRewardUI _ui;
+        private List<FieldTaskCfg> _cfgs;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_DailyTaskRewardUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = ListItemRender;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfgs = FieldDataManager.Instance.GetTaskCfgs();
+            _ui.m_list.numItems = _cfgs.Count;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+
+
+            UI_ListItem.ClearProxy();
+        }
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskRewardView.cs.meta

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

+ 60 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -0,0 +1,60 @@
+
+using System.Collections.Generic;
+using FairyGUI;
+using UI.DailyTask;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class DailyTaskView : BaseWindow
+    {
+        private UI_DailyTaskUI _ui;
+        private List<FieldTaskCfg> _cfgs;
+
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_DailyTaskUI.PACKAGE_NAME;
+            _ui = UI_DailyTaskUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_listReward.itemRenderer = ListRewardItemRender;
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfgs = FieldDataManager.Instance.GetTaskCfgs();
+            _ui.m_list.numItems = _cfgs.Count;
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+            UI_ListItem item = UI_ListItem.Proxy(obj);
+
+
+            UI_ListItem.ClearProxy();
+        }
+        private void ListRewardItemRender(int index, GObject obj)
+        {
+            UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
+
+
+            UI_ListRewardItem.ClearProxy();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs.meta

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

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -210,11 +210,13 @@ namespace GFGGame
             UpdateNormal();
             _ui.m_selfName.m_txtName.text = RoleDataManager.roleName;
             _ui.m_targetName.m_txtName.text = fightCfg.targetName;
-            // StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            _ui.m_btnBack.visible = true;
+
             _speed = EquipDataCache.cacher.fightSpeed;
             if (_levelCfg.type == ConstInstanceZonesType.Field)
             {
                 _speed = EquipDataCache.cacher.fieldFightSpeed;
+                _ui.m_btnBack.visible = false;
             }
             _ui.m_btnSpeedUp.visible = _isAutoPlay;
             _ui.m_btnSpeedUp.title = "x" + _speed;

+ 55 - 22
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -51,21 +51,30 @@ namespace GFGGame
         private GameObject _effectObj5;
         private GoWrapper _wrapper5;
 
+        private List<GameObject> _effects = new List<GameObject>();
+        private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        private List<GameObject> _effects1 = new List<GameObject>();
+        private List<GoWrapper> _wrappers1 = new List<GoWrapper>();
+        private UI_ButtonModle1[] _btns;
         public override void Dispose()
         {
             _valueBarController.Dispose();
             _valueBarController = null;
-            SceneController.DestroyObjectFromView(_effectObj0);
-            SceneController.DestroyObjectFromView(_effectObj1);
-            SceneController.DestroyObjectFromView(_effectObj2);
-            SceneController.DestroyObjectFromView(_effectObj3);
-            SceneController.DestroyObjectFromView(_effectObj4);
-            SceneController.DestroyObjectFromView(_effectObj0_1);
-            SceneController.DestroyObjectFromView(_effectObj1_1);
-            SceneController.DestroyObjectFromView(_effectObj2_1);
-            SceneController.DestroyObjectFromView(_effectObj3_1);
-            SceneController.DestroyObjectFromView(_effectObj4_1);
-
+            // SceneController.DestroyObjectFromView(_effectObj0);
+            // SceneController.DestroyObjectFromView(_effectObj1);
+            // SceneController.DestroyObjectFromView(_effectObj2);
+            // SceneController.DestroyObjectFromView(_effectObj3);
+            // SceneController.DestroyObjectFromView(_effectObj4);
+            // SceneController.DestroyObjectFromView(_effectObj0_1);
+            // SceneController.DestroyObjectFromView(_effectObj1_1);
+            // SceneController.DestroyObjectFromView(_effectObj2_1);
+            // SceneController.DestroyObjectFromView(_effectObj3_1);
+            // SceneController.DestroyObjectFromView(_effectObj4_1);
+            for (int i = 0; i < _btns.Length; i++)
+            {
+                SceneController.DestroyObjectFromView(_effects[i]);
+                SceneController.DestroyObjectFromView(_effects[i]);
+            }
             base.Dispose();
         }
 
@@ -98,14 +107,16 @@ namespace GFGGame
 
             // _btnGongGao.visible = false;
             // _btnHaoYou.visible = false;
-            _btnRenWu.visible = false;
+            // _btnRenWu.visible = false;
             _btnPengYouQuan.visible = false;
             _btnJInShu.visible = false;
             _btnTianGong.visible = false;
 
+            _btns = new UI_ButtonModle1[] { _ui.m_btnHuanZhuang, _ui.m_btnZhaiXing, _ui.m_btnDailyLogin, _ui.m_btnXiuFang, _ui.m_btnCiPai, _ui.m_btnStudio, _ui.m_btnField };
             _ui.m_btnMain.target.onTouchBegin.Add(OnClickBtnMain);
             _ui.m_btnHuanZhuang.target.onTouchBegin.Add(OnClickBtnHuanZhuang);
             _ui.m_btnZhaiXing.target.onTouchBegin.Add(OnClickBtnZhaiXing);
+            _ui.m_btnDailyLogin.target.onTouchBegin.Add(OnClickBtnDailyLogin);
             _ui.m_btnXiuFang.target.onTouchBegin.Add(OnClickBtnXiuFang);
             _ui.m_btnCiPai.target.onTouchBegin.Add(OnClickBtnCiPai);
             _ui.m_btnStudio.target.onTouchBegin.Add(OnClickBtnStudio);
@@ -117,6 +128,7 @@ namespace GFGGame
             _btnYouJian.onClick.Add(OnClickBtnYouJian);
             _btnHaoYou.onClick.Add(OnClickBtnHaoYou);
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
+            _btnRenWu.onClick.Add(OnClickBtnRenWu);
 
 
             AddEffect();
@@ -157,18 +169,23 @@ namespace GFGGame
         private void AddEffect()
         {
             string resPath0 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_xf_tx");
-            SceneController.AddObjectToView(_effectObj0, _wrapper0, _ui.m_btnXiuFang.m_holder, resPath0, out _effectObj0, out _wrapper0);
-            SceneController.AddObjectToView(_effectObj1, _wrapper1, _ui.m_btnHuanZhuang.m_holder, resPath0, out _effectObj1, out _wrapper1);
-            SceneController.AddObjectToView(_effectObj2, _wrapper2, _ui.m_btnZhaiXing.m_holder, resPath0, out _effectObj2, out _wrapper2);
-            SceneController.AddObjectToView(_effectObj3, _wrapper3, _ui.m_btnCiPai.m_holder, resPath0, out _effectObj3, out _wrapper3);
+            string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_dj");
+            for (int i = 0; i < _btns.Length; i++)
+            {
+                GameObject gameObject0;
+                GoWrapper wrapper0;
+                GameObject gameObject1;
+                GoWrapper wrapper1;
+                SceneController.AddObjectToView(null, null, _btns[i].m_holder, resPath0, out gameObject0, out wrapper0);
+                SceneController.AddObjectToView(null, null, _btns[i].m_holder1, resPath3, out gameObject1, out wrapper1);
+                _effects.Add(gameObject0);
+                _wrappers.Add(wrapper0);
+                _effects1.Add(gameObject1);
+                _wrappers1.Add(wrapper1);
+            }
+
             string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zzl_tx");
             SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4, out _wrapper4);
-
-            string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_dj");
-            SceneController.AddObjectToView(_effectObj0_1, _wrapper0_1, _ui.m_btnXiuFang.m_holder1, resPath3, out _effectObj0_1, out _wrapper0_1);
-            SceneController.AddObjectToView(_effectObj1_1, _wrapper1_1, _ui.m_btnHuanZhuang.m_holder1, resPath3, out _effectObj1_1, out _wrapper1_1);
-            SceneController.AddObjectToView(_effectObj2_1, _wrapper2_1, _ui.m_btnZhaiXing.m_holder1, resPath3, out _effectObj2_1, out _wrapper2_1);
-            SceneController.AddObjectToView(_effectObj3_1, _wrapper3_1, _ui.m_btnCiPai.m_holder1, resPath3, out _effectObj3_1, out _wrapper3_1);
             SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
 
             string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
@@ -239,6 +256,18 @@ namespace GFGGame
 
             });
         }
+        private void OnClickBtnDailyLogin()
+        {
+            if (isOpen) return;
+            isOpen = true;
+            _ui.m_btnDailyLogin.m_holder1.visible = true;
+            Timers.inst.Add(effectTime, 1, (param) =>
+            {
+                _ui.m_btnDailyLogin.m_holder1.visible = false;
+                ViewManager.Show<DailyLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+                isOpen = false;
+            });
+        }
         private void OnClickBtnCiPai()
         {
             if (isOpen) return;
@@ -285,6 +314,10 @@ namespace GFGGame
             // /null, new object[] { ViewName.MAINUI_VIEW, this.viewData }
             ViewManager.Show<NoticeView>();
         }
+        private void OnClickBtnRenWu()
+        {
+            ViewManager.Show<DailyTaskView>();
+        }
         private void OnClickHeadBar()
         {
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);

BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


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


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

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

BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_fui.bytes.meta

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

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

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

BIN
GameClient/Assets/ResIn/UI/DailyTask/DailyTask_atlas0.png


+ 96 - 0
GameClient/Assets/ResIn/UI/DailyTask/DailyTask_atlas0.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 3c15ace13b1362c49aa120377f5355b8
+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/DailyTask/DailyTask_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/DailyTask/DailyTask_fui.bytes.meta

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

BIN
GameClient/Assets/ResIn/UI/Friend/Friend_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes