田野调查

FGUIProject/assets/CommonGame/package.xml

@@ -183,6 +183,8 @@
     <image id="dmsi1h" name="sc_xtxtxt.png" path="/images/" scale="9grid" scale9grid="12,0,44,2"/>
     <image id="iftfta9" name="sc_tc_kuang_2.png" path="/images/"/>
     <component id="dcrotaa" name="Component2.xml" path="/components/"/>
+    <image id="ohuntac" name="zhuxian_shuoto.png" path="/imagesExport/" exported="true"/>
+    <image id="ohuntad" name="zhangjie_bg_1.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="800,600">
+<component size="936,783">
   <displayList>
-    <component id="n0_s20j" name="btnConfirm" src="s20je" fileName="components/Button5.xml" xy="325,439">
+    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,783"/>
+    <list id="n2_ohun" name="list" xy="116,203" size="717,240" layout="row" overflow="scroll" lineGap="20" defaultItem="ui://eg2y0ldpj48o98" align="center">
+      <item/>
+    </list>
+    <text id="n3_ohun" name="txtTitle" xy="370,40" size="196,64" fontSize="48" color="#9b7853" text="挑战完成"/>
+    <component id="n0_s20j" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,600">
       <Button title="确定"/>
     </component>
+    <text id="n4_ohun" name="txtNum" xy="380,140" size="175,46" fontSize="34" color="#a17d5f" text="第20/20轮"/>
+    <image id="n5_ohun" name="n5" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="44,120"/>
+    <text id="n7_ohun" name="txtHas" xy="338,463" pivot="0.5,0" size="260,49" fontSize="36" color="#a17d5f" text="已拥有：38000"/>
+    <text id="n8_ohun" name="n8" xy="326,531" size="148,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="本次消耗"/>
+    <loader id="n9_ohun" name="loaCost" xy="475,530" size="50,50" group="n11_ohun" url="ui://eg2y0ldpq08x4"/>
+    <text id="n10_ohun" name="txtCostNum" xy="541,531" size="69,49" group="n11_ohun" fontSize="36" color="#a17d5f" text="x16"/>
+    <group id="n11_ohun" name="n11" xy="326,530" size="284,50"/>
   </displayList>
 </component>

FGUIProject/assets/Field/FieldFightInfoUI.xml

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="800,600">
+<component size="936,915">
   <displayList>
-    <component id="n0_s20j" name="btnStop" src="s20jc" fileName="components/Button4.xml" xy="325,429">
+    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,915"/>
+    <image id="n4_ohun" name="n4" src="ohunw" fileName="images/tydc_npckuang.png" xy="328,408"/>
+    <image id="n3_ohun" name="n3" src="ohunx" fileName="images/tydc_npcdik.png" xy="45,500"/>
+    <component id="n0_s20j" name="btnStop" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="278,726">
       <Button title="中止挑战"/>
     </component>
+    <loader id="n5_ohun" name="loaNpc" xy="443,400" pivot="0.5,1" size="50,50" autoSize="true"/>
+    <text id="n6_ohun" name="txtName" xy="370,407" pivot="0.5,0" size="196,64" fontSize="48" color="#887256" text="名字名字"/>
+    <text id="n8_ohun" name="txtNum" xy="716,435" size="175,46" fontSize="34" color="#a17d5f" text="第20/20轮"/>
+    <text id="n7_ohun" name="txtDesc" xy="73,525" size="793,100" fontSize="38" color="#9f8f73" autoSize="height" text="放马过来吧！祝福大家旗开得胜，心想事成祝福 大家旗开得胜，心想事成"/>
+    <text id="n9_ohun" name="txtTime" xy="293,838" pivot="0.5,0" size="350,49" fontSize="36" color="#bb674e" text="3秒后自动进入下一轮"/>
   </displayList>
 </component>

FGUIProject/assets/Field/FieldTaskUI.xml

@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="800,600">
+<component size="824,993">
   <displayList>
