Browse Source

查阅建档

zhaoyang 2 years ago
parent
commit
e43e6f6d4b
22 changed files with 378 additions and 29 deletions
  1. 28 5
      FGUIProject/assets/Studio/StudioFilingUI.xml
  2. 1 1
      FGUIProject/assets/Studio/StudioUI.xml
  3. 15 0
      FGUIProject/assets/Studio/components/CompFlower.xml
  4. 12 0
      FGUIProject/assets/Studio/components/ListLevel.xml
  5. BIN
      FGUIProject/assets/Studio/images/zx_jq_djtubiao_1.png
  6. 3 0
      FGUIProject/assets/Studio/package.xml
  7. 1 0
      GameClient/Assets/Game/HotUpdate/Constant/ConstStorageId.cs
  8. 9 5
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  9. 11 10
      GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs
  10. 13 3
      GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs
  11. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs
  12. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs.meta
  13. 84 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevel.cs
  14. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevel.cs.meta
  15. 15 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingUI.cs
  16. 4 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  17. 8 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs
  18. 69 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs
  19. 3 0
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs
  20. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  21. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png
  22. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes

+ 28 - 5
FGUIProject/assets/Studio/StudioFilingUI.xml

@@ -4,13 +4,36 @@
     <loader id="n0_rqo4" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <text id="n1_rqo4" name="txtTitle" xy="458,140" pivot="0.5,0" size="164,54" fontSize="40" text="查阅建档"/>
+    <component id="n21_rqo4" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="43,126">
+      <Button icon="ui://eg2y0ldpsi5zti5"/>
+    </component>
+    <text id="n1_rqo4" name="txtTitle" xy="390,140" pivot="0.5,0" size="300,54" fontSize="40" vars="true" text="查阅建档-{name=邢慈静}"/>
     <component id="n2_rqo4" name="btnChange" src="rqo41l" fileName="components/Button1.xml" xy="62,463" size="146,62">
+      <relation target="" sidePair="middle-middle,left-left"/>
       <Button title="切换角色"/>
     </component>
-    <component id="n3_rqo4" name="btnReward" src="rqo41m" fileName="components/Button2.xml" xy="869,1277" size="100,92"/>
-    <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="3,1606" size="187,72"/>
-    <component id="n6_rqo4" name="btnAdd" src="rqo41o" fileName="components/Button4.xml" xy="990,1641" size="67,68"/>
-    <text id="n5_rqo4" name="txtNum" xy="638,1648" size="334,54" fontSize="40" vars="true" text="今日挑战次数:{count=10}"/>
+    <component id="n3_rqo4" name="btnReward" src="rqo41m" fileName="components/Button2.xml" xy="874,1335" size="100,92">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+    <component id="n6_rqo4" name="btnAdd" src="rqo41o" fileName="components/Button4.xml" xy="990,1641" size="67,68">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
+    <text id="n5_rqo4" name="txtNum" xy="638,1648" size="334,54" fontSize="40" vars="true" text="今日挑战次数:{count=10}">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </text>
+    <list id="n14_rqo4" name="list" xy="490,401" size="494,904" lineGap="80" defaultItem="ui://xz8kxrecrqo41t">
+      <relation target="" sidePair="middle-middle"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n4_rqo4" name="btnSuit" src="rqo41n" fileName="components/Button3.xml" xy="0,1609" size="263,102" group="n20_rqo4"/>
+    <text id="n15_rqo4" name="txtSuitName" xy="112,1611" pivot="0.5,0" size="40,54" group="n20_rqo4" fontSize="40" text=""/>
+    <text id="n19_rqo4" name="txtSuitProgress" xy="112,1677" pivot="0.5,0" size="40,54" group="n20_rqo4" fontSize="40" text=""/>
+    <group id="n20_rqo4" name="n20" xy="0,1609" size="263,122" advanced="true">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </group>
   </displayList>
 </component>

+ 1 - 1
FGUIProject/assets/Studio/StudioUI.xml

