From fd9260faf9600b6a06bbda798a00f34128606a42 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 27 八月 2018 10:15:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonTargetBehaviour.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/Dungeon/DungeonTargetBehaviour.cs b/System/Dungeon/DungeonTargetBehaviour.cs
index 021e841..d9f07ce 100644
--- a/System/Dungeon/DungeonTargetBehaviour.cs
+++ b/System/Dungeon/DungeonTargetBehaviour.cs
@@ -37,7 +37,7 @@
var dateMapId = model.GetDungeonDataIdByMapId(currentDungeonId);
var hintId = model.DungeonHintMap(dateMapId, 0);
- var config = ConfigManager.Instance.GetTemplate<DungeonHintConfig>(hintId);
+ var config = Config.Instance.Get<DungeonHintConfig>(hintId);
m_TargetDescs[0].gameObject.SetActive(config.targetNum >= 1);
m_TargetDescs[1].gameObject.SetActive(config.targetNum >= 2);
@@ -77,7 +77,7 @@
case DungeonTargetType.NPC:
int killCnt = 0;
if (npcId != 0) {
- var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(npcId);
+ var npcConfig = Config.Instance.Get<NPCConfig>(npcId);
desc = desc.Replace("@NPCName@", npcConfig.charName);
if (model.mission.npc != null) {
for (int i = 0; i < model.mission.npc.Length; i++) {
--
Gitblit v1.8.0