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/TrialExchangeBehaviour.cs | 8 ++--
Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta | 2
System/Dungeon/TrialDungeonModel.cs | 24 ++++++++++-
Core/GameEngine/Model/Config/TrialExchangeConfig.cs | 59 ++++++++++++++++-------------
4 files changed, 58 insertions(+), 35 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TrialExchangeConfig.cs b/Core/GameEngine/Model/Config/TrialExchangeConfig.cs
index 8d83e39..49855c9 100644
--- a/Core/GameEngine/Model/Config/TrialExchangeConfig.cs
+++ b/Core/GameEngine/Model/Config/TrialExchangeConfig.cs
@@ -1,35 +1,40 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Thursday, August 02, 2018
-//--------------------------------------------------------
-
-using UnityEngine;
-using System;
-
-namespace TableConfig {
-
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Monday, August 20, 2018
+//--------------------------------------------------------
+
+using UnityEngine;
+using System;
+
+namespace TableConfig {
+
+
public partial class TrialExchangeConfig : ConfigBase {
public int id { get ; private set ; }
- public int exchangeItemID { get ; private set ; }
+ public int[] exchangeItemID;
public int exchangeItemCount { get ; private set ; }
public int exchangeItemIsBind { get ; private set ; }
public int tokenId { get ; private set ; }
public int tokenCount { get ; private set ; }
public string description { get ; private set; }
-
+
public override string getKey()
{
return id.ToString();
- }
-
- public override void Parse() {
+ }
+
+ public override void Parse() {
try
{
id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0;
- exchangeItemID=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
+ string[] exchangeItemIDStringArray = rawContents[1].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ exchangeItemID = new int[exchangeItemIDStringArray.Length];
+ for (int i=0;i<exchangeItemIDStringArray.Length;i++)
+ {
+ int.TryParse(exchangeItemIDStringArray[i],out exchangeItemID[i]);
+ }
exchangeItemCount=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
@@ -44,13 +49,13 @@
catch (Exception ex)
{
DebugEx.Log(ex);
- }
- }
-
- }
-
-}
-
-
-
-
+ }
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta b/Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta
index 5bbd83b..709eab0 100644
--- a/Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/TrialExchangeConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 95c6c6944c394ac4381e86d9ce3006fb
-timeCreated: 1533192458
+timeCreated: 1534744580
licenseType: Pro
MonoImporter:
serializedVersion: 2
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;
diff --git a/System/Dungeon/TrialExchangeBehaviour.cs b/System/Dungeon/TrialExchangeBehaviour.cs
index 098e80f..a40aa2a 100644
--- a/System/Dungeon/TrialExchangeBehaviour.cs
+++ b/System/Dungeon/TrialExchangeBehaviour.cs
@@ -59,22 +59,22 @@
}
m_Item.cellBtn.RemoveAllListeners();
m_Item.gameObject.SetActive(true);
- ItemCellModel cellModel = new ItemCellModel(config.exchangeItemID, true, (ulong)config.exchangeItemCount, config.exchangeItemIsBind);
+ ItemCellModel cellModel = new ItemCellModel(model.GetExchangeItemByJob(config), true, (ulong)config.exchangeItemCount, config.exchangeItemIsBind);
m_Item.Init(cellModel);
m_Item.cellBtn.AddListener(() =>
{
- ItemAttrData itemAttrData = new ItemAttrData(config.exchangeItemID, true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind, true);
+ ItemAttrData itemAttrData = new ItemAttrData(model.GetExchangeItemByJob(config), true, (ulong)config.exchangeItemCount, -1, config.exchangeItemIsBind, true);
ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData);
});
m_Description.text = config.description;
m_Token.SetItem(config.tokenId, config.tokenCount);
var count = model.GetTrialTokenCount(config.tokenId);
m_Token.count.color = UIHelper.GetUIColor(count >= config.tokenCount ? TextColType.Green : TextColType.NavyBrown, true);
- var equipCompare = model.EquipCompare(config.exchangeItemID);
+ var equipCompare = model.EquipCompare(model.GetExchangeItemByJob(config));
m_Up.gameObject.SetActive(equipCompare == 1);
m_Down.gameObject.SetActive(equipCompare == -1);
- var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(config.exchangeItemID);
+ var exchangeItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(model.GetExchangeItemByJob(config));
m_Redpoint.gameObject.SetActive(count >= config.tokenCount && (equipBetter || exchangeItemConfig.EquipPlace == 0));
}
}
--
Gitblit v1.8.0