-    <list id="n0_s20j" name="list" xy="41,98" size="717,465" overflow="scroll" lineGap="20" defaultItem="ui://5oh3t798s20ja">
+    <image id="n1_ohun" name="n1" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="824,993"/>
+    <list id="n0_s20j" name="list" xy="53,218" size="717,675" overflow="scroll" lineGap="20" defaultItem="ui://5oh3t798s20ja">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <text id="n2_ohun" name="txtTitle" xy="311,40" size="202,66" fontSize="50" color="#9b7853" text="上限提升"/>
+    <image id="n3_ohun" name="n3" src="ehs99" fileName="images/yx_xiant_1.png" pkg="eg2y0ldp" xy="-12,120"/>
+    <text id="n4_ohun" name="txtDecs" xy="173,137" size="478,42" fontSize="30" color="#c67764" text="完成指定目标后可提升每周奖励上限"/>
   </displayList>
 </component>

FGUIProject/assets/Field/FieldUI.xml

@@ -2,24 +2,47 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <image id="n0_8jo9" name="n0" src="8jo91" fileName="images/zjm_bj_1.jpg" xy="0,-240">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <image id="n10_ohun" name="n10" src="ohuntad" fileName="bgimg/zhangjie_bg_1.jpg" pkg="eg2y0ldp" xy="0,-240">
+      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </image>
-    <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n5_s20j" name="btn0" src="s20j4" fileName="components/Button1.xml" xy="157,355">
-      <Button checked="true" title="初" controller="c1" page="0"/>
+    <component id="n1_8jo9" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="30,80">
+      <relation target="" sidePair="left-left,top-top"/>
     </component>
-    <component id="n6_s20j" name="btn1" src="s20j4" fileName="components/Button1.xml" xy="463,355">
-      <Button title="中" controller="c1" page="1"/>
+    <component id="n11_ohun" name="comBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90">
+      <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n7_s20j" name="btn2" src="s20j4" fileName="components/Button1.xml" xy="756,355">
-      <Button title="高" controller="c1" page="2"/>
+    <image id="n12_ohun" name="n12" src="ohuni" fileName="images/tydc_jbkuang_1.png" xy="166,202" group="n19_ohun"/>
+    <component id="n5_s20j" name="btn0" src="s20j4" fileName="components/Button1.xml" xy="166,202" group="n19_ohun">
+      <Button checked="true" title="初级" icon="ui://5oh3t798ohunk" controller="c1" page="0"/>
     </component>
-    <component id="n8_s20j" name="btnGo" src="s20j7" fileName="components/Button2.xml" xy="432,1292">
-      <Button title="调查"/>
+    <component id="n6_s20j" name="btn1" src="s20j4" fileName="components/Button1.xml" xy="416,202" group="n19_ohun">
+      <Button title="中级" icon="ui://5oh3t798ohunl" controller="c1" page="1"/>
     </component>
-    <component id="n9_s20j" name="btnTask" src="s20j7" fileName="components/Button2.xml" xy="246,1676">
+    <component id="n7_s20j" name="btn2" src="s20j4" fileName="components/Button1.xml" xy="666,202" group="n19_ohun">
+      <Button title="高级" icon="ui://5oh3t798ohunm" controller="c1" page="2"/>
+    </component>
+    <group id="n19_ohun" name="grpTab" xy="166,202" size="748,70" advanced="true"/>
+    <image id="n14_ohun" name="n14" src="ohunf" fileName="images/tydc_ztkuang.png" xy="258,343" group="n18_ohun"/>
+    <text id="n15_ohun" name="n15" xy="419,345" size="184,49" group="n18_ohun" fontSize="36" color="#fef1cc" text="本期主题："/>
+    <text id="n16_ohun" name="txtScore" xy="605,346" size="40,59" group="n18_ohun" fontSize="36" color="#fee398" autoSize="none" text="风"/>
+    <group id="n18_ohun" name="grpScore" xy="258,343" size="564,62" advanced="true"/>
+    <component id="n8_s20j" name="btnGo" src="s20j7" fileName="components/Button2.xml" xy="403,1223"/>
+    <text id="n20_ohun" name="txtMaxLv" xy="392,1538" pivot="0.5,0" size="295,49" fontSize="36" color="#fdf9df" strokeColor="#947550" strokeSize="2" text="最高记录：10/30"/>
+    <image id="n21_ohun" name="n21" src="ohunq" fileName="images/tydc_sldk.png" xy="402,1591" group="n24_ohun"/>
+    <loader id="n22_ohun" name="loaConsume" xy="456,1594" size="60,60" group="n24_ohun" url="ui://eg2y0ldpq08x4"/>
+    <text id="n23_ohun" name="txtConsume" xy="535,1594" size="101,54" group="n24_ohun" fontSize="40" color="#f4dba2" text="x666"/>
+    <group id="n24_ohun" name="grpconsume" xy="402,1591" size="276,64" advanced="true"/>
+    <image id="n25_ohun" name="n25" src="ohunh" fileName="images/tydc_dikuang_1.png" xy="0,1722" group="n29_ohun"/>
+    <component id="n9_s20j" name="btnTask" src="ohuny" fileName="components/Button6.xml" xy="476,1737" group="n29_ohun">
       <Button title="上限提升"/>
     </component>
