添加服务器列表

FGUIProject/assets/Common/package.xml

@@ -9,7 +9,7 @@
     <image id="q08xo" name="ANNIU_3.png" path="/imagesExport/" exported="true"/>
     <component id="q08xu" name="Button3.xml" path="/components/" exported="true"/>
     <sound id="qp4l4p" name="click.mp3" path="/sound/" exported="true"/>
-    <image id="qp4l4q" name="zx_jq_rwbszik_normal.png" path="/imagesExport/"/>
+    <image id="qp4l4q" name="zx_jq_rwbszik_normal.png" path="/imagesExport/" exported="true"/>
     <image id="qp4l4r" name="zx_jq_rwbszik_success.png" path="/imagesExport/"/>
     <image id="qp4l4s" name="zx_jq_rwbszik_warning.png" path="/imagesExport/"/>
     <component id="qp4l4t" name="FloatingTextPromptWarningUI.xml" path="/" exported="true"/>

FGUIProject/assets/DailyTask/DailyTaskUI.xml

@@ -1,14 +1,14 @@
 <?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">
+    <list id="n0_lh8v" name="list" xy="126,167" size="522,412" overflow="scroll" lineGap="20" defaultItem="ui://5mpsibzzlh8v5" align="center" autoClearItems="true">
       <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">
+    <list id="n1_lh8v" name="listReward" xy="127,31" size="546,88" layout="row" colGap="20" defaultItem="ui://5mpsibzzlh8v6" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/DailyTask/components/ListItem.xml

@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="533,90">
-  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="c1" pages="1,,2,,3," selected="1">
+    <remark page="0" value="可领取"/>
+    <remark page="1" value="未完成"/>
+    <remark page="2" value="已领取"/>
+  </controller>
+  <controller name="c2" alias="是否跳转" pages="0,,1," selected="1"/>
   <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">
+      <gearDisplay controller="c1" pages="1"/>
       <Button title="领取"/>
     </component>
-    <component id="n4_lh8v" name="btnGo" src="lh8v4" fileName="components/Button2.xml" xy="383,50"/>
+    <component id="n4_lh8v" name="btnGo" src="lh8v4" fileName="components/Button2.xml" xy="383,50">
+      <gearDisplay controller="c1" pages="2"/>
+      <gearDisplay2 controller="c2" pages="1" condition="0"/>
+      <Button title="前往"/>
+    </component>
     <text id="n5_lh8v" name="txtCount" xy="424,0" size="70,49" fontSize="36" align="center" text="0/5"/>
   </displayList>
 </component>

FGUIProject/assets/Launcher/LauncherUI.xml

@@ -4,22 +4,24 @@
     <image id="n0_l55o" name="bg" src="ul4p6" fileName="imagesExport/jz_tu.jpg" xy="0,-240" size="1080,2400">
       <relation target="" sidePair="middle-middle"/>
     </image>
-    <component id="n2_l55o" name="progressBar" src="l55o5" fileName="components/ProgressBar1.xml" xy="73,1556" size="934,18">
+    <component id="n2_l55o" name="progressBar" src="l55o5" fileName="components/ProgressBar1.xml" xy="0,1751" size="1041,18">
       <relation target="" sidePair="bottom-bottom"/>
       <ProgressBar value="100" max="100"/>
     </component>
-    <text id="n3_l55o" name="txtDescLeft" xy="70,1491" size="900,44" fontSize="32" color="#ffffff" autoSize="none" strokeColor="#333333" text="启动中...">
+    <text id="n3_l55o" name="txtDescLeft" xy="90,1787" size="900,44" fontSize="32" color="#ffffff" align="center" autoSize="none" strokeColor="#333333" text="启动中...">
       <relation target="" sidePair=""/>
       <relation target="n2_l55o" sidePair="top-top"/>
     </text>
     <text id="n5_l55o" name="txtVersion" xy="870,32" size="200,42" fontSize="30" color="#ffffff" align="right" autoSize="none" strokeColor="#333333" text="v 1.0.0">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <image id="n6_lqt1" name="imgLogo" src="lqt1a" fileName="imagesExport/LOGO.png" xy="39,80"/>
