snxxz_scripts.git

parent: 5c8f9f58 | 补丁 | 提交 | ignore whitespace

client_Wu Xijin

2018-09-07 71045aa683bd5ab588670785ada752d52b9d10b8

3243  【开发】开服限时活动定制

3 文件已重命名

4个文件已修改

1个文件已删除

3 文件已复制

2个文件已添加

	Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs.meta	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/DailyQuestSpecificOpenTimeConfig.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs.meta	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/ConfigManager.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/TelPartialConfig/DailyQuestSpecialOpenTimeConfig.cs	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/TelPartialConfig/DailyQuestSpecialOpenTimeConfig.cs.meta	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs.meta	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestData.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/DungeonModel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs

File was renamed from Core/GameEngine/Model/Config/DailyQuestSpecificOpenTimeConfig.cs
@@ -9,7 +9,7 @@
namespace TableConfig {

    
    public partial class DailyQuestSpecificOpenTimeConfig : ConfigBase {
    public partial class DailyQuestSpecialOpenTimeConfig : ConfigBase {

        public int ID { get ; private set ; }
        public int OpenServerWeek { get ; private set ; }

 Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs.meta

copy from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
copy to Core/GameEngine/Model/Config/DailyQuestSpecialOpenTimeConfig.cs.meta
File was copied from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ecb895ff4d37765409261b28c3fb5009
timeCreated: 1536305957
guid: f9b9b217bedba6a4ba3131db2858da0d
timeCreated: 1536327254
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Config/DailyQuestSpecificOpenTimeConfig.cs.meta

File was deleted

 Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs

File was renamed from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs
@@ -9,7 +9,7 @@
namespace TableConfig {

    
    public partial class DungeonSpecificlStateTimeConfig : ConfigBase {
    public partial class DungeonSpecialStateTimeConfig : ConfigBase {

        public int ID { get ; private set ; }
        public int OpenServerWeek { get ; private set ; }

 Core/GameEngine/Model/Config/DungeonSpecialStateTimeConfig.cs.meta

File was renamed from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ecb895ff4d37765409261b28c3fb5009
timeCreated: 1536305957
timeCreated: 1536327385
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/ConfigManager.cs

@@ -14,7 +14,8 @@
    bool isPlaying = true;



    bool m_Inited = false;

    public bool inited {

    public bool inited

    {

        get { return m_Inited; }

        private set { m_Inited = value; }

    }

@@ -40,6 +41,7 @@
        AddAsyncTask<IconConfig>();

        AddAsyncTask<ItemConfig>();

        AddAsyncTask<SkillConfig>();

        AddAsyncTask<DirtyNameConfig>();

        AddAsyncTask<TASKINFOConfig>();

        AddAsyncTask<mapnpcConfig>();

        AddAsyncTask<LoginSeverListConfig>();

@@ -189,7 +191,9 @@
        AddAsyncTask<TrialRewardsConfig>();

        AddAsyncTask<DogzEquipPlusConfig>();

        AddAsyncTask<FairyGrabBossConfig>();

        AddAsyncTask<DirtyNameConfig>();

        AddAsyncTask<DungeonSpecialStateTimeConfig>();

        AddAsyncTask<DailyQuestSpecialOpenTimeConfig>();



        while (!AllCompleted())

        {

            var completedCount = 0;


 Core/GameEngine/Model/TelPartialConfig/DailyQuestSpecialOpenTimeConfig.cs

New file
@@ -0,0 +1,38 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

namespace TableConfig
{

    public partial class DailyQuestSpecialOpenTimeConfig : ConfigBase, IConfigPostProcess
    {

        static Dictionary<int, List<DailyQuestSpecialOpenTimeConfig>> dailyQuestTimes = new Dictionary<int, List<DailyQuestSpecialOpenTimeConfig>>();

        public void OnConfigParseCompleted()
        {
            if (!dailyQuestTimes.ContainsKey(DailyQuestID))
            {
                dailyQuestTimes[DailyQuestID] = new List<DailyQuestSpecialOpenTimeConfig>();
            }

            dailyQuestTimes[DailyQuestID].Add(this);
        }

        public static List<DailyQuestSpecialOpenTimeConfig> GetDailyQuestTimes(int dailyQuestId)
        {
            if (dailyQuestTimes.ContainsKey(dailyQuestId))
            {
                return dailyQuestTimes[dailyQuestId];
            }
            else
            {
                return null;
            }
        }

    }

}


 Core/GameEngine/Model/TelPartialConfig/DailyQuestSpecialOpenTimeConfig.cs.meta

copy from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
copy to Core/GameEngine/Model/TelPartialConfig/DailyQuestSpecialOpenTimeConfig.cs.meta
File was copied from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ecb895ff4d37765409261b28c3fb5009
timeCreated: 1536305957
guid: 1cfbe263bb01efc489f714f48a565cd1
timeCreated: 1536327708
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs

New file
@@ -0,0 +1,36 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

namespace TableConfig
{

    public partial class DungeonSpecialStateTimeConfig : ConfigBase, IConfigPostProcess
    {
        static Dictionary<int, List<DungeonSpecialStateTimeConfig>> dailyQuestTimes = new Dictionary<int, List<DungeonSpecialStateTimeConfig>>();

        public void OnConfigParseCompleted()
        {
            if (!dailyQuestTimes.ContainsKey(DataMapID))
            {
                dailyQuestTimes[DataMapID] = new List<DungeonSpecialStateTimeConfig>();
            }

            dailyQuestTimes[DataMapID].Add(this);
        }

        public static List<DungeonSpecialStateTimeConfig> GetDailyQuestTimes(int dailyQuestId)
        {
            if (dailyQuestTimes.ContainsKey(dailyQuestId))
            {
                return dailyQuestTimes[dailyQuestId];
            }
            else
            {
                return null;
            }
        }

    }

}

 Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs.meta

copy from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
copy to Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs.meta
File was copied from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ecb895ff4d37765409261b28c3fb5009
timeCreated: 1536305957
guid: 6127c3f2b622e014186a9df283c45e49
timeCreated: 1536326200
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/DailyQuest/DailyQuestData.cs

@@ -110,7 +110,7 @@
        }

    }



