From a3537e2118370592db394063070fb091f166dbad Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 20 四月 2019 16:01:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainCollectBehaviour.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/System/MainInterfacePanel/MainCollectBehaviour.cs b/System/MainInterfacePanel/MainCollectBehaviour.cs
index 9d2dcf7..4b1460f 100644
--- a/System/MainInterfacePanel/MainCollectBehaviour.cs
+++ b/System/MainInterfacePanel/MainCollectBehaviour.cs
@@ -19,8 +19,7 @@
int collectNpcId = 0;
uint serverInstanceId = 0;
- DungeonModel dungeonModel
- {
+ DungeonModel dungeonModel {
get { return ModelCenter.Instance.GetModel<DungeonModel>(); }
}
@@ -64,18 +63,18 @@
void DisplayNormalCollect()
{
- var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
- switch (mapId)
+ var config = CollectNpcConfig.Get(collectNpcId);
+ if (config == null)
{
- case 31230:
- m_NormalCollectIcon.SetSprite("TY_UI_8");
- m_NormalCollectLabel.text = Language.Get("Collect_FairyFeast");
- break;
- default:
- m_NormalCollectIcon.SetSprite("TY_UI_6");
- m_NormalCollectLabel.text = Language.Get("Collect_Normal");
- break;
+ m_NormalCollectIcon.SetSprite("TY_UI_6");
+ m_NormalCollectLabel.text = Language.Get("Collect_Normal");
}
+ else
+ {
+ m_NormalCollectIcon.SetSprite(config.Icon);
+ m_NormalCollectLabel.text = config.tip;
+ }
+
m_NormalCollectIcon.SetNativeSize();
}
--
Gitblit v1.8.0