-    <text id="n8_lqt1" name="txtBottom" xy="40,1629" size="1000,71" fontSize="26" color="#eaeaea" align="center" autoSize="none" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
+    <image id="n6_lqt1" name="imgLogo" src="lqt1a" fileName="imagesExport/LOGO.png" xy="31,45" visible="false">
+      <relation target="" sidePair="left-left,top-top"/>
+    </image>
+    <text id="n8_lqt1" name="txtBottom" xy="41,1787" size="1000,71" visible="false" fontSize="26" color="#eaeaea" align="center" autoSize="none" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
-    <text id="n9_v0op" name="txtDescRight" xy="109,1491" size="900,44" fontSize="32" color="#ffffff" align="right" autoSize="none" strokeColor="#333333" autoClearText="true" text="1/1">
+    <text id="n9_v0op" name="txtDescRight" xy="90,1840" size="900,44" fontSize="32" color="#ffffff" align="center" autoSize="none" strokeColor="#333333" autoClearText="true" text="1/1">
       <relation target="" sidePair=""/>
       <relation target="n2_l55o" sidePair="top-top"/>
     </text>

FGUIProject/assets/Launcher/components/ProgressBar1.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="200,18" extention="ProgressBar">
+<component size="128,14" extention="ProgressBar">
   <displayList>
-    <image id="n3_l55o" name="n3" src="ul4p7" fileName="images/jz_bar_bg.png" xy="-11,-11" size="223,41">
+    <image id="n3_l55o" name="n3" src="pcull" fileName="images/kqjm_jdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width"/>
     </image>
-    <image id="n2_l55o" name="bar" src="ul4p9" fileName="images/jz_bar.png" xy="0,0" size="200,18">
+    <image id="n2_l55o" name="bar" src="pculm" fileName="images/kqjm_jdt_2.png" xy="0,-56">
       <relation target="" sidePair="width-width"/>
     </image>
-    <image id="n4_ul4p" name="n4" src="ul4p8" fileName="images/jz_bar_r.png" xy="63,-44">
+    <image id="n4_ul4p" name="n4" src="pculn" fileName="images/kqjm_jdt_3.png" xy="131,-5">
       <relation target="n2_l55o" sidePair="right-right,top-top"/>
     </image>
   </displayList>

FGUIProject/assets/Launcher/package.xml

@@ -17,6 +17,9 @@
     <component id="k0v5i" name="Button1.xml" path="/components/"/>
     <component id="k0v5j" name="Button2.xml" path="/components/"/>
     <image id="wgy9k" name="hc_kuang_6.png" path="/images/" scale="9grid" scale9grid="49,57,16,10"/>
+    <image id="pcull" name="kqjm_jdt_1.png" path="/images/"/>
+    <image id="pculm" name="kqjm_jdt_2.png" path="/images/" scale="9grid" scale9grid="0,59,111,9"/>
+    <image id="pculn" name="kqjm_jdt_3.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Login/LoginUI.xml

@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n1_ul4p" name="btnStart" src="ul4p6" fileName="components/ButtonKS.xml" xy="129,1419">
-      <relation target="" sidePair="bottom-bottom"/>
-    </component>
-    <text id="n2_ul4p" name="txtBottom" xy="40,1629" size="1000,71" fontSize="26" color="#eaeaea" align="center" autoSize="none" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
+    <text id="n2_ul4p" name="txtBottom" xy="40,1751" size="1000,71" fontSize="24" color="#fff9f1" align="center" autoSize="none" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
-    <component id="n3_ul4p" name="btnNotice" src="ul4p7" fileName="components/ButtonGG.xml" xy="959,420"/>
-    <component id="n4_ul4p" name="btnLogout" src="ul4p8" fileName="components/ButtonZX.xml" xy="962,583"/>
-    <image id="n5_m1tb" name="imgLogo" src="lqt1a" fileName="imagesExport/LOGO.png" pkg="mgs5yrnj" xy="39,80"/>
+    <image id="n5_m1tb" name="imgLogo" src="lqt1a" fileName="imagesExport/LOGO.png" pkg="mgs5yrnj" xy="31,45">
+      <relation target="" sidePair="left-left,top-top"/>
+    </image>
     <text id="n6_bx8o" name="txtVersion" xy="870,32" size="200,42" fontSize="30" color="#ffffff" align="right" autoSize="none" strokeColor="#333333" text="v 1.0.0">
       <relation target="" sidePair="top-top"/>
     </text>
