工作室挑战

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1160" designImageOffsetX="-750">
-  <controller name="ctrlNeed" pages="0,,1,,2," selected="1"/>
+  <controller name="ctrlNeed" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n44_yoe2" name="btnBg" xy="0,-153" size="1080,1414" url="ui://mfvz4q8kj48o94" autoSize="true"/>
+    <loader id="n44_yoe2" name="btnBg" xy="0,-153" size="1080,1414" touchable="false" url="ui://mfvz4q8kj48o94" autoSize="true"/>
     <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,864">
       <Button title="开始旅程"/>
     </component>

FGUIProject/assets/Studio/components/ListItem.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1009,161">
-  <controller name="star" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="star" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <image id="n16_n3xh" name="n16" src="kqhds" fileName="images/gzsdi_1.png" xy="-6,4"/>
     <image id="n18_kqhd" name="n18" src="kqhdt" fileName="images/gzsdi_2.png" xy="194,11"/>
     <loader id="n6_rbxq" name="loaIcon" xy="202,19" size="120,120" url="ui://xz8kxrecrbxq3" fill="scale"/>
     <image id="n17_kqhd" name="imgLock" src="kqhdy" fileName="images/gzssuo.png" xy="196,13"/>
-    <text id="n10_rbxq" name="txtTitle" xy="381,49" size="381,62" fontSize="46" color="#877d53" align="center" text="完成主线1-10解锁"/>
+    <text id="n10_rbxq" name="txtTitle" xy="381,49" size="381,61" fontSize="46" color="#877d53" align="center" text="完成主线1-10解锁"/>
     <image id="n11_rbxq" name="n11" src="j48o95" fileName="imagesExport/zx_jq_djtubiao_1.png" pkg="mfvz4q8k" xy="739,58" group="n14_rbxq">
       <gearDisplay controller="star" pages="1,2,3"/>
     </image>

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

@@ -14,6 +14,8 @@ namespace GFGGame
         public static int currentScoreType;
         //所有副本关卡通用
         public static int currentCardId = 0;
+        //快速挑战挑战次数
+        public static int FightTimes = 10;
 
         private static int _currentLevelCfgId;
         //所有副本关卡通用配置表的id
@@ -259,5 +261,29 @@ namespace GFGGame
             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)GameGlobal.myNumericComponent.GetAsInt(NumericType.Power) / levelCfg.power);//体力次数
+            title = "";
+            if (type == ConstInstanceZonesType.Story && subType == ConstInstanceZonesSubType.Normal)
+            {
+                times = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, times);
+                title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(GameConst.MAX_COUNT_FIGHT_QUICKLY));
+            }
+            else if (type == ConstInstanceZonesType.Story && subType == ConstInstanceZonesSubType.Hard)
+            {
+                times = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, times);
+                title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
+
+            }
+            else if (type == ConstInstanceZonesType.Studio)
+            {
+                StudioData studioData = StudioDataManager.Instance.GetStudioDataById(levelCfg.chapterId);
+                times = Math.Min(Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, times), studioData.TotalPlayTimes - studioData.PlayTimes);
+                title = string.Format("挑战{0}次", NumberUtil.GetChiniseNumberText(times));
+            }
+
+        }
     }
 }

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

@@ -118,7 +118,7 @@ namespace GFGGame
             //上一关卡
             int preChapterId = chapterId - 1;
             var preChapterCfg = StoryChapterCfgArray.Instance.GetCfg(preChapterId);
-            if(preChapterCfg != null)
+            if (preChapterCfg != null)
             {
                 return InstanceZonesDataManager.CheckChapterPass(preChapterCfg.type, preChapterCfg.subType, preChapterCfg.id, preChapterCfg.levelCount);
             }

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

@@ -12,6 +12,7 @@ namespace GFGGame
 
         public int TYPE_SELECT_INDEX = 0;//界面类型0无属性选择，1有属性选择
         public int PROPERTY_SELECT_INDEX = 0;//属性类型
+        public string VIEW_NAME = "";//界面名称
 
         public void Clear()
         {
@@ -70,5 +71,10 @@ namespace GFGGame
             if (!isPass) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
             canFight = isPass && isRoleLv && isLastPast;
         }