+    <component id="n26_ohun" name="proTaskReward" src="ohunz" fileName="components/ProgressBar1.xml" xy="198,1790" group="n29_ohun">
+      <ProgressBar value="50" max="100"/>
+    </component>
+    <loader id="n28_ohun" name="loaTaskReward" xy="89,1758" size="50,50" group="n29_ohun"/>
+    <image id="n27_ohun" name="n27" src="ohunp" fileName="images/tydc_mzjl.png" xy="40,1826" group="n29_ohun"/>
+    <group id="n29_ohun" name="grpTaskReward" xy="0,1722" size="756,176" advanced="true">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Field/components/Button1.xml

@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="252,130" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+<component size="248,70" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="c1" alias="是否开启" pages="0,,1," selected="0">
+    <remark page="0" value="未开启"/>
+    <remark page="1" value="已开启"/>
+  </controller>
   <displayList>
-    <image id="n4_s20j" name="n4" src="s20j5" fileName="images/sc_cwcw_2.png" xy="0,-102">
-      <gearDisplay controller="button" pages="0"/>
-    </image>
-    <image id="n5_s20j" name="n5" src="s20j6" fileName="images/sc_cwcw_3.png" xy="0,-102">
+    <image id="n6_ohun" name="n6" src="ohunj" fileName="images/tydc_jbkuang_2.png" xy="2,0">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <text id="n3_s20j" name="title" xy="0,-14" size="252,159" fontSize="40" align="center" vAlign="middle" autoSize="none" singleLine="true" text="初">
-      <relation target="" sidePair="width-width,height-height"/>
+    <text id="n3_s20j" name="title" xy="-18,0" size="248,67" fontSize="38" color="#fff8df" align="center" vAlign="middle" autoSize="none" singleLine="true" text="初级">
+      <gearDisplay controller="button" pages="0"/>
+      <gearColor controller="button" pages="1" values="#fff8df,#fef6d9" default="#e3d49f,#000000"/>
     </text>
