开发活动抽奖和战斗

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

@@ -14,6 +14,7 @@ namespace GFGGame
             luckyActTsyBonusState.Clear();
             allTsyPlayTimes = 0;
             lastActLimitTsyId = 0;
+            lastActLimitStlycId = 0;
         }
 
         /**********************************************************活动*************************************************/
@@ -49,8 +50,10 @@ namespace GFGGame
         /**********************************************************限时抽奖活动*********************************************/
         public int lastActLuckyBoxId = 0;
         public int lastActLimitTsyId = 0;
+        public int lastActLimitStlycId = 0;
         private int _actLuckyBoxId = 0;
         private int _actLuckyTsyId = 0;
+        private int _actLimitStlycId = 0;
         /// <summary>
         /// 当前抽奖活动id
         /// </summary>
@@ -94,6 +97,29 @@ namespace GFGGame
         /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
         /// <returns></returns>
         public Dictionary<int, int> luckyActTsyBonusState = new Dictionary<int, int>();
+
+        /// <summary>
+        /// 当前隋唐洛阳城活动id
+        /// </summary>
+        /// <value></value>
+        public int actLimitStlycId { get { return _actLimitStlycId; } set { _actLimitStlycId = value; } }
+        /// <summary>
+        /// 开服活动抽奖总次数
+        /// </summary>
+        /// <value></value>
+        public long allLimitStlycTimes { get; set; }
+        /// <summary>
+        /// 开服抽奖必掉次数
+        /// </summary>
+        /// <value></value>
+        public int lastLimitStlycDrawCount { get; set; }
+        /// <summary>
+        /// </summary>
+        /// <typeparam name="int">奖励key，这里对应抽奖次数</typeparam>
+        /// <typeparam name="int">值由ConstBonusStatus定义</typeparam>
+        /// <returns></returns>
+        public Dictionary<int, int> limitStlycActBonusState = new Dictionary<int, int>();
+
         public List<ActivityLuckybonusCfg> SortActivityLuckybonusCfg(List<ActivityLuckybonusCfg> list,int typeId)
         {
             list.Sort((ActivityLuckybonusCfg a, ActivityLuckybonusCfg b) =>

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

@@ -248,7 +248,6 @@ namespace GFGGame
             {
                 long needNum = costNum - hasNum;
                 // ItemExchangeCfgArray.Instance.GetMoneyIdAndNum(costId, ItemDataManager.GetItemExchangeTimes(costId), times, out int costItemId, out int costItemNeedNum, out int buyNum);
-
                 ItemExchangeCfg itemExchangeCfg = ItemExchangeCfgArray.Instance.GetCfg(costId);
                 int exchangedTimes = ItemDataManager.GetItemExchangeTimes(costId);
                 int costItemNeedNum = 0;

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

@@ -139,6 +139,7 @@ namespace GFGGame
         {
             ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX);
         }
+
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
             ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, true);
@@ -169,20 +170,22 @@ namespace GFGGame
             return addition;
         }
 
-        public float GetAddition()
+        public float GetAddition(int type = 0)
         {
             float addition;
-            StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
-
-            // 活动
-            if (IsluckyBoxFilingChapter())
-            {
-                addition = GetAdditionBySuitIds(filingCfg.activitySuitIdArr);
-            }
-            // 查阅建档
-            else
-            {
-                addition = GetAdditionBySuitId(filingCfg.suitId);
+            // 开服活动
+            if (type == ConstInstanceZonesType.PureFight) {
+                ActivityFightCfg fightCfg = ActivityFightCfgArray.Instance.GetCfg(filingChapterId);
+                addition = GetAdditionBySuitIds(fightCfg.activitySuitIdArr);
+            }
+            else {
+                StudioCfg filingCfg = StudioCfgArray.Instance.GetCfg(filingChapterId);
+                // 活动
+                if (IsluckyBoxFilingChapter())
+                    addition = GetAdditionBySuitIds(filingCfg.activitySuitIdArr);
+                // 查阅建档
+                else
+                    addition = GetAdditionBySuitId(filingCfg.suitId);
             }
             return addition;
         }
@@ -217,7 +220,6 @@ namespace GFGGame
             return studioData.RewardsStatus;
         }
 
