zhaoyang 3 жил өмнө
parent
commit
8daeedc13a
32 өөрчлөгдсөн 652 нэмэгдсэн , 5 устгасан
  1. 8 0
      FGUIProject/assets/Field/FieldFightEndUI.xml
  2. 8 0
      FGUIProject/assets/Field/FieldFightInfoUI.xml
  3. 10 0
      FGUIProject/assets/Field/FieldTaskUI.xml
  4. 25 0
      FGUIProject/assets/Field/FieldUI.xml
  5. 16 0
      FGUIProject/assets/Field/components/Button1.xml
  6. 16 0
      FGUIProject/assets/Field/components/Button2.xml
  7. 22 0
      FGUIProject/assets/Field/components/Button3.xml
  8. 22 0
      FGUIProject/assets/Field/components/Button4.xml
  9. 22 0
      FGUIProject/assets/Field/components/Button5.xml
  10. 9 0
      FGUIProject/assets/Field/components/ListItem.xml
  11. BIN
      FGUIProject/assets/Field/images/sc_cwcw_2.png
  12. BIN
      FGUIProject/assets/Field/images/sc_cwcw_3.png
  13. BIN
      FGUIProject/assets/Field/images/zjm_bj_1.jpg
  14. 19 0
      FGUIProject/assets/Field/package.xml
  15. 1 1
      FGUIProject/assets/Main/MainUI.xml
  16. 1 0
      GameClient/Assets/Editor/Excel/ExcelScanner.cs
  17. 57 0
      GameClient/Assets/Editor/Excel/Scanner/FieldScanner.cs
  18. 11 0
      GameClient/Assets/Editor/Excel/Scanner/FieldScanner.cs.meta
  19. 0 4
      GameClient/Assets/Editor/Excel/Scanner/GiftBagScanner.cs
  20. 8 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field.meta
  21. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldFightEndUI.cs
  22. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldFightInfoUI.cs
  23. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldStageRewardUI.cs
  24. 89 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldUI.cs
  25. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_ListItem.cs
  26. 6 0
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs
  27. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  28. 8 0
      GameClient/Assets/ResIn/UI/Field.meta
  29. BIN
      GameClient/Assets/ResIn/UI/Field/Field_atlas0.png
  30. BIN
      GameClient/Assets/ResIn/UI/Field/Field_atlas_8jo91.png
  31. BIN
      GameClient/Assets/ResIn/UI/Field/Field_fui.bytes
  32. 7 0
      GameClient/Assets/ResIn/UI/Field/Field_fui.bytes.meta

+ 8 - 0
FGUIProject/assets/Field/FieldFightEndUI.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="800,600">
+  <displayList>
+    <component id="n0_s20j" name="btnConfirm" src="s20je" fileName="components/Button5.xml" xy="325,439">
+      <Button title="确定"/>
+    </component>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Field/FieldFightInfoUI.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="800,600">
+  <displayList>
+    <component id="n0_s20j" name="btnStop" src="s20jc" fileName="components/Button4.xml" xy="325,429">
+      <Button title="中止挑战"/>
+    </component>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/Field/FieldTaskUI.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="800,600">
+  <displayList>
+    <list id="n0_s20j" name="list" xy="41,98" size="717,465" overflow="scroll" lineGap="20" defaultItem="ui://5oh3t798s20ja">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 25 - 0
FGUIProject/assets/Field/FieldUI.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>
+    <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 title="初" controller="c1" page="0"/>
+    </component>
+    <component id="n6_s20j" name="btn1" src="s20j4" fileName="components/Button1.xml" xy="463,355">
+      <Button title="中" controller="c1" page="1"/>
+    </component>
+    <component id="n7_s20j" name="btn2" src="s20j4" fileName="components/Button1.xml" xy="756,355">
+      <Button title="高" controller="c1" page="2"/>
+    </component>
+    <component id="n8_s20j" name="btnGo" src="s20j7" fileName="components/Button2.xml" xy="432,1292">
+      <Button title="调查"/>
+    </component>
+    <component id="n9_s20j" name="btnReward" src="s20j7" fileName="components/Button2.xml" xy="246,1676">
+      <Button title="上限提升"/>
+    </component>
+  </displayList>
+</component>

+ 16 - 0
FGUIProject/assets/Field/components/Button1.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="252,130" 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="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">
+      <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>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

