From 2b32c1203f307905b0b5e646291137c44d067f4a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期六, 10 十一月 2018 15:06:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/SystemSetting/SettingEffectMgr.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 8df99aa..056eb41 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -79,6 +79,8 @@
public void Begin()
{
+ _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("AutoBuyDrug");
+ shopIdlist = ConfigParse.GetMultipleStr<int>(_tagFuncModel.Numerical1);
isStartDecompose = false;
isStartOneKeySell = false;
}
@@ -233,8 +235,6 @@
if (singlePack == null)
return;
- _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("AutoBuyDrug");
- shopIdlist = ConfigParse.GetMultipleStr<int>(_tagFuncModel.Numerical1);
int i = 0;
int length = shopIdlist.Length;
for (i = length - 1; i > -1; i--)
@@ -280,8 +280,7 @@
|| !DeadModel.IsCanReborn || IsDungeon())
return;
- _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("RebornArguments");
- RebornConditions = ConfigParse.GetMultipleStr<int>(_tagFuncModel.Numerical1);
+ RebornConditions = DeadModel.RebornConditions;
rebornPrice = RebornConditions[2];
StartCoroutine(PlayerReborn(5));
}
--
Gitblit v1.8.0