From f115d8031d01bde81a29d76d13ab3a17d2f9cb59 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 31 十月 2018 16:57:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs b/Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs
index b50908a..fc0d524 100644
--- a/Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs
+++ b/Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs
@@ -46,12 +46,12 @@
}
- int[] makeIDs = ConfigParse.GetMultipleStr<int>(makeID);
- int[] unfixedItemIDs = ConfigParse.GetMultipleStr<int>(unfixedItemID);
- int[] fixedItemIDs = ConfigParse.GetMultipleStr<int>(itemID);
- int[] fixedItemCounts = ConfigParse.GetMultipleStr<int>(itemCount);
- int[] unfixedDisplay = ConfigParse.GetMultipleStr<int>(unfixedItemDisplay);
- int[] fixedDisplay = ConfigParse.GetMultipleStr<int>(itemDisplay);
+ int[] makeIDs = makeID;
+ int[] unfixedItemIDs = unfixedItemID;
+ int[] fixedItemIDs = itemID;
+ int[] fixedItemCounts = itemCount;
+ int[] unfixedDisplay = unfixedItemDisplay;
+ int[] fixedDisplay = itemDisplay;
if (!displayItemDict.ContainsKey(id))
{
@@ -67,14 +67,13 @@
if (firstType == (int)ComposeFuncType.Ticket)
{
- var makeItemArray = ConfigParse.GetMultipleStr<int>(makeID);
- for (int i = 0; i < makeItemArray.Length; i++)
+ for (int i = 0; i < makeIDs.Length; i++)
{
List<ItemCompoundConfig> list = null;
- if (!ticketComposeDict.TryGetValue(makeItemArray[i], out list))
+ if (!ticketComposeDict.TryGetValue(makeIDs[i], out list))
{
list = new List<ItemCompoundConfig>();
- ticketComposeDict.Add(makeItemArray[i], list);
+ ticketComposeDict.Add(makeIDs[i], list);
}
list.Add(this);
}
@@ -99,7 +98,8 @@
for (int i = 0; i < thirdTypeDict[thirdType].Count; i++)
{
ItemCompoundConfig compoundConfig = thirdTypeDict[thirdType][i];
- if (compoundConfig.levelNeed <= PlayerDatas.Instance.baseData.LV)
+ if (compoundConfig.levelNeed <= PlayerDatas.Instance.baseData.LV
+ || (compoundConfig.trailerLevel > 0 && compoundConfig.trailerLevel <= PlayerDatas.Instance.baseData.LV))
{
if (!composeTypeDict.ContainsKey(secondType))
{
--
Gitblit v1.8.0