Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-10-15 98a760d2d1de29c7d72b998dfde426f05605b72b

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/DungeonOpenTimeConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Friday, March 02, 2018
//    [  Date ]:           Monday, October 15, 2018
//--------------------------------------------------------

using UnityEngine;

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

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: bf6b02af80ae8d84c9c211ed6753c6b6
timeCreated: 1519978426
timeCreated: 1539589748
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/NetworkPackage/DTCFile/ClientPack/ClientToMapServer.meta

File was deleted

 System/Activity/ActivityModel.cs

@@ -269,22 +269,6 @@
                    return true;

                }

            }

            if (cfg.RelatedType == 1)

            {

                DailyQuestOpenTimeConfig dailyQuestOpenTimeModel = Config.Instance.Get<DailyQuestOpenTimeConfig>(cfg.RelatedID);

                if (TimeUtility.OpenDay <= dailyQuestOpenTimeModel.OpenServerDay - 1)

                {

                    return true;

                }

            }

            else if (cfg.RelatedType == 2)

            {

                DungeonOpenTimeConfig dungeonOpenTimeModel = Config.Instance.Get<DungeonOpenTimeConfig>(cfg.RelatedID);

                if (TimeUtility.OpenDay <= dungeonOpenTimeModel.OpenServerDay - 1)

                {

                    return true;

                }

            }



            int entertimes = dailyQuestModel.GetDailyQuestCompletedTimes(type);

            if (dailyQuestModel.GetDailyQuestTotalTimes(cfg.ID) <= entertimes)