-
         public bool IsluckyBoxFilingChapter()
         {
             return filingChapterId == GetLuckyBoxActivityID();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHeadWithLv2.cs

@@ -7,7 +7,6 @@ namespace UI.CommonGame
     public partial class UI_ComHeadWithLv2
     {
         public GComponent target;
-        public UI_ComHead2 m_comHead2;
         public UI_ComHead m_comHead;
         public UI_ComHeadLv1 m_comLv;
         public const string URL = "ui://eg2y0ldpo9ghtlp";
@@ -57,14 +56,11 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_comHead2 = (UI_ComHead2)UI_ComHead2.Create(comp.GetChild("comHead2"));
             m_comHead = (UI_ComHead)UI_ComHead.Create(comp.GetChild("comHead"));
             m_comLv = (UI_ComHeadLv1)UI_ComHeadLv1.Create(comp.GetChild("comLv"));
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comHead2.Dispose();
-            m_comHead2 = null;
             m_comHead.Dispose();
             m_comHead = null;
             m_comLv.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead3.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs

@@ -4,7 +4,7 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComHead3
+    public partial class UI_ComHead_new
     {
         public GComponent target;
         public Controller m_c1;
@@ -13,12 +13,12 @@ namespace UI.CommonGame
         public GLoader m_loaBorder;
         public const string URL = "ui://eg2y0ldpp4yntr6";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComHead3";
-        private static UI_ComHead3 _proxy;
+        public const string RES_NAME = "ComHead_new";
+        private static UI_ComHead_new _proxy;
 
-        public static UI_ComHead3 Create(GObject gObject = null)
+        public static UI_ComHead_new Create(GObject gObject = null)
         {
-            var ui = new UI_ComHead3();
+            var ui = new UI_ComHead_new();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -27,11 +27,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComHead3 Proxy(GObject gObject = null)
+        public static UI_ComHead_new Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComHead3();
+                _proxy = new UI_ComHead_new();
             }
             var ui = _proxy;
             if(gObject == null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead3.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComHead_new.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1e6a25231dbcb22429610cacda2f3239
+guid: b97e6963a8c6e8d48aa4242146a0da70
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Studio
+namespace UI.CommonGame
 {
     public partial class UI_CompFlower
     {
@@ -11,8 +11,8 @@ namespace UI.Studio
         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 URL = "ui://eg2y0ldprqo41r";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "CompFlower";
         private static UI_CompFlower _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_CompFlower.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_CompFlower.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0233d817117a37f43a12ccee1f3a6ce4
+guid: 934e11bcdecb10f4a9233b66743da7c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Studio
+namespace UI.CommonGame
 {
     public partial class UI_ListLevelItem
     {
@@ -20,8 +20,8 @@ namespace UI.Studio
         public Transition m_ToLeft;
         public Transition m_ToRight;
         public Transition m_Left;
-        public const string URL = "ui://xz8kxrecv4822p";
-        public const string PACKAGE_NAME = "Studio";
+        public const string URL = "ui://eg2y0ldpv4822p";
+        public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "ListLevelItem";
         private static UI_ListLevelItem _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ListLevelItem.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListLevelItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 986b3dc77d6d72a489b1bc56a30ce90d
+guid: 89fb192eda147f948abfbc01c6c50a45
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerFightUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerFightUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public const string URL = "ui://b8ha2mnspll2h";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerFightUI";
+        private static UI_OpenServerFightUI _proxy;
+
+        public static UI_OpenServerFightUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerFightUI();
+            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_OpenServerFightUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerFightUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerFightUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerStoryUI.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.OpenServerActivity
+{
+    public partial class UI_OpenServerStoryUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public GList m_list;
+        public const string URL = "ui://b8ha2mnspll2g";
+        public const string PACKAGE_NAME = "OpenServerActivity";
+        public const string RES_NAME = "OpenServerStoryUI";
+        private static UI_OpenServerStoryUI _proxy;
+
+        public static UI_OpenServerStoryUI Create(GObject gObject = null)
+        {
+            var ui = new UI_OpenServerStoryUI();
+            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_OpenServerStoryUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_OpenServerStoryUI();
+            }
+            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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/OpenServerActivity/UI_OpenServerStoryUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -119,8 +119,18 @@ namespace GFGGame
                         }
                     }
                     else if (activityCfg.type == ConstLimitTimeActivityType.ActLimitStlyc)
-                    { 
-
+                    {
+                        if (ActivityDataManager.Instance.actLimitStlycId != response.ActivityId)
+                        {
+                            ActivityDataManager.Instance.limitStlycActBonusState.Clear();
+                        }
+                        ActivityDataManager.Instance.actLimitStlycId = response.ActivityId;
+                        ActivityDataManager.Instance.allLimitStlycTimes = response.AllPlayTimes;
+                        ActivityDataManager.Instance.lastLimitStlycDrawCount = response.Count;
+                        for (int i = 0; i < response.KsBonusState.Count; i++)
+                        {
+                            ActivityDataManager.Instance.limitStlycActBonusState[response.KsBonusState[i]] = response.VsBonusState[i];
+                        }
                     }
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxBonusView.cs

@@ -47,15 +47,23 @@ namespace GFGGame
         {
             base.OnShown();
             _typeId = (int)this.viewData;
-
-            _activityId = ActivityDataManager.Instance.actLuckyBoxId;
-            _allPlayTimes = ActivityDataManager.Instance.allPlayTimes;
-            _bonusState = ActivityDataManager.Instance.luckyBoxActBonusState;
-            if (_typeId == ConstLimitTimeActivityType.ActLimitTsy) { 
+            if (_typeId == ConstLimitTimeActivityType.ActLimitLuckyBox)
+            {
+                _activityId = ActivityDataManager.Instance.actLuckyBoxId;
+                _allPlayTimes = ActivityDataManager.Instance.allPlayTimes;
+                _bonusState = ActivityDataManager.Instance.luckyBoxActBonusState;
+            }
+            else if(_typeId == ConstLimitTimeActivityType.ActLimitTsy) {
                 _activityId = ActivityDataManager.Instance.actLimitTsyId;
                 _allPlayTimes = ActivityDataManager.Instance.allTsyPlayTimes;
                 _bonusState = ActivityDataManager.Instance.luckyActTsyBonusState;
             }
+            else if (_typeId == ConstLimitTimeActivityType.ActLimitStlyc)
+            {
+                _activityId = ActivityDataManager.Instance.actLimitStlycId;
+                _allPlayTimes = ActivityDataManager.Instance.allLimitStlycTimes;
+                _bonusState = ActivityDataManager.Instance.limitStlycActBonusState;
+            }
 
             _bonueCfgs = ActivityLuckybonusCfgArray.Instance.GetCfgsByid(_activityId);
             _bonueCfgs = ActivityDataManager.Instance.SortActivityLuckybonusCfg(_bonueCfgs, _typeId);
@@ -65,13 +73,11 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-
         }
 
         private void RenderListItem(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
-            ViewManager.Show<LuckyBoxActivityView>(new object[] { _activityId, ConstLimitTimeActivityType.ActLimitLuckyBox});
+            ViewManager.Show<LuckyBoxActivityView>(ConstLimitTimeActivityType.ActLimitLuckyBox);
         }
 
         private void OnBtnShopClick()

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -78,8 +78,8 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _activityId = (int)(this.viewData as object[])[0];
-            _activityType = (int)(this.viewData as object[])[1];
+            _activityType = (int)this.viewData;
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
             _luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(_activityCfg.paramsArr[0]);
             _valueBarController.OnShown();
@@ -165,7 +165,14 @@ namespace GFGGame
             int boughtCount = GameGlobal.myNumericComponent.GetAsInt(_luckyBoxCfg.numericType);
             comBox.m_txtRemainTimes.text = string.Format("今日剩余次数：{0}", _luckyBoxCfg.maxCount - boughtCount);
             UI_ComBox.ProxyEnd();
-            _ui.m_txtCount.SetVar("value", ActivityDataManager.Instance.lastDrawCount.ToString()).FlushVars();
+
+            string strDrawCount = "";
+            if (_activityType == ConstLimitTimeActivityType.ActLimitLuckyBox)
+                strDrawCount = ActivityDataManager.Instance.lastDrawCount.ToString();
+            else if (_activityType == ConstLimitTimeActivityType.ActLimitStlyc)
+                strDrawCount = ActivityDataManager.Instance.lastLimitStlycDrawCount.ToString();
+
+            _ui.m_txtCount.SetVar("value", strDrawCount).FlushVars();
             _ui.m_txtCount.SetVar("name", _luckyBoxCfg.name).FlushVars();
         }
         private void UpGiftBox()

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

@@ -20,6 +20,7 @@ namespace GFGGame
             _onFinishStoryLevelCall = onFinishStoryLevelCall;
             InstanceZonesDataManager.currentLevelCfgId = levelCfgId;
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+
             if (levelCfg.fightID.Length > 0)
             {
                 StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);

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

@@ -539,9 +539,9 @@ namespace GFGGame
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             if (storyLevelCfg != null)
             {
-                if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+                if ((storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3) || storyLevelCfg.type == ConstInstanceZonesType.PureFight)
                 {
-                    float addition = StudioDataManager.Instance.GetAddition();
+                    float addition = StudioDataManager.Instance.GetAddition(storyLevelCfg.type);
                     addition = addition / 10000 * FightDataManager.Instance.totalScore;
                     _score += (int)Math.Round(addition);
                     UpdateProgressA();

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

@@ -278,16 +278,16 @@ namespace GFGGame
             }
             else if (fightCfg.needTagsArr.Length > 0)
             {
-                _ui.m_ctrlNeed.selectedIndex = 2;
+                _ui.m_ctrlNeed.selectedIndex = 2; 
                 _ui.m_listTag.numItems = fightCfg.needTagsArr.Length;
             }
-            else if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            else if ((levelCfg.type == ConstInstanceZonesType.Studio  && levelCfg.subType == ConstInstanceZonesSubType.Hard3) || levelCfg.type == ConstInstanceZonesType.PureFight)
             {
                 _ui.m_ctrlNeed.selectedIndex = 3;
                 _ui.m_grpAdditionDesc.visible = false;
 
                 // 如果是活动界面，不显示收集进度
-                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+                if (StudioDataManager.Instance.IsluckyBoxFilingChapter() || levelCfg.type == ConstInstanceZonesType.PureFight)
                 {
                     _ui.m_btnAdditionDesc.visible = false;
                 }
@@ -300,10 +300,16 @@ namespace GFGGame
                     _ui.m_btnAdditionDesc.visible = true;
                 }
 
-                float addition = StudioDataManager.Instance.GetAddition();
+                float addition = 0;
+                if (levelCfg.type == ConstInstanceZonesType.PureFight)
+                {
+                    StudioDataManager.Instance.filingChapterId = levelCfg.chapterId;
+                    addition = StudioDataManager.Instance.GetAddition(ConstInstanceZonesType.PureFight);  
+                }
+                else 
+                    addition = StudioDataManager.Instance.GetAddition();
                 addition = addition / 10000 * 100;
                 _ui.m_txtAddition.text = string.Format("{0}%加成", addition);
-
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -626,6 +626,15 @@ namespace GFGGame
                     ActivityDataManager.Instance.lastActLimitTsyId = actLimitTsyId;
                 }
             }
+            int actLimitStlycId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitStlyc);
+            if (actLimitStlycId > 0)
+            {
+                if (actLimitStlycId != ActivityDataManager.Instance.lastActLimitStlycId)
+                {
+                    ActivitySProxy.ReqGetTimeLimitLuckyBoxInfo(actLimitStlycId).Coroutine();
+                    ActivityDataManager.Instance.lastActLimitStlycId = actLimitStlycId;
+                }
+            }
 
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -4,7 +4,7 @@ using UI.OpenServerActivity;
 
 namespace GFGGame
 {
-    public class OpenServerActivityView : BaseView
+    public class OpenServerActivityView : BaseWindow
     {
         private UI_OpenServerActivityUI _ui;
 
@@ -96,8 +96,7 @@ namespace GFGGame
         private void OnClickBtnMingTong()
         {
             //副本入口
-            PromptController.Instance.ShowFloatTextPrompt("暂未开启");
-            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
+            ViewManager.Show<OpenServerStoryView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnAnswerTianmen()
@@ -115,7 +114,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("活动未开启");
                 return;
             }
-            ViewManager.Show<LuckyBoxActivityView>(new object[]{actLimitId, ConstLimitTimeActivityType.ActLimitStlyc});
+            ViewManager.Show<LuckyBoxActivityView>(ConstLimitTimeActivityType.ActLimitStlyc);
         }
 
         private void OnClickBtnNineZhouPool() 

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs

@@ -0,0 +1,166 @@
+using UnityEngine;
+using FairyGUI;
+using UI.OpenServerActivity;
+using UI.CommonGame;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class OpenServerStoryView : BaseWindow
+    {
+        private UI_OpenServerStoryUI _ui;
+        private int itemIndex = 0;
+        private List<StoryLevelCfg> _storyLevelCfgs;
+        private ActivityFightCfg _activityFightCfg;
+        private int _activityId;
+        private int _activityType;
+        private ActivityOpenCfg _activityCfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void Init()
+        {
+            base.Init();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_OpenServerStoryUI.PACKAGE_NAME;
+            _ui = UI_OpenServerStoryUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+            _ui.m_list.itemRenderer = RenderListItem;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _activityType = (int)this.viewData;
+            StudioDataManager.Instance.VIEW_NAME = typeof(OpenServerStoryView).FullName;
+            StudioDataManager.Instance.PROPERTY_SELECT_INDEX = _activityType;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("kfhd_sdcy_bg");
+            _activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_activityType);
+            _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
+            _activityFightCfg = ActivityFightCfgArray.Instance.GetCfg(_activityCfg.params3Arr[0]);
+            _storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_activityFightCfg.type, _activityFightCfg.subType, _activityCfg.params3Arr[0]);
+            _ui.m_list.numItems = _storyLevelCfgs.Count;
+            UpdateItem();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(OpenServerStoryView).FullName);
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            // int _index = _storyLevelCfgs.Count - index - 1;
+            UI_ListLevelItem item = UI_ListLevelItem.Proxy(obj);
+            //item.m_c1.selectedIndex = index % 2 == 0 ? 0 : 1;
+            item.m_txtName.text = _storyLevelCfgs[index].name;
+            bool isFight = string.IsNullOrEmpty(_storyLevelCfgs[index].storyStartID);
+            string resBg = isFight ? "cyjd_di_1" : "cyjd_di_2";
+            //item.m_loaBg.url = string.Format("ui://Studio/{0}", resBg);
+
+            if (isFight)
+            {
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_1";
+                item.m_loaIcon.visible = false;
+                item.m_loaItem.visible = true;
+                StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
+                int itemId = storyFightCfg.bonusBaseArr[0][0];
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+                item.m_loaItem.url = ResPathUtil.GetIconPath(itemCfg);
+                if (item.m_loaItem.data == null)
+                {
+                    item.m_loaItem.onClick.Add(OnLoaItemClick);
+                }
+                item.m_loaItem.data = index;
+            }
+            else
+            {
+                //item.m_loaBg.url = "ui://Studio/cyjd_di_2";
+                item.m_loaItem.visible = false;
+                item.m_loaIcon.visible = true;
+                item.m_loaIcon.url = string.Format("ui://Studio/{0}", _activityFightCfg.res);
+            }
+            item.m_grpLock.visible = index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id);
+            item.m_comFlower.m_c1.selectedIndex = InstanceZonesDataManager.GetStarCountHistory(_storyLevelCfgs[index].id);
+            if (item.m_loaBg.data == null)
+            {
+                item.m_loaBg.onClick.Add(OnListItemClick);
+            }
+            item.m_loaBg.data = index;
+            UI_ListLevelItem.ProxyEnd();
+        }
+
+        private void OnListItemClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+            StoryLevelCfg storyLevelCfg = _storyLevelCfgs[index];
+            if (index > 0 && !InstanceZonesDataManager.CheckLevelPass(_storyLevelCfgs[index - 1].id))
+            {
+                PromptController.Instance.ShowFloatTextPrompt("Ðèͨ¹ØÇ°Öùؿ¨");
+                return;
+            }
+            MainStoryDataManager.currentLevelCfgId = storyLevelCfg.id;
+            InstanceZonesController.ShowLevelView(storyLevelCfg.id, StudioDataManager.Instance.OnFinishStudioStoryLevel);
+        }
+
+        private void OnLoaItemClick(EventContext context)
+        {
+            GObject obj = context.sender as GObject;
+            int index = (int)obj.data;
+            StoryFightCfg storyFightCfg = StoryFightCfgArray.Instance.GetCfg(_storyLevelCfgs[index].fightID);
+            int itemId = storyFightCfg.bonusBaseArr[0][0];
+            GoodsItemTipsController.ShowItemTips(itemId);
+
+        }
+        private void UpdateItem()
+        {
+            for (int i = 0; i < _ui.m_list.numChildren; i++)
+            {
+                _ui.m_list.GetChildAt(i).visible = false;
+            }
+            itemIndex = 0;
+            Timers.inst.Add(0.05f, _ui.m_list.numChildren, AddItemUpdate, 1);
+        }
+
+        private void AddItemUpdate(object param)
+        {
+            _ui.m_list.GetChildAt(itemIndex).visible = true;
+            UI_ListLevelItem item = UI_ListLevelItem.Proxy(_ui.m_list.GetChildAt(itemIndex));
+            item.m_Left.Play();
+            itemIndex++;
+            UI_ListLevelItem.ProxyEnd();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerStoryView.cs.meta

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

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
 

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ET;
 using FairyGUI;
+using UI.CommonGame;
 using UI.Studio;
 using UnityEngine;
 
@@ -81,8 +82,8 @@ namespace GFGGame
             _valueBarController.OnHide();
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(AddItemUpdate);
-
         }
+
         protected void GoBackFrom()
         {
             ViewManager.GoBackFrom(typeof(StudioFilingView).FullName);