+ 16 - 0
FGUIProject/assets/Field/components/Button2.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="252,130" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n4_s20j" name="n4" src="s20j5" fileName="images/sc_cwcw_2.png" xy="1,-102">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <image id="n5_s20j" name="n5" src="s20j6" fileName="images/sc_cwcw_3.png" xy="0,-102">
+      <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>
+  </displayList>
+  <Button/>
+</component>

+ 22 - 0
FGUIProject/assets/Field/components/Button3.xml

@@ -0,0 +1,22 @@
+<?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"/>
+  <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="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 22 - 0
FGUIProject/assets/Field/components/Button4.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n0_s20j" name="n0" xy="0,0" size="150,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="150,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="150,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="150,60" fontSize="36" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 22 - 0
FGUIProject/assets/Field/components/Button5.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,60" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <graph id="n0_s20j" name="n0" xy="0,0" size="150,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="150,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="150,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="150,60" fontSize="36" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button/>
+</component>

+ 9 - 0
FGUIProject/assets/Field/components/ListItem.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="654,60">
+  <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">
+      <Button title="每周上限+10"/>
+    </component>
+  </displayList>
+</component>

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


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


BIN
FGUIProject/assets/Field/images/zjm_bj_1.jpg


+ 19 - 0
FGUIProject/assets/Field/package.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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/"/>
+    <component id="s20j7" name="Button2.xml" path="/components/"/>
+    <component id="s20j8" name="FieldTaskUI.xml" path="/" exported="true"/>
+    <component id="s20j9" name="Button3.xml" path="/components/"/>
+    <component id="s20ja" name="ListItem.xml" path="/components/"/>
+    <component id="s20jb" name="FieldFightInfoUI.xml" path="/" exported="true"/>
+    <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/"/>
+  </resources>
+  <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true"/>
+</packageDescription>

+ 1 - 1
FGUIProject/assets/Main/MainUI.xml

@@ -33,7 +33,7 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kkqhddo"/>
     </component>
-    <component id="n45_kqhd" name="btnSurvey" src="q08xu" fileName="components/ButtonModle1.xml" xy="561,1455" visible="false">
+    <component id="n45_kqhd" name="btnSurvey" src="q08xu" fileName="components/ButtonModle1.xml" xy="561,1455">
       <relation target="" sidePair="bottom-bottom"/>
       <Button icon="ui://mfvz4q8kkqhddn"/>
     </component>

+ 1 - 0
GameClient/Assets/Editor/Excel/ExcelScanner.cs

@@ -20,6 +20,7 @@ namespace GFGEditor
             CardScanner.StartScan();
 
             GiftBagScanner.StartScan();
+            FieldScanner.StartScan();
         }
     }
 }

+ 57 - 0
GameClient/Assets/Editor/Excel/Scanner/FieldScanner.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using GFGGame;
+
+namespace GFGEditor
+{
+    public class FieldScanner
+    {
+        private static Dictionary<int, int> numDic = new Dictionary<int, int>();
+        private static Dictionary<int, int> needPowerDic = new Dictionary<int, int>();
+
+        public static void StartScan()
+        {
+            numDic.Clear();
+            needPowerDic.Clear();
+            var dataArray = FieldCfgArray.Instance.dataArray;
+
+            // for (int i = dataArray.Length - 1; i >= 0; i--)
+            // {
+            for (int i = 0; i < dataArray.Length; i++)
+            {
+                FieldCfg cfg = dataArray[i];
+                List<StoryLevelCfg> storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgs(cfg.type, cfg.subType, cfg.id);
+                int num = storyLevelCfgs.Count;
+                int needPower = 0;
+                for (int j = 0; j < num; j++)
+                {
+                    needPower += storyLevelCfgs[j].power;
+                }
+                numDic.Add(cfg.id, num);
+                needPowerDic.Add(cfg.id, needPower);
+            }
+
+            SQLiteHelper.Instance.OpenConnection();
+            try
+            {
+                foreach (var cfg in dataArray)
+                {
+                    var num = numDic[cfg.id];
+                    var needPower = needPowerDic[cfg.id];
+
+                    var names = new string[] { nameof(cfg.num), nameof(cfg.needPower) };
+                    var values = new string[] { "" + num, "" + needPower };
+                    SQLiteHelper.Instance.UpdateValues(nameof(FieldCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
+                }
+            }
+            catch (Exception e)
+            {
+                ET.Log.Error(e.ToString());
+            }
+            finally
+            {
+                SQLiteHelper.Instance.CloseConnection();
+            }
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Editor/Excel/Scanner/FieldScanner.cs.meta

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

+ 0 - 4
GameClient/Assets/Editor/Excel/Scanner/GiftBagScanner.cs

@@ -50,10 +50,6 @@ namespace GFGEditor
             {
                 SQLiteHelper.Instance.CloseConnection();
             }
-
-            //写入
-            // WriteStoryChapter();
-            // WriteStudioChapter();
         }
     }
 }

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldFightEndUI.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_FieldFightEndUI
+    {
+        public GComponent target;
+        public GButton m_btnConfirm;
+        public const string URL = "ui://5oh3t798s20jd";
+        public const string PACKAGE_NAME = "Field";
+        public const string RES_NAME = "FieldFightEndUI";
+        private static UI_FieldFightEndUI _proxy;
+
+        public static UI_FieldFightEndUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldFightEndUI();
+            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_FieldFightEndUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldFightEndUI();
+            }
+            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_btnConfirm = (GButton)comp.GetChild("btnConfirm");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnConfirm = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldFightInfoUI.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_FieldFightInfoUI
+    {
+        public GComponent target;
+        public GButton m_btnStop;
+        public const string URL = "ui://5oh3t798s20jb";
+        public const string PACKAGE_NAME = "Field";
+        public const string RES_NAME = "FieldFightInfoUI";
+        private static UI_FieldFightInfoUI _proxy;
+
+        public static UI_FieldFightInfoUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldFightInfoUI();
+            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_FieldFightInfoUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldFightInfoUI();
+            }
+            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_btnStop = (GButton)comp.GetChild("btnStop");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnStop = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldStageRewardUI.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_FieldStageRewardUI
+    {
+        public GComponent target;
+        public GList m_list;
+        public const string URL = "ui://5oh3t798s20j8";
+        public const string PACKAGE_NAME = "Field";
+        public const string RES_NAME = "FieldStageRewardUI";
+        private static UI_FieldStageRewardUI _proxy;
+
+        public static UI_FieldStageRewardUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldStageRewardUI();
+            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_FieldStageRewardUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldStageRewardUI();
+            }
+            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;
+        }
+    }
+}