+    <loader id="n7_ohun" name="icon" xy="61,11" size="88,51" url="ui://5oh3t798ohunk" autoSize="true">
+      <gearDisplay controller="button" pages="1"/>
+    </loader>
+    <image id="n8_ohun" name="n8" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="149,25" scale="0.7,0.7">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Field/components/Button2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="252,130" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+<component size="274,321" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n4_s20j" name="n4" src="s20j5" fileName="images/sc_cwcw_2.png" xy="1,-102"/>
-    <text id="n3_s20j" name="title" xy="0,-14" size="252,159" fontSize="40" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <image id="n4_s20j" name="n4" src="ohung" fileName="images/tydc_dcanniu.png" xy="0,0"/>
+    <text id="n3_s20j" name="title" xy="0,-14" size="274,350" fontSize="40" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Field/components/Button3.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="200,60" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+<component size="230,73" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <graph id="n0_s20j" name="n0" xy="0,0" size="200,60" touchable="false" type="rect" lineSize="0" fillColor="#fff0f0f0">
-      <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n1_s20j" name="n1" xy="0,0" size="200,60" touchable="false" type="rect" lineSize="0" fillColor="#fffafafa">
-      <gearDisplay controller="button" pages="2"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <graph id="n2_s20j" name="n2" xy="0,0" size="200,60" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
-      <gearDisplay controller="button" pages="1,3"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <text id="n3_s20j" name="title" xy="0,0" size="200,60" fontSize="30" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+    <image id="n4_ohun" name="n4" src="ohunt" fileName="images/tydc_sxtsan_1.png" xy="0,0">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
+    <image id="n5_ohun" name="n5" src="ohunu" fileName="images/tydc_sxtsan_2.png" xy="1,0">
+      <gearDisplay controller="c1" pages="1"/>
+    </image>
+    <image id="n6_ohun" name="n6" src="ohunv" fileName="images/tydc_sxtsan_3.png" xy="1,0">
+      <gearDisplay controller="c1" pages="2"/>
+    </image>
+    <text id="n3_s20j" name="txtTitle" xy="0,0" size="230,73" fontSize="34" color="#faf0d7" align="center" vAlign="middle" autoSize="none" singleLine="true" text="每周上限+20">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

FGUIProject/assets/Field/components/Button6.xml

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

FGUIProject/assets/Field/components/ListItem.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="654,60">
+<component size="740,131">
   <displayList>
-    <text id="n1_s20j" name="txtDesc" xy="0,5" size="292,49" fontSize="36" text="初级难度挑战成功"/>
-    <component id="n2_s20j" name="btnGet" src="s20j9" fileName="components/Button3.xml" xy="454,0">
+    <image id="n3_ohun" name="n3" src="ohuns" fileName="images/tydc_sxtsdk.png" xy="0,0"/>
+    <text id="n1_s20j" name="txtDesc" xy="43,35" size="305,52" fontSize="38" color="#bb996c" text="初级难度挑战成功"/>
+    <component id="n2_s20j" name="btnGet" src="s20j9" fileName="components/Button3.xml" xy="480,29">
       <Button title="每周上限+10"/>
     </component>
   </displayList>

FGUIProject/assets/Field/components/ProgressBar1.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="262,14" extention="ProgressBar">
+  <displayList>
+    <image id="n0_ohun" name="n0" src="ohunn" fileName="images/tydc_jdt_1.png" xy="0,0" size="262,14">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_ohun" name="bar" src="ohuno" fileName="images/tydc_jdt_2.png" xy="0,2" size="262,10"/>
+    <text id="n2_ohun" name="title" xy="0,16" size="262,46" fontSize="34" color="#f4dba2" align="center" vAlign="middle" autoSize="none" text="100/800">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <ProgressBar titleType="valueAndmax"/>
+</component>

FGUIProject/assets/Field/package.xml

@@ -2,7 +2,6 @@
 <packageDescription id="5oh3t798">
   <resources>
     <component id="8jo90" name="FieldUI.xml" path="/" exported="true"/>
-    <image id="8jo91" name="zjm_bj_1.jpg" path="/images/" atlas="alone_npot"/>
     <component id="s20j4" name="Button1.xml" path="/components/"/>
     <image id="s20j5" name="sc_cwcw_2.png" path="/images/"/>
     <image id="s20j6" name="sc_cwcw_3.png" path="/images/"/>
@@ -14,6 +13,27 @@
     <component id="s20jc" name="Button4.xml" path="/components/"/>
     <component id="s20jd" name="FieldFightEndUI.xml" path="/" exported="true"/>
     <component id="s20je" name="Button5.xml" path="/components/"/>