+
+        public void OnFinishStoryLevel(int levelCfgId, bool firstPass, bool success)
+        {
+            ViewManager.Show(VIEW_NAME, new object[] { TYPE_SELECT_INDEX, PROPERTY_SELECT_INDEX }, ViewManager.GetGoBackDatas(VIEW_NAME));
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -180,9 +180,16 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            this.Hide();
             // ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, StoryDataManager.currentChapter);
-            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
+            if (_levelCfg.type == ConstInstanceZonesType.Studio)
+            {
+                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
+            {
+                ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
+            }
+            this.Hide();
         }
 
         private void OnClickBtnHome()

GameClient/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using UnityEngine;
 
 namespace GFGGame
 {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -11,7 +11,9 @@ namespace GFGGame
         private UI_StoryFightQuicklyUI _ui;
         private int _fightID;
         private int _levelID;
+        private int _type;
         private int _storyType;
+        private int _fightType;
 
         private List<List<ItemData>> _totalBonusList;
         private int _index;
@@ -36,22 +38,23 @@ namespace GFGGame
             _ui.m_btnFightTimes.onClick.Add(() =>
             {
 
-                StartFight(_fightTimes);
+                StartFight();
             });
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            int count = (int)viewData;
+            _fightType = (int)viewData;
             _levelID = InstanceZonesDataManager.currentLevelCfgId;
 
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            _type = levelCfg.chapterId;
             _storyType = levelCfg.subType;
             _expAdd = fightCfg.exp;
             _power = levelCfg.power;
-            StartFight(count);
+            StartFight();
             EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, UpdateBtnFightTimes);
             EventAgent.AddEventListener(ConstMessage.STORY_FIGHT_QUICKLY_SUCCESS, StartShowBonus);
         }
@@ -64,28 +67,21 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.STORY_FIGHT_QUICKLY_SUCCESS, StartShowBonus);
         }
 
-        private void StartFight(int count)
+        private void StartFight()
         {
-            int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
+            InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
 
-            if (_storyType == ConstInstanceZonesSubType.Normal && time < count)
+            if (_storyType == ConstInstanceZonesSubType.Normal && times < _fightType)
             {
-                ItemUtil.AddPower("体力不足", () => { StartFight(count); });
+                ItemUtil.AddPower("体力不足", () => { StartFight(); });
                 return;
             }
             _ui.m_btnExit.visible = false;
             _ui.m_btnFightTimes.visible = false;
             _ui.m_txtPowerDesc.visible = false;
             _ui.m_list.RemoveChildren();
-            //_totalBonusList = new List<List<ItemData>>();
-            //for (int i = 1; i <= count; i++)
-            //{
-            //    bool fistPassLastLvl = false;
-            //    bool curLvfirstPass = false;
-            //    List<ItemData> bonusList = StoryDataManager.PassCurrentLevel(out fistPassLastLvl, out curLvfirstPass);
-            //    _totalBonusList.Add(bonusList);
-            //}
-            InstanceZonesSProxy.FinishStoryFightQuickly(_levelID, count).Coroutine();
+
+            InstanceZonesSProxy.FinishStoryFightQuickly(_levelID, _fightType == 1 ? 1 : times).Coroutine();
         }
 
         private void StartShowBonus(EventContext eventContext)
@@ -141,31 +137,19 @@ namespace GFGGame
             if (_ui.m_btnExit.visible)
             {
                 StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
-                int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
-                time = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, time);
-                _ui.m_btnFightTimes.visible = time > 0;
-                _ui.m_txtPowerDesc.visible = _ui.m_btnFightTimes.visible;
 
-                if (_storyType == ConstInstanceZonesSubType.Normal)
+                InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
+                _ui.m_btnFightTimes.title = _fightType == 1 ? "挑战一次" : title;
+                _ui.m_btnFightTimes.visible = times > 0;
+                if (_type == ConstInstanceZonesType.Story && _storyType == ConstInstanceZonesSubType.Normal)
                 {
                     _ui.m_btnFightTimes.visible = true;
-
-                    _fightTimes = (int)viewData;
-                    _ui.m_btnFightTimes.text = "挑战" + NumberUtil.GetChiniseNumberText((int)viewData) + "次";
                 }