    public void ParseQuestSpecificOpenTimes(List<DailyQuestSpecificOpenTimeConfig> configs)

    public void ParseQuestSpecificOpenTimes(List<DailyQuestSpecialOpenTimeConfig> configs)

    {

        specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;

        foreach (var config in configs)

@@ -177,7 +177,7 @@
        }

    }



    public void ParseDungeonSpecificOpenTimes(List<DungeonSpecificlStateTimeConfig> configs)

    public void ParseDungeonSpecificOpenTimes(List<DungeonSpecialStateTimeConfig> configs)

    {

        specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;

        foreach (var config in configs)


 System/DailyQuest/DailyQuestModel.cs

@@ -989,14 +989,14 @@
                        var activityOpenTime = Config.Instance.Get<DailyQuestOpenTimeConfig>(config.RelatedID);

                        openTime = dailyQuestOpenTimes[config.ID] = new DailyQuestOpenTime(config.ID);

                        openTime.ParseQuestNormalOpenTime(activityOpenTime.OpenTime, activityOpenTime.Duration);

                        //还有定制的时间需要计算

                        openTime.ParseQuestSpecificOpenTimes(DailyQuestSpecialOpenTimeConfig.GetDailyQuestTimes(config.RelatedID));

                        dailyActionToDailyQuestTable[config.RelatedID] = config.ID;

                        break;

                    case 2:

                        var dungeonOpenTimes = DungeonStateTimeConfig.DungeonStateCanEnterFB(config.RelatedID);

                        openTime = dailyQuestOpenTimes[config.ID] = new DailyQuestOpenTime(config.ID);

                        openTime.ParseDungeonNormalOpenTimes(dungeonOpenTimes);

                        //还有定制的时间需要计算

                        openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDailyQuestTimes(config.RelatedID));

                        dungeonToDailyQuestTable[config.RelatedID] = config.ID;

                        break;

                }


 System/Dungeon/DungeonModel.cs

@@ -1349,7 +1349,7 @@
                {

                    var openTime = dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID);

                    openTime.ParseDungeonNormalOpenTimes(DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID));

                    //还有定制日期

                    openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDailyQuestTimes(config.DataMapID));

                }

            }