+    <image id="ohunf" name="tydc_ztkuang.png" path="/images/"/>
+    <image id="ohung" name="tydc_dcanniu.png" path="/images/"/>
+    <image id="ohunh" name="tydc_dikuang_1.png" path="/images/"/>
+    <image id="ohuni" name="tydc_jbkuang_1.png" path="/images/"/>
+    <image id="ohunj" name="tydc_jbkuang_2.png" path="/images/"/>
+    <image id="ohunk" name="tydc_jbzi_1.png" path="/images/"/>
+    <image id="ohunl" name="tydc_jbzi_2.png" path="/images/"/>
+    <image id="ohunm" name="tydc_jbzi_3.png" path="/images/"/>
+    <image id="ohunn" name="tydc_jdt_1.png" path="/images/"/>
+    <image id="ohuno" name="tydc_jdt_2.png" path="/images/"/>
+    <image id="ohunp" name="tydc_mzjl.png" path="/images/"/>
+    <image id="ohunq" name="tydc_sldk.png" path="/images/"/>
+    <image id="ohunr" name="tydc_sxtssx.png" path="/images/"/>
+    <image id="ohuns" name="tydc_sxtsdk.png" path="/images/"/>
+    <image id="ohunt" name="tydc_sxtsan_1.png" path="/images/"/>
+    <image id="ohunu" name="tydc_sxtsan_2.png" path="/images/"/>
+    <image id="ohunv" name="tydc_sxtsan_3.png" path="/images/"/>
+    <image id="ohunw" name="tydc_npckuang.png" path="/images/"/>
+    <image id="ohunx" name="tydc_npcdik.png" path="/images/"/>
+    <component id="ohuny" name="Button6.xml" path="/components/"/>
+    <component id="ohunz" name="ProgressBar1.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -8,10 +8,13 @@ namespace GFGGame
         /// 本期主题
         /// </summary>
         public int scoreType = 1;
-
         public Dictionary<int, int> _levelIdDic = new Dictionary<int, int>();
         private Dictionary<int, int> _taskDic = new Dictionary<int, int>();
 
+        /// <summary>
+        /// 当前难度
+        /// </summary>
+        public int difficulty = 0;
 
 
         public void UpdateTask(int taskId, int state)
