From 4c6d58af44cd4235501e15a78bf79674ba2fcc4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 15 一月 2019 10:41:31 +0800
Subject: [PATCH] Merge branch 'master' into GrowthFund
---
System/GeneralConfig/GeneralDefine.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index f267fa6..21cba57 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/System/GeneralConfig/GeneralDefine.cs
@@ -168,7 +168,7 @@
public static int fairyLandBuffId { get; private set; }
public static int achievementEarlierStageLevel { get; private set; }
public static int DemonJarAutoTime { get; private set; }
-
+ public static List<int> CrossUseItemIds { get; private set; }
public static Dictionary<int, Dictionary<int, GA_NpcFightSgzcZZ.EquipRandomInfo>> SgzzRobotEquipDict { get; private set; }
public static Dictionary<int, int> SgzcRealm { get; private set; }
@@ -178,6 +178,7 @@
{
try
{
+ CrossUseItemIds = new List<int>(GetIntArray("CrossUseItem"));
CompareEquipPlaces = GetIntArray("EquipUpType");
greatMasterStartLV = GetInt("GreatMasterStartLV");
playerMaxLevel = GetInt("PlayerMaxLV");
--
Gitblit v1.8.0