+    <component id="n3_ul4p" name="btnNotice" src="pcul5e" fileName="components/Button3.xml" xy="960,156" group="n7_pcul">
+      <Button icon="ui://myoktu7ppcul56"/>
+    </component>
+    <component id="n4_ul4p" name="btnLogout" src="pcul5e" fileName="components/Button3.xml" xy="960,316" group="n7_pcul">
+      <Button icon="ui://myoktu7ppcul5d"/>
+    </component>
+    <group id="n7_pcul" name="n7" xy="960,156" size="92,273" advanced="true" layout="vt" lineGap="47" excludeInvisibles="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <component id="n1_ul4p" name="btnStart" src="ul4p6" fileName="components/ButtonKS.xml" xy="419,1560">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
+    <component id="n12_pcul" name="btnChange" src="pcul5f" fileName="components/Button4.xml" xy="211,1336">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </component>
   </displayList>
 </component>

FGUIProject/assets/Login/ServerListUI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="939,982">
+  <displayList>
+    <image id="n0_pcul" name="n0" src="ozsv4r" fileName="images/dl_ditu_1.png" xy="0,0"/>
+    <image id="n5_pcul" name="n5" src="ozsv4w" fileName="images/dl_xiant_1.png" xy="69,320"/>
+    <image id="n6_pcul" name="n6" src="ozsv4x" fileName="images/dl_xian_2.png" xy="16,109"/>
+    <text id="n7_pcul" name="n7" xy="392,88" size="154,52" fontSize="38" color="#b28054" text="选择区服"/>
+    <text id="n8_pcul" name="n8" xy="158,166" size="152,42" fontSize="30" color="#cba482" text="最近登录："/>
+    <text id="n9_pcul" name="n9" xy="158,352" size="152,42" fontSize="30" color="#cba482" text="所有区服："/>
+    <component id="n4_pcul" name="btnCurServer" src="pcul55" fileName="components/Button2.xml" xy="158,220" controller="button,1"/>
+    <list id="n1_pcul" name="list" xy="157,407" size="624,461" overflow="scroll" lineGap="20" defaultItem="ui://myoktu7ppcul55" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

FGUIProject/assets/Login/components/Button1.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="50,44" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_pcul" name="n0" src="ozsv4s" fileName="images/dl_gogo_1.png" xy="0,0">
+      <gearDisplay controller="button" pages="0,2"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_pcul" name="n1" src="ozsv4t" fileName="images/dl_gogo_2.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Login/components/Button2.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="620,70" extention="Button">
+  <controller name="button" exported="true" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n3_pcul" name="n3" src="ozsv4p" fileName="images/dl_anniu_1.png" xy="0,0" size="620,70">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n4_pcul" name="n4" src="ozsv4q" fileName="images/dl_anniu_2.png" xy="0,0" size="620,70">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n7_pcul" name="n7" src="ozsv4s" fileName="images/dl_gogo_1.png" xy="10,12">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n8_pcul" name="n8" src="ozsv4t" fileName="images/dl_gogo_2.png" xy="10,12">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <text id="n6_pcul" name="txtTitle" xy="131,10" size="243,49" fontSize="36" color="#8c7b6c" text="一区  微雨燕飞">
+      <gearColor controller="button" pages="0" values="#8c7b6c,#000000" default="#fdf5e8,#000000"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

FGUIProject/assets/Login/components/Button3.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="92,113" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_pcul" name="icon" xy="0,0" size="92,113" url="ui://myoktu7ppcul5b" autoSize="true"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Login/components/Button4.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="658,67" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_pcul" name="n0" src="pcul57" fileName="images/kqjm_huanqu.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_pcul" name="title" xy="0,-2" size="658,67" fontSize="36" color="#fff8ee" align="center" vAlign="middle" autoSize="none" singleLine="true" text="一区  巴啦啦">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <text id="n2_pcul" name="n2" xy="510,10" size="63,42" fontSize="30" color="#fee7c7" text="换区"/>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/Login/components/ButtonGG.xml

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

