From f8ce5efb2f4be994a66cf544090defa20b383279 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 11 九月 2018 12:00:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 58a0678..4979b55 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -904,7 +904,7 @@
m_CollectNPCID = npcID;
m_CollectNPCSID = sid;
m_CollectBtn.gameObject.SetActive(true);
- var mapId = dungeonModel.GetDungeonDataIdByMapId(PlayerDatas.Instance.baseData.MapID);
+ var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
m_CollectIcon.SetSprite(mapId == 31230 ? "TY_UI_8" : "TY_UI_6");
m_CollectIcon.SetNativeSize();
m_CollectBtnText.text = mapId == 31230 ? Language.Get("Collect_FairyFeast") : Language.Get("Collect_Normal");
@@ -977,7 +977,7 @@
ShowCastSkill();//鏄剧ず鎶�鑳界粍闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
}
var _cfg = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);
- var _skillId = ModelCenter.Instance.GetModel<AchievementModel>().FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
+ var _skillId = SkillConfig.FindSkillByJob(_cfg.Condition, PlayerDatas.Instance.baseData.Job);
if (_skillId != 0)
{
if (ModelCenter.Instance.GetModel<SkillModel>().GetXpSkillID() != _skillId)
--
Gitblit v1.8.0