File was renamed from Core/GameEngine/Model/Config/DailyQuestSpecificOpenTimeConfig.cs
			@@ -9,7 +9,7 @@
			namespace TableConfig {


			public partial class DailyQuestSpecificOpenTimeConfig : ConfigBase {
			public partial class DailyQuestSpecialOpenTimeConfig : ConfigBase {

			public int ID { get ; private set ; }
			public int OpenServerWeek { get ; private set ; }

File was copied from Core/GameEngine/Model/Config/DungeonSpecificlStateTimeConfig.cs.meta
			@@ -1,6 +1,6 @@
			fileFormatVersion: 2
			guid: ecb895ff4d37765409261b28c3fb5009
			timeCreated: 1536305957
			guid: f9b9b217bedba6a4ba3131db2858da0d
			timeCreated: 1536327254
			licenseType: Pro
			MonoImporter:
			serializedVersion: 2

			@@ -14,7 +14,8 @@
			bool isPlaying = true;

			bool m_Inited = false;
			public bool inited {
			public bool inited
			{
			get { return m_Inited; }
			private set { m_Inited = value; }
			}
			@@ -40,6 +41,7 @@
			AddAsyncTask<IconConfig>();
			AddAsyncTask<ItemConfig>();
			AddAsyncTask<SkillConfig>();
			AddAsyncTask<DirtyNameConfig>();
			AddAsyncTask<TASKINFOConfig>();
			AddAsyncTask<mapnpcConfig>();
			AddAsyncTask<LoginSeverListConfig>();
			@@ -189,7 +191,9 @@
			AddAsyncTask<TrialRewardsConfig>();
			AddAsyncTask<DogzEquipPlusConfig>();
			AddAsyncTask<FairyGrabBossConfig>();
			AddAsyncTask<DirtyNameConfig>();
			AddAsyncTask<DungeonSpecialStateTimeConfig>();
			AddAsyncTask<DailyQuestSpecialOpenTimeConfig>();

			while (!AllCompleted())
			{
			var completedCount = 0;

New file
			@@ -0,0 +1,38 @@
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;

			namespace TableConfig
			{

			public partial class DailyQuestSpecialOpenTimeConfig : ConfigBase, IConfigPostProcess
			{

			static Dictionary<int, List<DailyQuestSpecialOpenTimeConfig>> dailyQuestTimes = new Dictionary<int, List<DailyQuestSpecialOpenTimeConfig>>();

			public void OnConfigParseCompleted()
			{
			if (!dailyQuestTimes.ContainsKey(DailyQuestID))
			{
			dailyQuestTimes[DailyQuestID] = new List<DailyQuestSpecialOpenTimeConfig>();
			}

			dailyQuestTimes[DailyQuestID].Add(this);
			}

			public static List<DailyQuestSpecialOpenTimeConfig> GetDailyQuestTimes(int dailyQuestId)
			{
			if (dailyQuestTimes.ContainsKey(dailyQuestId))
			{
			return dailyQuestTimes[dailyQuestId];
			}
			else
			{
			return null;
			}
			}

			}

			}

New file
			@@ -0,0 +1,36 @@
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;

			namespace TableConfig
			{

			public partial class DungeonSpecialStateTimeConfig : ConfigBase, IConfigPostProcess
			{
			static Dictionary<int, List<DungeonSpecialStateTimeConfig>> dailyQuestTimes = new Dictionary<int, List<DungeonSpecialStateTimeConfig>>();

			public void OnConfigParseCompleted()
			{
			if (!dailyQuestTimes.ContainsKey(DataMapID))
			{
			dailyQuestTimes[DataMapID] = new List<DungeonSpecialStateTimeConfig>();
			}

			dailyQuestTimes[DataMapID].Add(this);
			}

			public static List<DungeonSpecialStateTimeConfig> GetDailyQuestTimes(int dailyQuestId)
			{
			if (dailyQuestTimes.ContainsKey(dailyQuestId))
			{
			return dailyQuestTimes[dailyQuestId];
			}
			else
			{
			return null;
			}
			}

			}

			}

			@@ -110,7 +110,7 @@
			}
			}

			public void ParseQuestSpecificOpenTimes(List<DailyQuestSpecificOpenTimeConfig> configs)
			public void ParseQuestSpecificOpenTimes(List<DailyQuestSpecialOpenTimeConfig> configs)
			{
			specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;
			foreach (var config in configs)
			@@ -177,7 +177,7 @@
			}
			}

			public void ParseDungeonSpecificOpenTimes(List<DungeonSpecificlStateTimeConfig> configs)
			public void ParseDungeonSpecificOpenTimes(List<DungeonSpecialStateTimeConfig> configs)
			{
			specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;
			foreach (var config in configs)

			@@ -989,14 +989,14 @@
			var activityOpenTime = Config.Instance.Get<DailyQuestOpenTimeConfig>(config.RelatedID);
			openTime = dailyQuestOpenTimes[config.ID] = new DailyQuestOpenTime(config.ID);
			openTime.ParseQuestNormalOpenTime(activityOpenTime.OpenTime, activityOpenTime.Duration);
			//还有定制的时间需要计算
			openTime.ParseQuestSpecificOpenTimes(DailyQuestSpecialOpenTimeConfig.GetDailyQuestTimes(config.RelatedID));
			dailyActionToDailyQuestTable[config.RelatedID] = config.ID;
			break;
			case 2:
			var dungeonOpenTimes = DungeonStateTimeConfig.DungeonStateCanEnterFB(config.RelatedID);
			openTime = dailyQuestOpenTimes[config.ID] = new DailyQuestOpenTime(config.ID);
			openTime.ParseDungeonNormalOpenTimes(dungeonOpenTimes);
			//还有定制的时间需要计算
			openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDailyQuestTimes(config.RelatedID));
			dungeonToDailyQuestTable[config.RelatedID] = config.ID;
			break;
			}

			@@ -1349,7 +1349,7 @@
			{
			var openTime = dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID);
			openTime.ParseDungeonNormalOpenTimes(DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID));
			//还有定制日期
			openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDailyQuestTimes(config.DataMapID));
			}
			}