FGUIProject/assets/Login/components/ButtonKS.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="822,153" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+<component size="241,48" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ul4p" src="ul4p1" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_ul4p" name="n0" src="ul4p1" fileName="images/djks.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button/>
 </component>

FGUIProject/assets/Login/components/ButtonZX.xml

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

FGUIProject/assets/Login/package.xml

@@ -3,13 +3,7 @@
   <resources>
     <component id="l55o0" name="LoginUI.xml" path="/" exported="true"/>
     <image id="ul4p1" name="djks.png" path="/images/"/>
-    <image id="ul4p2" name="GG.png" path="/images/"/>
-    <image id="ul4p3" name="KF.png" path="/images/"/>
-    <image id="ul4p4" name="XF.png" path="/images/"/>
-    <image id="ul4p5" name="ZX.png" path="/images/"/>
     <component id="ul4p6" name="ButtonKS.xml" path="/components/"/>
-    <component id="ul4p7" name="ButtonGG.xml" path="/components/"/>
-    <component id="ul4p8" name="ButtonZX.xml" path="/components/"/>
     <component id="q08x9" name="NoticeUI.xml" path="/" exported="true"/>
     <component id="q08xc" name="LoginInputUI.xml" path="/" exported="true"/>
     <component id="q08xj" name="ButtonRegister.xml" path="/components/"/>
@@ -21,8 +15,8 @@
     <component id="u67n12" name="RegisterUIBackup.xml" path="/" exported="true"/>
     <component id="u67n4n" name="FullScreenTextUI.xml" path="/" exported="true"/>
     <component id="u67n4o" name="Component2.xml" path="/components/"/>
-    <image id="ozsv4p" name="dl_anniu_1.png" path="/images/"/>
-    <image id="ozsv4q" name="dl_anniu_2.png" path="/images/"/>
+    <image id="ozsv4p" name="dl_anniu_1.png" path="/images/" scale="9grid" scale9grid="53,17,106,34"/>
+    <image id="ozsv4q" name="dl_anniu_2.png" path="/images/" scale="9grid" scale9grid="53,17,106,34"/>
     <image id="ozsv4r" name="dl_ditu_1.png" path="/images/"/>
     <image id="ozsv4s" name="dl_gogo_1.png" path="/images/"/>
     <image id="ozsv4t" name="dl_gogo_2.png" path="/images/"/>
@@ -34,6 +28,19 @@
     <image id="ozsv4z" name="dl_ziti_1.png" path="/images/"/>
     <image id="ozsv50" name="dl_ziti_2.png" path="/images/"/>
     <image id="ozsv51" name="dl_zzc.png" path="/images/"/>
+    <component id="pcul52" name="ServerListUI.xml" path="/" exported="true"/>
+    <component id="pcul54" name="Button1.xml" path="/components/"/>
+    <component id="pcul55" name="Button2.xml" path="/components/"/>
+    <image id="pcul56" name="kqjm_gg.png" path="/images/"/>
+    <image id="pcul57" name="kqjm_huanqu.png" path="/images/"/>
+    <image id="pcul58" name="kqjm_jdt_1.png" path="/images/"/>
+    <image id="pcul59" name="kqjm_jdt_2.png" path="/images/"/>
+    <image id="pcul5a" name="kqjm_jdt_3.png" path="/images/"/>
+    <image id="pcul5b" name="kqjm_kf.png" path="/images/"/>
+    <image id="pcul5c" name="kqjm_xf.png" path="/images/"/>
+    <image id="pcul5d" name="kqjm_zx.png" path="/images/"/>
+    <component id="pcul5e" name="Button3.xml" path="/components/"/>
+    <component id="pcul5f" name="Button4.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Login" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -46,5 +46,7 @@ namespace GFGGame
         public const string BUY_GIFT_SUCCESS = "BUY_GIFT_SUCCESS";//购买礼包成功
         public const string BUY_EXCHANGE_SUCCESS = "BUY_EXCHANGE_SUCCESS";//商城兑换成功
 