@@ -17,7 +17,7 @@
       <relation target="" sidePair="right-right,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1f"/>
     </component>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261" visible="false">
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261">
       <relation target="" sidePair="right-right,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
     </component>

+ 15 - 0
FGUIProject/assets/Studio/components/CompFlower.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="135,45">
+  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+  <displayList>
+    <image id="n12_s2cc" name="f1" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="0,0">
+      <gearDisplay controller="c1" pages="1,2,3"/>
+    </image>
+    <image id="n13_s2cc" name="f2" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="47,0" size="41,45">
+      <gearDisplay controller="c1" pages="2,3"/>
+    </image>
+    <image id="n14_s2cc" name="f3" src="rqo41s" fileName="images/zx_jq_djtubiao_1.png" xy="94,0" size="41,45">
+      <gearDisplay controller="c1" pages="3"/>
+    </image>
+  </displayList>
+</component>

+ 12 - 0
FGUIProject/assets/Studio/components/ListLevel.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="400,114">
+  <controller name="c1" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n8_rqo4" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="67,0" group="n10_rqo4"/>
+    <component id="n7_rqo4" name="comFlower" src="rqo41r" fileName="components/CompFlower.xml" xy="35,69" group="n10_rqo4"/>
+    <text id="n9_rqo4" name="txtName" xy="20,27" pivot="0.5,0" size="165,54" group="n10_rqo4" fontSize="40" text="邢慈静-1"/>
+    <group id="n10_rqo4" name="grpComLevel" xy="20,0" size="165,114" advanced="true">
+      <gearXY controller="c1" pages="0,1" values="200,0|20,0"/>
+    </group>
+  </displayList>
+</component>

BIN
FGUIProject/assets/Studio/images/zx_jq_djtubiao_1.png


+ 3 - 0
FGUIProject/assets/Studio/package.xml

@@ -40,6 +40,9 @@
     <component id="rqo41o" name="Button4.xml" path="/components/"/>
     <component id="rqo41p" name="ListRewardItem.xml" path="/components/"/>
     <component id="rqo41q" name="Button5.xml" path="/components/"/>
+    <component id="rqo41r" name="CompFlower.xml" path="/components/"/>
+    <image id="rqo41s" name="zx_jq_djtubiao_1.png" path="/images/"/>
+    <component id="rqo41t" name="ListLevel.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Constant/ConstStorageId.cs

@@ -12,6 +12,7 @@ namespace GFGGame
         public const int STORAGE_CUSTOME_SUIT_INDEX = 20004;//自定义套装当前使用索引
         public const int STORAGE_DIALOG_AUTO_PLAY_SPEED = 20005;//剧情对话速度
         public const int LAST_LOGIN_TIME = 20006;//上次登录时间
+        public const int STUDIO_FILING_CHAPTERID = 20007;//当前选择的副本id
 
     }
 }

+ 9 - 5
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -237,12 +237,16 @@ namespace GFGGame
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             RoleInfoSProxy.ReqPersonalInfo().Coroutine();
 
-            EquipDataCache.cacher.autoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY) <= 0 ? false : true;
-            EquipDataCache.cacher.fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_FIGHT_AUTO_PLAY_SPEED) <= 0 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_FIGHT_AUTO_PLAY_SPEED);
-            EquipDataCache.cacher.dialogSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_DIALOG_AUTO_PLAY_SPEED) <= 0 ? 1 : StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_DIALOG_AUTO_PLAY_SPEED);
-            GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
-
+            int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
+            EquipDataCache.cacher.autoPlay = storageAutoPlay <= 0 ? false : true;
+            int fightSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_FIGHT_AUTO_PLAY_SPEED);
+            EquipDataCache.cacher.fightSpeed = fightSpeed <= 0 ? 1 : fightSpeed;
+            int dialogSpeed = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_DIALOG_AUTO_PLAY_SPEED);
+            EquipDataCache.cacher.dialogSpeed = dialogSpeed <= 0 ? 1 : dialogSpeed;
 