@@ -75,7 +78,7 @@ namespace GFGGame
         /// <returns></returns>
         public int GetTaskState(int taskId)
         {
-            return _taskDic.ContainsKey(taskId) ? _taskDic[taskId] : 0;
+            return _taskDic.ContainsKey(taskId) ? _taskDic[taskId] : 1;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button1.cs

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button1.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button3.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Field
+{
+    public partial class UI_Button3
+    {
+        public GButton target;
+        public Controller m_c1;
+        public GTextField m_txtTitle;
+        public const string URL = "ui://5oh3t798s20j9";
+        public const string PACKAGE_NAME = "Field";
+        public const string RES_NAME = "Button3";
+        private static UI_Button3 _proxy;
+
+        public static UI_Button3 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button3();
+            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_Button3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button3();
+            }
+            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_c1 = comp.GetController("c1");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_txtTitle = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_Button3.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldFightEndUI.cs

@@ -7,7 +7,13 @@ namespace UI.Field
     public partial class UI_FieldFightEndUI
     {
         public GComponent target;
+        public GList m_list;
+        public GTextField m_txtTitle;
         public GButton m_btnConfirm;
+        public GTextField m_txtNum;
+        public GTextField m_txtHas;
+        public GLoader m_loaCost;
+        public GTextField m_txtCostNum;
         public const string URL = "ui://5oh3t798s20jd";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "FieldFightEndUI";
@@ -55,11 +61,23 @@ namespace UI.Field
 
         private void Init(GComponent comp)
         {
+            m_list = (GList)comp.GetChild("list");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtHas = (GTextField)comp.GetChild("txtHas");
+            m_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtCostNum = (GTextField)comp.GetChild("txtCostNum");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_list = null;
+            m_txtTitle = null;
             m_btnConfirm = null;
+            m_txtNum = null;
+            m_txtHas = null;
+            m_loaCost = null;
+            m_txtCostNum = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldFightInfoUI.cs

@@ -8,6 +8,11 @@ namespace UI.Field
     {
         public GComponent target;
         public GButton m_btnStop;
+        public GLoader m_loaNpc;
+        public GTextField m_txtName;
+        public GTextField m_txtNum;
+        public GTextField m_txtDesc;
+        public GTextField m_txtTime;
         public const string URL = "ui://5oh3t798s20jb";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "FieldFightInfoUI";
@@ -56,10 +61,20 @@ namespace UI.Field
         private void Init(GComponent comp)
         {
             m_btnStop = (GButton)comp.GetChild("btnStop");
+            m_loaNpc = (GLoader)comp.GetChild("loaNpc");
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnStop = null;
+            m_loaNpc = null;
+            m_txtName = null;
+            m_txtNum = null;
+            m_txtDesc = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldTaskUI.cs

@@ -8,6 +8,8 @@ namespace UI.Field
     {
         public GComponent target;
         public GList m_list;
+        public GTextField m_txtTitle;
+        public GTextField m_txtDecs;
         public const string URL = "ui://5oh3t798s20j8";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "FieldTaskUI";
@@ -56,10 +58,14 @@ namespace UI.Field
         private void Init(GComponent comp)
         {
             m_list = (GList)comp.GetChild("list");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtDecs = (GTextField)comp.GetChild("txtDecs");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_list = null;
+            m_txtTitle = null;
+            m_txtDecs = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldUI.cs

@@ -9,11 +9,22 @@ namespace UI.Field
         public GComponent target;
         public Controller m_c1;
         public GButton m_btnBack;
-        public GButton m_btn0;
-        public GButton m_btn1;
-        public GButton m_btn2;
+        public GComponent m_comBar;
+        public UI_Button1 m_btn0;
+        public UI_Button1 m_btn1;
+        public UI_Button1 m_btn2;
+        public GGroup m_grpTab;
+        public GTextField m_txtScore;
+        public GGroup m_grpScore;
         public GButton m_btnGo;
+        public GTextField m_txtMaxLv;
+        public GLoader m_loaConsume;
+        public GTextField m_txtConsume;
+        public GGroup m_grpconsume;
         public GButton m_btnTask;
+        public GProgressBar m_proTaskReward;
+        public GLoader m_loaTaskReward;
+        public GGroup m_grpTaskReward;
         public const string URL = "ui://5oh3t7988jo90";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "FieldUI";
@@ -63,21 +74,46 @@ namespace UI.Field
         {
             m_c1 = comp.GetController("c1");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_btn0 = (GButton)comp.GetChild("btn0");
-            m_btn1 = (GButton)comp.GetChild("btn1");
-            m_btn2 = (GButton)comp.GetChild("btn2");
+            m_comBar = (GComponent)comp.GetChild("comBar");
+            m_btn0 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn0"));
+            m_btn1 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn1"));
+            m_btn2 = (UI_Button1)UI_Button1.Create(comp.GetChild("btn2"));
+            m_grpTab = (GGroup)comp.GetChild("grpTab");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
             m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_txtMaxLv = (GTextField)comp.GetChild("txtMaxLv");
+            m_loaConsume = (GLoader)comp.GetChild("loaConsume");
+            m_txtConsume = (GTextField)comp.GetChild("txtConsume");
+            m_grpconsume = (GGroup)comp.GetChild("grpconsume");
             m_btnTask = (GButton)comp.GetChild("btnTask");
+            m_proTaskReward = (GProgressBar)comp.GetChild("proTaskReward");
+            m_loaTaskReward = (GLoader)comp.GetChild("loaTaskReward");
+            m_grpTaskReward = (GGroup)comp.GetChild("grpTaskReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_btnBack = null;
+            m_comBar = null;
+            m_btn0.Dispose();
             m_btn0 = null;
+            m_btn1.Dispose();
             m_btn1 = null;
+            m_btn2.Dispose();
             m_btn2 = null;
+            m_grpTab = null;
+            m_txtScore = null;
+            m_grpScore = null;
             m_btnGo = null;
+            m_txtMaxLv = null;
+            m_loaConsume = null;
+            m_txtConsume = null;
+            m_grpconsume = null;
             m_btnTask = null;
+            m_proTaskReward = null;
+            m_loaTaskReward = null;
+            m_grpTaskReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,7 @@ namespace UI.Field
     {
         public GComponent target;
         public GTextField m_txtDesc;
-        public GButton m_btnGet;
+        public UI_Button3 m_btnGet;
         public const string URL = "ui://5oh3t798s20ja";
         public const string PACKAGE_NAME = "Field";
         public const string RES_NAME = "ListItem";
@@ -57,11 +57,12 @@ namespace UI.Field
         private void Init(GComponent comp)
         {
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
-            m_btnGet = (GButton)comp.GetChild("btnGet");
+            m_btnGet = (UI_Button3)UI_Button3.Create(comp.GetChild("btnGet"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtDesc = null;
+            m_btnGet.Dispose();
             m_btnGet = null;
             if(disposeTarget && target != null)
             {

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

@@ -45,6 +45,13 @@ namespace GFGGame
             UI_ListItem item = UI_ListItem.Proxy(obj);
             item.target.data = _cfg.rewardsArr[index];
 
+            ItemData reward = new ItemData();
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+
             UI_ListItem.ClearProxy();
         }
         private void OnClickListReward(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/Field/FieldFightEndView.cs

@@ -1,4 +1,5 @@
 
+using FairyGUI;
 using UI.Field;
 using UnityEngine;
 
@@ -23,6 +24,7 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_list.itemRenderer = ListItemRender;
         }
 
         protected override void OnShown()
@@ -30,11 +32,27 @@ namespace GFGGame
             base.OnShown();
 
         }
-
+        private void UpdateView()
+        {
+            FieldCfg fieldCfg = FieldCfgArray.Instance.GetCfgs(FieldDataManager.Instance.difficulty)[0];
+            string num = StringUtil.GetColorText(string.Format("{0}/{1}", 0, fieldCfg.num), "#BB674E");
+            _ui.m_txtNum.text = string.Format("第{0}轮", num);
+        }
         protected override void OnHide()
         {
             base.OnHide();
         }
 
+        private void ListItemRender(int index, GObject obj)
+        {
+
+            ItemData reward = new ItemData();
+            if (obj.data == null)
+            {
+                obj.data = new ItemView(obj as GComponent);
+            }
+            (obj.data as ItemView).SetData(reward);
+
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Field/FieldFightInfoView.cs

@@ -1,4 +1,5 @@
 
+using FairyGUI;
 using UI.Field;
 using UnityEngine;
 
@@ -7,8 +8,10 @@ namespace GFGGame
     public class FieldFightInfoView : BaseWindow
     {
         private UI_FieldFightInfoUI _ui;
+        private StoryLevelCfg _storyLevelCfg;
+        private StoryFightCfg _storyFightCfg;
 
-
+        private int _time = 3;
         public override void Dispose()
         {
             base.Dispose();
@@ -23,17 +26,55 @@ namespace GFGGame
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
+            _ui.m_btnStop.onClick.Add(OnBtnStopClick);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
+            _time = 3;
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            _ui.m_txtName.text = _storyFightCfg.targetName;
+            _ui.m_txtDesc.text = _storyLevelCfg.desc;
+            FieldCfg fieldCfg = FieldCfgArray.Instance.GetCfgs(FieldDataManager.Instance.difficulty)[0];
+            string num = StringUtil.GetColorText(string.Format("{0}/{1}", 0, fieldCfg.num), "#BB674E");
+            _ui.m_txtNum.text = string.Format("第{0}轮", num);
+            _ui.m_loaNpc.url = ResPathUtil.GetNpcHeadPath(_storyFightCfg.targetRes);
+            _ui.m_txtTime.text = string.Format("{0}秒后自动进入下一轮", _time);
+            Timers.inst.Add(1, _time, OnTimerUpdate, 1);
 
         }
 
+        private void OnTimerUpdate(object param)
+        {
+            _time -= (int)param;
+            if (_time == 0)
+            {
+                Timers.inst.Remove(OnTimerUpdate);
+                this.Hide();
+            }
+            _ui.m_txtTime.text = string.Format("{0}秒后自动进入下一轮", _time);
+        }
+        private void OnBtnStopClick()
+        {
+            Timers.inst.Remove(OnTimerUpdate);
+            Alert.Show("确认中止本轮挑战？")
+            .SetLeftButton(true, "取消", (object data) =>
+            {
+                Timers.inst.Add(1, _time, OnTimerUpdate, 1);
+            })
+            .SetRightButton(true, "中止", (object data) =>
+            {
+                this.Hide();
+            });
+        }
         protected override void OnHide()
         {
             base.OnHide();
+
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/Field/FieldTaskView.cs

@@ -6,11 +6,14 @@ using UnityEngine;
 
 namespace GFGGame
 {
+
+
     public class FieldTaskView : BaseWindow
     {
         private UI_FieldTaskUI _ui;
         private List<FieldTaskCfg> _cfgs;
 
+        private string[] difficulty = new string[] { "初级", "中级", "高级" };
         public override void Dispose()
         {
             base.Dispose();
@@ -44,8 +47,22 @@ namespace GFGGame
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
-
+            item.m_txtDesc.text = string.Format("{0}难度挑战成功", difficulty[_cfgs[index].subType]);
+            item.m_btnGet.m_txtTitle.text = string.Format("每周上限+{0}", _cfgs[index].addRewardLimit);
+            item.m_btnGet.m_c1.selectedIndex = FieldDataManager.Instance.GetTaskState(_cfgs[index].id);
+            if (item.m_btnGet.target.data == null)
+            {
+                item.m_btnGet.target.onClick.Add(OnBtnGetClick);
+            }
+            item.m_btnGet.target.data = item.m_btnGet.m_c1.selectedIndex;
             UI_ListItem.ClearProxy();
         }
+        private void OnBtnGetClick(EventContext context)
+        {
+            if ((int)(context.sender as GObject).data == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("每周奖励领取成功");
+            }
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -34,10 +34,13 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            FieldDataManager.Instance.difficulty = _ui.m_c1.selectedIndex;
             _curCfg = FieldDataManager.Instance.GetFieldCfgByDifficulty(_ui.m_c1.selectedIndex);
             _curLevelId = FieldDataManager.Instance.GetLevelIdByDifficulty(_ui.m_c1.selectedIndex);
 
-
+            UpdateView();
+            _ui.m_proTaskReward.max = 100;
+            _ui.m_proTaskReward.value = 88;
         }
 
         protected override void OnHide()
@@ -52,13 +55,21 @@ namespace GFGGame
 
         private void OnDifficultyChange()
         {
+            FieldDataManager.Instance.difficulty = _ui.m_c1.selectedIndex;
             _curCfg = FieldDataManager.Instance.GetFieldCfgByDifficulty(_ui.m_c1.selectedIndex);
             _curLevelId = FieldDataManager.Instance.GetLevelIdByDifficulty(_ui.m_c1.selectedIndex);
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            _ui.m_txtScore.text = ConstDressUpScoreType.scoreTypeList()[FieldDataManager.Instance.scoreType].ToString();
+            _ui.m_txtMaxLv.text = string.Format("最高记录:{0}/{1}", 0, _curCfg.num);
+            _ui.m_txtConsume.text = string.Format("x{0}", _curCfg.needPower);
         }
-
-
         private void OnClickBtnGo()
         {
+            // ViewManager.Show<FieldFightInfoView>();
+
             if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Power) < _curCfg.needPower)
             {
                 PromptController.Instance.ShowFloatTextPrompt("体力不足");

GameClient/Assets/ResIn/UI/Field/Field_atlas_8jo91.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_ohuntad.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bef5be85eb0673b4ea3e4c25c34255d0
+guid: 1855226b05325e247a2d7d670af7d068
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}