+        public const string SERVER_CHANGE = "SERVER_CHANGE";//更换区服
+
     }
 }

GameClient/Assets/Game/HotUpdate/Data/DailyTaskDataManager.cs

@@ -1,9 +1,41 @@
 using System.Collections.Generic;
+using ET;
 
 namespace GFGGame
 {
     public class DailyTaskDataManager : SingletonBase<DailyTaskDataManager>
     {
 
+        /// <summary>
+        /// 获取任务列表
+        /// </summary>
+        /// <returns></returns>
+        public List<DailyTaskCfg> GetDailyTaskCfgs()
+        {
+            List<DailyTaskCfg> cfgs = new List<DailyTaskCfg>();
+            DailyTaskCfg[] datas = DailyTaskCfgArray.Instance.dataArray;
+            for (int i = 0; i < datas.Length; i++)
+            {
+                if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < datas[i].lv) continue;
+                cfgs.Add(datas[i]);
+            }
+            cfgs.Sort((DailyTaskCfg a, DailyTaskCfg b) =>
+            {
+                int stateA = GetTaskStateById(a.id);
+                int stateB = GetTaskStateById(b.id);
+                return stateA.CompareTo(stateB);
+            });
+            return cfgs;
+        }
+
+        /// <summary>
+        /// 根据任务id获取任务状态
+        /// </summary>0可领取，1未完成，2已领取
+        /// <param name="taskId"></param>
+        /// <returns></returns>
+        public int GetTaskStateById(int taskId)
+        {
+            return 1;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/ETCodes/Model/App/ServerInfo/ServerInfosComponent.cs

@@ -7,5 +7,7 @@ namespace ET
         public List<ServerInfo> ServerInfoList = new List<ServerInfo>();
 
         public int CurrentServerId = 1;
+
+        public ServerInfo recentlyServerInfo;
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyTask/UI_ListItem.cs

@@ -8,6 +8,7 @@ namespace UI.DailyTask
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GTextField m_txtDesc;
         public GButton m_btnGet;
         public GButton m_btnGo;
@@ -60,6 +61,7 @@ namespace UI.DailyTask
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_btnGet = (GButton)comp.GetChild("btnGet");
             m_btnGo = (GButton)comp.GetChild("btnGo");
@@ -68,6 +70,7 @@ namespace UI.DailyTask
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_txtDesc = null;
             m_btnGet = null;
             m_btnGo = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_Button2.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Login
+{
+    public partial class UI_Button2
+    {
+        public GButton target;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://myoktu7ppcul55";
+        public const string PACKAGE_NAME = "Login";
+        public const string RES_NAME = "Button2";
+        private static UI_Button2 _proxy;
+
+        public static UI_Button2 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button2();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button2();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_Button2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_LoginUI.cs

@@ -7,12 +7,13 @@ namespace UI.Login
     public partial class UI_LoginUI
     {
         public GComponent target;
-        public GButton m_btnStart;
         public GTextField m_txtBottom;
-        public GButton m_btnNotice;
-        public GButton m_btnLogout;
         public GImage m_imgLogo;
         public GTextField m_txtVersion;
+        public GButton m_btnNotice;
+        public GButton m_btnLogout;
+        public GButton m_btnStart;
+        public GButton m_btnChange;
         public const string URL = "ui://myoktu7pl55o0";
         public const string PACKAGE_NAME = "Login";
         public const string RES_NAME = "LoginUI";
@@ -60,21 +61,23 @@ namespace UI.Login
 
         private void Init(GComponent comp)
         {
-            m_btnStart = (GButton)comp.GetChild("btnStart");
             m_txtBottom = (GTextField)comp.GetChild("txtBottom");
-            m_btnNotice = (GButton)comp.GetChild("btnNotice");
-            m_btnLogout = (GButton)comp.GetChild("btnLogout");
             m_imgLogo = (GImage)comp.GetChild("imgLogo");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
+            m_btnNotice = (GButton)comp.GetChild("btnNotice");
+            m_btnLogout = (GButton)comp.GetChild("btnLogout");
+            m_btnStart = (GButton)comp.GetChild("btnStart");
+            m_btnChange = (GButton)comp.GetChild("btnChange");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnStart = null;
             m_txtBottom = null;
-            m_btnNotice = null;
-            m_btnLogout = null;
             m_imgLogo = null;
             m_txtVersion = null;
+            m_btnNotice = null;
+            m_btnLogout = null;
+            m_btnStart = null;
+            m_btnChange = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_ServerListUI.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_ServerListUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskRewardView.cs

@@ -9,7 +9,7 @@ namespace GFGGame
     public class DailyTaskRewardView : BaseWindow
     {
         private UI_DailyTaskRewardUI _ui;
-        private List<FieldTaskCfg> _cfgs;
+        private DailyActiveRewardCfg _cfg;
 
         public override void Dispose()
         {
@@ -26,14 +26,14 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_list.onClickItem.Add(OnClickListReward);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _cfgs = FieldDataManager.Instance.GetTaskCfgs();
-            _ui.m_list.numItems = _cfgs.Count;
-
+            _cfg = this.viewData as DailyActiveRewardCfg;
+            _ui.m_list.numItems = _cfg.rewardsArr.Length;
         }
 
         protected override void OnHide()
@@ -43,10 +43,14 @@ namespace GFGGame
         private void ListItemRender(int index, GObject obj)
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
-
+            item.target.data = _cfg.rewardsArr[index];
 
             UI_ListItem.ClearProxy();
         }
-
+        private void OnClickListReward(EventContext context)
+        {
+            ItemData data = (context.data as GObject).data as ItemData;
+            GoodsItemTipsController.ShowItemTips(data.id);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -9,7 +9,8 @@ namespace GFGGame
     public class DailyTaskView : BaseWindow
     {
         private UI_DailyTaskUI _ui;
-        private List<FieldTaskCfg> _cfgs;
+        private List<DailyTaskCfg> _cfgs;
+        private List<DailyActiveRewardCfg> _rewardCfgs;
 
         public override void Dispose()
         {
@@ -33,9 +34,10 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _cfgs = FieldDataManager.Instance.GetTaskCfgs();
+            _cfgs = DailyTaskDataManager.Instance.GetDailyTaskCfgs();
+            _rewardCfgs = new List<DailyActiveRewardCfg>(DailyActiveRewardCfgArray.Instance.dataArray);
             _ui.m_list.numItems = _cfgs.Count;
-
+            _ui.m_listReward.numItems = _rewardCfgs.Count;
         }
 
         protected override void OnHide()
@@ -45,16 +47,50 @@ namespace GFGGame
         private void ListItemRender(int index, GObject obj)
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
+            item.m_c1.selectedIndex = DailyTaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 0 : 1;
 
+            if (item.m_btnGet.data == null)
+            {
+                item.m_btnGet.onClick.Add(OnBtnGetClick);
+            }
+            item.m_btnGet.data = _cfgs[index].id;
+            if (item.m_btnGo.data == null && _cfgs[index].jumpId != "")
+            {
+                item.m_btnGo.onClick.Add(OnBtnGoClick);
+            }
+            item.m_btnGo.data = _cfgs[index].jumpId;
 
             UI_ListItem.ClearProxy();
         }
+        private void OnBtnGetClick(EventContext context)
+        {
+            GObject btnGet = context.sender as GObject;
+
+        }
+        private void OnBtnGoClick(EventContext context)
+        {
+            GObject btnGo = context.sender as GObject;
+            ViewManager.Show(btnGo.data.ToString(), null, new object[] { typeof(DailyTaskView).Name, this.viewData });
+        }
         private void ListRewardItemRender(int index, GObject obj)
         {
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
 
-
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnRewardItemClick);
+            }
+            item.target.data = _rewardCfgs[index];
             UI_ListRewardItem.ClearProxy();
         }
+
+        private void OnRewardItemClick(EventContext context)
+        {
+            GObject item = context.sender as GObject;
+            // UI_ListRewardItem item = UI_ListRewardItem.Proxy(context.data as GObject);
+
+            ViewManager.Show<DailyTaskRewardView>(item.data);
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using FairyGUI;
 using UI.Login;
+using ET;
 
 namespace GFGGame
 {
@@ -40,6 +41,11 @@ namespace GFGGame
             _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
 
             _ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
+
+            EventAgent.AddEventListener(ConstMessage.SERVER_CHANGE, OnSeverChangeListener);
+
+            _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
+
         }
 
         protected override void OnShown()
@@ -56,6 +62,15 @@ namespace GFGGame
             {
                 ViewManager.Show<LoginInputView>();
             }
+            ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
+            if (serverInfosComponent.ServerInfoList.Count <= 1)
+            {
+                _ui.m_btnChange.visible = false;
+                return;
+            }
+
+            ServerInfo recentlyServerInfo = serverInfosComponent.recentlyServerInfo;
+            UpdateServer(recentlyServerInfo);
         }
 
         protected override void OnHide()
@@ -67,7 +82,21 @@ namespace GFGGame
             }
             base.OnHide();
         }
+        private void UpdateServer(ServerInfo info)
+        {
+            _ui.m_btnChange.title = string.Format("{0}区  {1}", NumberUtil.GetChiniseNumberText((int)info.Id), info.ServerName);
+        }
+        private void OnSeverChangeListener(EventContext context)
+        {
+            int index = (int)context.data;
+            ServerInfosComponent serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
 
+            UpdateServer(serverInfosComponent.ServerInfoList[index]);
+        }
+        private void OnBtnChangeClick()
+        {
+            ViewManager.Show<ServerListView>();
+        }
         private void OnClickBtnNotice()
         {
             ViewManager.Show<SystemNoticeView>();

GameClient/Assets/Game/HotUpdate/Views/Login/ServerListView.cs

@@ -0,0 +1,63 @@
+using ET;
+using FairyGUI;
+using UI.Login;
+
+namespace GFGGame
+{
+    public class ServerListView : BaseWindow
+    {
+        private UI_ServerListUI _ui;
+        private ServerInfosComponent serverInfosComponent;
+        public override void Dispose()
+        {
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_ServerListUI.Create();
+            this.viewCom = _ui.target;
+            this.viewCom.Center();
+            this.modal = true;
+
+            _ui.m_list.itemRenderer = ListItemRender;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+            _ui.m_list.SetVirtual();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
+            if (serverInfosComponent.ServerInfoList.Count <= 0)
+            {
+                _ui.m_btnCurServer.target.visible = false;
+                return;
+            }
+
+            ServerInfo recentlyServerInfo = serverInfosComponent.recentlyServerInfo;
+            _ui.m_btnCurServer.m_txtTitle.text = string.Format("{0}区  {1}", NumberUtil.GetChiniseNumberText((int)recentlyServerInfo.Id), recentlyServerInfo.ServerName);
+            _ui.m_list.numItems = serverInfosComponent.ServerInfoList.Count;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void ListItemRender(int index, GObject obj)
+        {
+            UI_Button2 item = UI_Button2.Proxy(obj);
+            item.m_txtTitle.text = string.Format("{0}区  {1}", NumberUtil.GetChiniseNumberText((int)serverInfosComponent.ServerInfoList[index].Id), serverInfosComponent.ServerInfoList[index].ServerName);
+            item.target.data = index;
+        }
+        private void OnListItemClick(EventContext context)
+        {
+            GObject item = context.sender as GObject;
+            int index = (int)item.data;
+            serverInfosComponent.CurrentServerId = (int)serverInfosComponent.ServerInfoList[index].Id;
+            EventAgent.DispatchEvent(ConstMessage.SERVER_CHANGE, index);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Login/ServerListView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -149,7 +149,7 @@ namespace GFGGame
                 if (!view.isShowing)
                 {
                     view.Show();
-                    Debug.Log("��ǰ�򿪣�" + name);
+                    Debug.Log("当前打开：" + name);
                 }
                 else
                 {