+            int filingChapterId = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STUDIO_FILING_CHAPTERID);
+            StudioDataManager.Instance.filingChapterId = filingChapterId <= 0 ? FilingCfgArray.Instance.dataArray[0].id : filingChapterId;
+            GameGlobal.skipCheckOpen = StorageDataManager.Instance.GetStorageValue(ConstStorageId.SKIP_CHECK_OPEN) <= 0 ? false : true;
 
             bool result = await FieldSProxy.ReqFieldInstanceInfos();
             if (result && FieldDataManager.Instance.fieldInfos.hasBonus)

+ 11 - 10
GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs

@@ -260,22 +260,23 @@ namespace GFGGame
             return false;
         }
 
-        public static int GetCanFightTime(int levelCfgId)
-        {
-            var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
-            int times = (int)Math.Floor((float)RoleDataManager.power / levelCfg.power);
-            return times;
-        }
-
         public static void GetCanFightTime(int type, int subType, int levelCfgId, out int times, out string title)
         {
+
             var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
-            times = (int)Math.Floor((float)RoleDataManager.power / levelCfg.power);//体力次数
+            if (levelCfg.power == 0)
+            {
+                times = GameConst.MAX_COUNT_FIGHT_QUICKLY;
+            }
+            else
+            {
+                times = (int)Math.Floor((float)RoleDataManager.power / levelCfg.power);//体力次数
+            }
             times = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, times);
             title = "";
-            if (type == ConstInstanceZonesType.Studio)
+            if (type == ConstInstanceZonesType.Studio || type == ConstInstanceZonesType.Filing)
             {
-                StudioData studioData = StudioDataManager.Instance.GetStudioDataById(levelCfg.chapterId);
+                StudioData studioData = StudioDataManager.Instance.GetStudioDataById(levelCfg.chapterId, type);
                 times = Math.Min(times, studioData.TotalPlayTimes - studioData.PlayTimes);
             }
             title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));

+ 13 - 3
GameClient/Assets/Game/HotUpdate/Data/StudioDataManager.cs