-                else if (_storyType == ConstInstanceZonesSubType.Hard)
-                {
+                _ui.m_txtPowerDesc.visible = _ui.m_btnFightTimes.visible;
 
-                    _ui.m_btnFightTimes.visible = time > 1;
-                    if (_ui.m_btnFightTimes.visible)
-                    {
-                        _fightTimes = time;
-                        _ui.m_btnFightTimes.text = "挑战" + NumberUtil.GetChiniseNumberText(time) + "次";
-                    }
-                }
                 if (_ui.m_txtPowerDesc.visible)
                 {
-                    int power = time * levelCfg.power;
+                    int power = times * levelCfg.power;
                     _ui.m_txtPowerDesc.SetVar("v1", "" + power).FlushVars();
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

@@ -11,6 +11,7 @@ namespace GFGGame
         private UI_StoryLevelInfoUI _ui;
         private int _fightID;
         private int _levelID;
+        private int _type;
         private int _storyType;
         private List<ItemData> _bonusList = new List<ItemData>();
         private int _fightTimes;
@@ -46,6 +47,7 @@ namespace GFGGame
             base.OnShown();
             _levelID = (int)viewData;
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+            _type = levelCfg.type;
             _storyType = levelCfg.subType;
             _ui.m_btnStart.touchable = true;
             UpdateView();
@@ -64,8 +66,10 @@ namespace GFGGame
 
         private void OnClickBtnStart()
         {
-            int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
-            if (time > 0)
+
+            // int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
+            InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
+            if (times > 0)
             {
                 ViewManager.Show(ViewName.DRESS_UP_FIGHT_VIEW, _levelID, null, true);
             }
@@ -77,8 +81,9 @@ namespace GFGGame
 
         private void OnClickBtnFightOnce()
         {
-            int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
-            if (time > 0)
+            // int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
+            InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
+            if (times > 0)
             {
                 ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1);
             }
@@ -90,21 +95,22 @@ namespace GFGGame
 
         private void OnClickBtnFightTimes()
         {
+            InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
 
-            if (_storyType == ConstInstanceZonesSubType.Normal)
+            if (_type == ConstInstanceZonesType.Story && _storyType == ConstInstanceZonesSubType.Normal)
             {
-                if (_fightTimes < _timeCount)
+                if (times < GameConst.MAX_COUNT_FIGHT_QUICKLY)
                 {
                     ItemUtil.AddPower("体力不足", OnClickBtnFightTimes);
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, _fightTimes);
+                    ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
                 }
             }
-            else if (_storyType == ConstInstanceZonesSubType.Hard)
+            else
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, _fightTimes);
+                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times);
             }
         }
 
@@ -119,7 +125,7 @@ namespace GFGGame
             }
             (item.data as ItemView).SetData(itemData);
             List<ItemData> bonusOnceData = StoryBonusDataCache.GetBonusData(_levelID).bonusOnce;
-            (item.data as ItemView).LoaShouTongRewardVisble = !MainStoryDataManager.CheckCurrentLevelPass() && index < bonusOnceData.Count;
+            (item.data as ItemView).LoaShouTongRewardVisble = !InstanceZonesDataManager.CheckLevelPass(_levelID) && index < bonusOnceData.Count;
 
         }
 
@@ -127,24 +133,12 @@ namespace GFGGame
         {
             if (_ui.m_groupPass.visible)
             {
-                int time = InstanceZonesDataManager.GetCanFightTime(_levelID);
-                time = Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, time);
-                if (_storyType == ConstInstanceZonesSubType.Normal)
+                InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
+                _ui.m_btnFightTimes.title = title;
+                _ui.m_btnFightTimes.visible = times > 0;
+                if (_type == ConstInstanceZonesType.Story && _storyType == ConstInstanceZonesSubType.Normal)
                 {
                     _ui.m_btnFightTimes.visible = true;
-
-                    _fightTimes = time;
-                    _ui.m_btnFightTimes.text = "挑战" + NumberUtil.GetChiniseNumberText(_timeCount) + "次";
-                }
-                else if (_storyType == ConstInstanceZonesSubType.Hard)
-                {
-
-                    _ui.m_btnFightTimes.visible = time > 0;
-                    if (_ui.m_btnFightTimes.visible)
-                    {
-                        _fightTimes = time;
-                        _ui.m_btnFightTimes.text = "挑战" + NumberUtil.GetChiniseNumberText(time) + "次";
-                    }
                 }
             }
         }
@@ -175,7 +169,7 @@ namespace GFGGame
                 _ui.m_loaderHead.url = ResPathUtil.GetNpcHeadPath("self");
             }
             _bonusList.Clear();
