From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan
---
System/SystemSetting/SettingEffectMgr.cs | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 1b143f4..dfe3fcd 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -12,9 +12,7 @@
{
private bool _isAutoHangUp = false;
- private ItemConfig _tagItemModel;
private FuncConfigConfig _tagFuncModel;
- private StoreConfig _tagShopModel;
private int[] shopIdlist;
PetModel m_petModel;
@@ -86,7 +84,7 @@
secondTimer += Time.deltaTime;
halfSecondTimer += Time.deltaTime;
- if (halfSecondTimer >= 0.5f)
+ if (halfSecondTimer >= 1f)
{
halfSecondTimer = 0f;
if (!DeadModel.playerIsDie)
@@ -215,26 +213,29 @@
/// </summary>
private void AutoDrugSetting()
{
- if (CrossServerUtility.IsCrossServerOneVsOne()) return;
+ if (CrossServerUtility.IsCrossServerOneVsOne())
+ {
+ return;
+ }
- float hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100);
+ var hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100);
if (hpPercent <= HangUpSetModel.Instance.GetHpSet())
{
- SinglePack singlePack = playerPack.GetSinglePack(PackType.Item);
+ var singlePack = playerPack.GetSinglePack(PackType.Item);
if (singlePack == null)
- return;
-
- int i = 0;
- int length = shopIdlist.Length;
- for (i = length - 1; i > -1; i--)
{
- _tagShopModel = StoreConfig.Get(shopIdlist[i]);
- _tagItemModel = ItemConfig.Get(_tagShopModel.ItemID);
- if (PlayerDatas.Instance.baseData.LV >= _tagItemModel.LV)
+ return;
+ }
+
+ for (var i = shopIdlist.Length - 1; i >= 0; i--)
+ {
+ var shopConfig = StoreConfig.Get(shopIdlist[i]);
+ var itemConfig = ItemConfig.Get(shopConfig.ItemID);
+ if (PlayerDatas.Instance.baseData.LV >= itemConfig.LV)
{
- if (singlePack.GetCountById(_tagItemModel.ID) > 0)
+ if (singlePack.GetCountById(itemConfig.ID) > 0)
{
- var list = singlePack.GetItemsById(_tagItemModel.ID);
+ var list = singlePack.GetItemsById(itemConfig.ID);
ItemOperateUtility.Instance.GotoUseItem(list[0].guid);
break;
}
@@ -242,9 +243,9 @@
{
if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoBuyDrug) && playerPack.GetEmptyGridCount(PackType.Item) > 0)
{
- if (m_storeModel.MoneyIsEnough(_tagShopModel.MoneyType, (ulong)_tagShopModel.MoneyNumber))
+ if (m_storeModel.MoneyIsEnough(shopConfig.MoneyType, (ulong)shopConfig.MoneyNumber))
{
- m_storeModel.SendBuyShopItem(_tagShopModel, 1);
+ m_storeModel.SendBuyShopItem(shopConfig, 1);
break;
}
}
@@ -300,20 +301,6 @@
}
yield return WaitingForSecondConst.WaitMS1000;
}
- }
-
- private int CompareID(int start, int end)
- {
- return -start.CompareTo(end);
- }
-
- private int CompareDrugLv(ItemModel start, ItemModel next)
- {
- _tagItemModel = ItemConfig.Get((int)start.itemId);
- int lv1 = _tagItemModel.LV;
- _tagItemModel = ItemConfig.Get((int)next.itemId);
- int lv2 = _tagItemModel.LV;
- return -lv1.CompareTo(lv2);
}
--
Gitblit v1.8.0