From 94dbe7ffd266608ffcdf5bdfcabd0a393aa6881d Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 14:24:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/TrialDungeonModel.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/System/Dungeon/TrialDungeonModel.cs b/System/Dungeon/TrialDungeonModel.cs
index 261dd8d..9448739 100644
--- a/System/Dungeon/TrialDungeonModel.cs
+++ b/System/Dungeon/TrialDungeonModel.cs
@@ -252,6 +252,24 @@
return 0;
}
+ public int GetExchangeItemByJob(TrialExchangeConfig config)
+ {
+ if (config == null)
+ {
+ return 0;
+ }
+ if (config.exchangeItemID.Length == 1)
+ {
+ return config.exchangeItemID[0];
+ }
+ var job = PlayerDatas.Instance.baseData.Job;
+ if (job - 1 < config.exchangeItemID.Length && job - 1 >= 0)
+ {
+ return config.exchangeItemID[job - 1];
+ }
+ return config.exchangeItemID[0];
+ }
+
#region 绾㈢偣
void UpdateRedpoint()
{
@@ -308,12 +326,12 @@
{
return false;
}
- var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.exchangeItemID);
+ var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(GetExchangeItemByJob(config));
if (exchangeItemConfig.EquipPlace == 0)
{
return true;
}
- if (EquipCompare(config.exchangeItemID) == 1)
+ if (EquipCompare(GetExchangeItemByJob(config)) == 1)
{
return true;
}
@@ -328,7 +346,7 @@
{
for (int i = 0; i < list.Count; i++)
{
- var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(list[i].exchangeItemID);
+ var itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(GetExchangeItemByJob(list[i]));
if (SatisfyExchangeBetter(list[i].id) && itemConfig.EquipPlace != 0)
{
_id = list[i].id;
--
Gitblit v1.8.0