-            if (MainStoryDataManager.CheckCurrentLevelPass())
+            if (InstanceZonesDataManager.CheckLevelPass(_levelID))
             {
                 _bonusList = StoryBonusDataCache.GetBonusList(_levelID, false);
                 _ui.m_groupPass.visible = true;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             _ui.m_btnBuy.onClick.Add(OnCliclBtnBuy);
 
             EventAgent.AddEventListener(ConstMessage.BUY_STUDIO_PLAY_TIMES, UpdateView);
-            EventAgent.AddEventListener(ConstMessage.NOTICE_STUDIO_PLAY_TIMES, UpdateView);
+            // EventAgent.AddEventListener(ConstMessage.NOTICE_STUDIO_PLAY_TIMES, UpdateView);
 
         }
 
@@ -73,8 +73,13 @@ namespace GFGGame
             UI_ListItem item = UI_ListItem.Proxy(obj);
             StudioDataManager.Instance.IsCanFight(storyLevelCfgs, storyLevelCfgs[index], out bool canFight, out string content);
 
+            ItemData itemData = StoryBonusDataCache.GetBonusData(storyLevelCfgs[index].id).bonusBase[0];
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
+            item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+
             item.m_star.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(storyLevelCfgs[index].id);
-            item.m_imgLock.visible = canFight;
+
+            item.m_imgLock.visible = canFight ? false : true;
             item.m_txtTitle.text = canFight ? string.Format("{0}{1}", studioCfg.name, index + 1) : content;
             item.target.data = storyLevelCfgs[index];
         }
@@ -88,20 +93,9 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(content);
                 return;
             }
-            InstanceZonesController.ShowLevelView(storyLevelCfg.id, OnFinishStoryLevel);
+            InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishStoryLevel);
         }
-        public static void OnFinishStoryLevel(int levelCfgId, bool firstPass, bool success)
-        {
-            if (success)
-            {
-
 
-            }
-            else
-            {
-
-            }
-        }
 
         private bool GetCanFight(StoryLevelCfg storyLevelCfg)
         {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBuyNumView.cs

@@ -34,7 +34,7 @@ namespace GFGGame
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _ui.m_btnExchange.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_0); });
-            _ui.m_btnExchange.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
+            _ui.m_btnBuy.onClick.Add(() => { OnClickBtnBuy(BUY_TYPE_1); });
 
             EventAgent.AddEventListener(ConstMessage.BUY_STUDIO_PLAY_TIMES, () =>
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFabricView.cs

@@ -26,7 +26,8 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = (int)(this.viewData as object[])[0];
             StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
-            this.studioCfg = StudioCfgArray.Instance.GetCfgs(typeof(StudioFabricView).Name)[0];
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioFabricView).Name;
+            this.studioCfg = StudioCfgArray.Instance.GetCfgs(StudioDataManager.Instance.VIEW_NAME)[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgs(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
             _ui.m_list.numItems = this.storyLevelCfgs.Length;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioMetalView.cs

@@ -27,8 +27,9 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = (int)(this.viewData as object[])[0];
             StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioMetalView).Name;
 
-            this.studioCfg = StudioCfgArray.Instance.GetCfgs(typeof(StudioMetalView).Name)[0];
+            this.studioCfg = StudioCfgArray.Instance.GetCfgs(StudioDataManager.Instance.VIEW_NAME)[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgs(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
             _ui.m_list.numItems = this.storyLevelCfgs.Length;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioPropertyView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
 
         protected override void OnShown()
         {
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).Name;
             StudioCfg[] studioCfgs = StudioCfgArray.Instance.GetCfgs(typeof(StudioPropertyView).Name);
             this.studioCfg = studioCfgs[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -35,7 +35,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();//1;//
-            // StudioProxy.ReqStudioInfos().Coroutine();
+            StudioProxy.ReqStudioInfos().Coroutine();
             int isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, false) ? 1 : 0;
             _ui.m_comMetal.m_c1.selectedIndex = isopen;
             isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, false) ? 1 : 0; ;
@@ -64,7 +64,7 @@ namespace GFGGame
         }
         private void OnComProperty()
         {
-            ViewManager.Show<StudioPropertyView>(new object[] { 0, 1 }, new object[] { typeof(StudioView).Name, this.viewData });
+            ViewManager.Show<StudioPropertyView>(new object[] { 1, 0 }, new object[] { typeof(StudioView).Name, this.viewData });
         }
         private void OnClickComFilling()
         {