From 104f3128c8f94f62fab6f5cf8f49422e708e733a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 04 三月 2019 16:32:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Utility/ConfigInitiator.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Utility/ConfigInitiator.cs b/Utility/ConfigInitiator.cs
index 17bf349..07932ea 100644
--- a/Utility/ConfigInitiator.cs
+++ b/Utility/ConfigInitiator.cs
@@ -38,7 +38,8 @@
&& CreateRoleConfig.inited
&& JobSetupConfig.inited
&& ModelResConfig.inited
- && GodWeaponConfig.inited;
+ && GodWeaponConfig.inited
+ && GodWeaponEffectConfig.inited;
}
}
@@ -86,7 +87,8 @@
priorTasks.Add(new ConfigInitTask("CreateRoleConfig", () => { CreateRoleConfig.Init(); }, () => { return CreateRoleConfig.inited; }));
priorTasks.Add(new ConfigInitTask("JobSetupConfig", () => { JobSetupConfig.Init(); }, () => { return JobSetupConfig.inited; }));
priorTasks.Add(new ConfigInitTask("ModelResConfig", () => { ModelResConfig.Init(); }, () => { return ModelResConfig.inited; }));
- priorTasks.Add(new ConfigInitTask("GodWeaponConfig", () => { GodWeaponConfig.Init(); }, () => { return GodWeaponConfig.inited; }));
+ priorTasks.Add(new ConfigInitTask("GodWeaponConfig", () => { GodWeaponConfig.Init(); }, () => { return GodWeaponConfig.inited; }));
+ priorTasks.Add(new ConfigInitTask("GodWeaponEffectConfig", () => { GodWeaponEffectConfig.Init(); }, () => { return GodWeaponEffectConfig.inited; }));
priorTasks.Add(new ConfigInitTask("TASKINFOConfig", () => { TASKINFOConfig.Init(); }, () => { return TASKINFOConfig.inited; }));
priorTasks.Add(new ConfigInitTask("mapnpcConfig", () => { mapnpcConfig.Init(); }, () => { return mapnpcConfig.inited; }));
priorTasks.Add(new ConfigInitTask("SkillConfig", () => { SkillConfig.Init(); }, () => { return SkillConfig.inited; }));
@@ -263,7 +265,6 @@
normalTasks.Add(new ConfigInitTask("GatherSoulPropertyConfig", () => { GatherSoulPropertyConfig.Init(); }, () => { return GatherSoulPropertyConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GetItemWaysConfig", () => { GetItemWaysConfig.Init(); }, () => { return GetItemWaysConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GmCmdConfig", () => { GmCmdConfig.Init(); }, () => { return GmCmdConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("GodWeaponEffectConfig", () => { GodWeaponEffectConfig.Init(); }, () => { return GodWeaponEffectConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GuardConfig", () => { GuardConfig.Init(); }, () => { return GuardConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GuideConfig", () => { GuideConfig.Init(); }, () => { return GuideConfig.inited; }));
normalTasks.Add(new ConfigInitTask("HolidayHomingConfig", () => { HolidayHomingConfig.Init(); }, () => { return HolidayHomingConfig.inited; }));
--
Gitblit v1.8.0