@@ -9,11 +9,12 @@ namespace GFGGame
     public class StudioDataManager : SingletonBase<StudioDataManager>
     {
         private Dictionary<int, StudioData> _StudioInfoById = new Dictionary<int, StudioData>();
-
         public int TYPE_SELECT_INDEX = 0;//界面类型0无属性选择,1有属性选择
         public int PROPERTY_SELECT_INDEX = 0;//属性类型
         public string VIEW_NAME = "";//界面名称
 
+        public int filingChapterId;//查阅建档副本Id
+
         public void Clear()
         {
             _StudioInfoById.Clear();
@@ -40,7 +41,7 @@ namespace GFGGame
         }
 
 
-        public StudioData GetStudioDataById(int id)
+        public StudioData GetStudioDataById(int id, int type = ConstInstanceZonesType.Studio)
         {
             if (_StudioInfoById.ContainsKey(id))
             {
@@ -48,7 +49,16 @@ namespace GFGGame
             }
             else
             {
-                StudioData studioData = new StudioData() { ChapterId = id, BuyTimes = 0, PlayTimes = 0, TotalPlayTimes = StudioCfgArray.Instance.GetCfg(id).num };
+                int totalPlayTimes = 0;
+                if (type == ConstInstanceZonesType.Studio)
+                {
+                    totalPlayTimes = StudioCfgArray.Instance.GetCfg(id).num;
+                }
+                else if (type == ConstInstanceZonesType.Filing)
+                {
+                    totalPlayTimes = FilingCfgArray.Instance.GetCfg(id).num;
+                }
+                StudioData studioData = new StudioData() { ChapterId = id, BuyTimes = 0, PlayTimes = 0, TotalPlayTimes = totalPlayTimes };
                 RspStudioInfos(studioData);
                 return studioData;
             }

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_CompFlower
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GImage m_f1;
+        public GImage m_f2;
+        public GImage m_f3;
+        public const string URL = "ui://xz8kxrecrqo41r";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "CompFlower";
+        private static UI_CompFlower _proxy;
+
+        public static UI_CompFlower Create(GObject gObject = null)
+        {
+            var ui = new UI_CompFlower();
+            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_CompFlower Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_CompFlower();
+            }
+            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_f1 = (GImage)comp.GetChild("f1");
+            m_f2 = (GImage)comp.GetChild("f2");
+            m_f3 = (GImage)comp.GetChild("f3");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_f1 = null;
+            m_f2 = null;
+            m_f3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs.meta

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

+ 84 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevel.cs

@@ -0,0 +1,84 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Studio
+{
+    public partial class UI_ListLevel
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GImage m_imgLock;
+        public UI_CompFlower m_comFlower;
+        public GTextField m_txtName;
+        public GGroup m_grpComLevel;
+        public const string URL = "ui://xz8kxrecrqo41t";
+        public const string PACKAGE_NAME = "Studio";
+        public const string RES_NAME = "ListLevel";
+        private static UI_ListLevel _proxy;
+
+        public static UI_ListLevel Create(GObject gObject = null)
+        {
+            var ui = new UI_ListLevel();
+            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_ListLevel Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListLevel();
+            }
+            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_imgLock = (GImage)comp.GetChild("imgLock");
+            m_comFlower = (UI_CompFlower)UI_CompFlower.Create(comp.GetChild("comFlower"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_grpComLevel = (GGroup)comp.GetChild("grpComLevel");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_imgLock = null;
+            m_comFlower.Dispose();
+            m_comFlower = null;
+            m_txtName = null;
+            m_grpComLevel = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevel.cs.meta

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

+ 15 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingUI.cs

@@ -8,12 +8,16 @@ namespace UI.Studio
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GButton m_btnBack;
         public GTextField m_txtTitle;
         public GButton m_btnChange;
         public GButton m_btnReward;
-        public GButton m_btnSuit;
         public GButton m_btnAdd;
         public GTextField m_txtNum;
+        public GList m_list;
+        public GButton m_btnSuit;
+        public GTextField m_txtSuitName;
+        public GTextField m_txtSuitProgress;
         public const string URL = "ui://xz8kxrecrqo41i";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingUI";
@@ -62,22 +66,30 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnChange = (GButton)comp.GetChild("btnChange");
             m_btnReward = (GButton)comp.GetChild("btnReward");
-            m_btnSuit = (GButton)comp.GetChild("btnSuit");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_list = (GList)comp.GetChild("list");
+            m_btnSuit = (GButton)comp.GetChild("btnSuit");
+            m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
+            m_txtSuitProgress = (GTextField)comp.GetChild("txtSuitProgress");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_btnBack = null;
             m_txtTitle = null;
             m_btnChange = null;
             m_btnReward = null;
-            m_btnSuit = null;
             m_btnAdd = null;
             m_txtNum = null;
+            m_list = null;
+            m_btnSuit = null;
+            m_txtSuitName = null;
+            m_txtSuitProgress = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 4 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -221,6 +221,10 @@ namespace GFGGame
                 {
                     ViewManager.Show(StudioDataManager.Instance.VIEW_NAME, new object[] { StudioDataManager.Instance.TYPE_SELECT_INDEX, StudioDataManager.Instance.PROPERTY_SELECT_INDEX }, ViewManager.GetGoBackDatas(StudioDataManager.Instance.VIEW_NAME));
                 }
+                else if (_levelCfg.type == ConstInstanceZonesType.Filing)
+                {
+                    ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+                }
                 else if (_levelCfg.type == ConstInstanceZonesType.Field)
                 {
                     ViewManager.GoBackFrom(ViewName.DRESS_UP_FIGHT_VIEW);

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryController.cs

@@ -12,6 +12,10 @@ namespace GFGGame
         {
             ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData }, null, true);
         }
+        public static void ShowFilingStoryDialog(string levelCfgId)
+        {
+            ViewManager.Show(ViewName.STORY_DIALOG_VIEW, new object[] { levelCfgId, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) }, null, true);
+        }
         public static void ShowPriorStoryDialog()
         {
             InstanceZonesDataManager.currentLevelCfgId = 100001001;
@@ -69,5 +73,9 @@ namespace GFGGame
         {
             ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
         }
+        private static void OnCompleteFilingStoryDialog(bool isSkip, object param)
+        {
+            ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName), true);
+        }
     }
 }