+ 89 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_FieldUI.cs

@@ -0,0 +1,89 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Field
+{
+    public partial class UI_FieldUI
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GButton m_btnBack;
+        public GButton m_btn0;
+        public GButton m_btn1;
+        public GButton m_btn2;
+        public GButton m_btnGo;
+        public GButton m_btnReward;
+        public const string URL = "ui://5oh3t7988jo90";
+        public const string PACKAGE_NAME = "Field";
+        public const string RES_NAME = "FieldUI";
+        private static UI_FieldUI _proxy;
+
+        public static UI_FieldUI Create(GObject gObject = null)
+        {
+            var ui = new UI_FieldUI();
+            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_FieldUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_FieldUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_c1 = comp.GetController("c1");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btn0 = (GButton)comp.GetChild("btn0");
+            m_btn1 = (GButton)comp.GetChild("btn1");
+            m_btn2 = (GButton)comp.GetChild("btn2");
+            m_btnGo = (GButton)comp.GetChild("btnGo");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_btnBack = null;
+            m_btn0 = null;
+            m_btn1 = null;
+            m_btn2 = null;
+            m_btnGo = null;
+            m_btnReward = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Field/UI_ListItem.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_ListItem
+    {
+        public GComponent target;
+        public GTextField m_txtDesc;
+        public GButton m_btnGet;
+        public const string URL = "ui://5oh3t798s20ja";
+        public const string PACKAGE_NAME = "Field";
+        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_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_btnGet = (GButton)comp.GetChild("btnGet");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtDesc = null;
+            m_btnGet = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -1,5 +1,6 @@
 
 using UI.Studio;
+using UnityEngine;
 
 namespace GFGGame
 {
@@ -39,6 +40,11 @@ namespace GFGGame
             _ui.m_comFabric.m_c1.selectedIndex = isopen;
             isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, false) ? 1 : 0;
             _ui.m_comProperty.m_c1.selectedIndex = isopen;
+            var dataArray = FieldCfgArray.Instance.dataArray;
+            foreach (var cfg in dataArray)
+            {
+                Debug.Log("zoya:" + StoryLevelCfgArray.Instance.GetCfgs(cfg.type, cfg.subType, cfg.id).Count);
+            }
         }
 
         protected override void OnHide()

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


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

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

BIN
GameClient/Assets/ResIn/UI/Field/Field_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Field/Field_atlas_8jo91.png


BIN
GameClient/Assets/ResIn/UI/Field/Field_fui.bytes


+ 7 - 0
GameClient/Assets/ResIn/UI/Field/Field_fui.bytes.meta

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