+ 69 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using ET;
 using FairyGUI;
 using UI.Studio;
@@ -8,6 +9,8 @@ namespace GFGGame
     public class StudioFilingView : BaseWindow
     {
         private UI_StudioFilingUI _ui;
+        private FilingCfg _filingCfg;
+        private List<StoryLevelCfg> _storyLevelCfgs;
 
         public override void Dispose()
         {
@@ -27,6 +30,15 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+
+            _ui.m_btnBack.onClick.Add(Hide);
+            _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
+            _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
+            _ui.m_btnAdd.onClick.Add(OnBtnAddClick);
+            _ui.m_btnSuit.onClick.Add(OnBtnSuitClick);
+
         }
         protected override void AddEventListener()
         {
@@ -36,13 +48,13 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-
+            UpdateView();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-
+            ViewManager.GoBackFrom(typeof(StudioFilingView).FullName);
         }
 
         protected override void RemoveEventListener()
@@ -50,5 +62,60 @@ namespace GFGGame
             base.RemoveEventListener();
 
         }
+
+        private void UpdateView()
+        {
+            _filingCfg = FilingCfgArray.Instance.GetCfg(StudioDataManager.Instance.filingChapterId);
+            _ui.m_txtTitle.SetVar("name", _filingCfg.name).FlushVars();
+
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_filingCfg.suitId);
+            _ui.m_txtSuitName.text = suitCfg.name;
+
+            DressUpMenuSuitDataManager.GetTotalProgress(out int haveCount, out int totalCount);
+            _ui.m_txtSuitProgress.text = string.Format("({0}/{1})", haveCount, totalCount);
+
+            _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_filingCfg.type, 0, StudioDataManager.Instance.filingChapterId);
+            _ui.m_list.numItems = _storyLevelCfgs.Count;
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            UI_ListLevel item = UI_ListLevel.Proxy(obj);
+            item.m_c1.selectedIndex = index % 2;
+            item.m_txtName.text = _storyLevelCfgs[index].name;
+            item.m_imgLock.visible = InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index].id);
+            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            item.target.data = _storyLevelCfgs[index];
+            UI_ListLevel.ProxyEnd();
+        }
+        private void OnListItemClick(EventContext context)
+        {
+            GObject obj = context.data as GObject;
+            StoryLevelCfg storyLevelCfg = obj.data as StoryLevelCfg;
+            if (!string.IsNullOrEmpty(storyLevelCfg.storyStartID))
+            {
+                StoryController.ShowFilingStoryDialog(storyLevelCfg.storyStartID);
+            }
+            else
+            {
+                InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishStoryLevel);
+            }
+        }
+        private void OnBtnChangeClick()
+        {
+
+        }
+        private void OnBtnRewardClick()
+        {
+
+        }
+        private void OnBtnAddClick()
+        {
+
+        }
+        private void OnBtnSuitClick()
+        {
+
+        }
     }
 }

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

@@ -47,6 +47,8 @@ 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;
+            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFilingView).FullName, false) ? 1 : 0;
+            _ui.m_comFiling.m_c1.selectedIndex = isopen;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ejzjm_bj");
 
             Timers.inst.AddUpdate(CheckGuide);
@@ -93,6 +95,7 @@ namespace GFGGame
         private void OnClickComFilling()
         {
 
+            ViewManager.Show<StudioFilingView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
         }
         private void CheckGuide(object param)
         {

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


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes