From d09e7a7de4b153b94bbba69d2bb663d4f4de0d75 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 28 十二月 2018 20:02:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/GatheringSoul/GatheringSoulModel.cs | 25 ++++++++++++++++---------
System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs | 12 ++++++++++--
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
index 6a34ffb..5b75a2c 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -143,8 +143,16 @@
private void UpdateLookPlayerTime()
{
- if (!crossServerModel.IsMatching) return;
-
+ if (!crossServerModel.IsMatching)
+ {
+ if(lookPlayerObj.activeInHierarchy)
+ {
+ matchRedPointBeh.gameObject.SetActive(true);
+ lookPlayerObj.SetActive(false);
+ }
+ return;
+ }
+
if(CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)
{
int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds);
diff --git a/System/GatheringSoul/GatheringSoulModel.cs b/System/GatheringSoul/GatheringSoulModel.cs
index d3f49b4..dc28a58 100644
--- a/System/GatheringSoul/GatheringSoulModel.cs
+++ b/System/GatheringSoul/GatheringSoulModel.cs
@@ -1463,16 +1463,16 @@
return;
}
GatherSoulItem coreItem;
- if (TryGetItem(coreHole, out coreItem))
+ if (TryGetItem(coreHole, out coreItem) &&
+ SatisfyLevelUp(coreItem, out error))
{
- if (SatisfyLevelUp(coreItem, out error))
- {
- levelUpRedpointHole = coreHole;
- levelUpRedpoint.state = RedPointState.Simple;
- }
+ levelUpRedpointHole = coreHole;
+ levelUpRedpoint.state = RedPointState.Simple;
}
else
{
+ levelUpRedpointHole = -1;
+ var cost = 0;
for (int i = 0; i < count; i++)
{
GatherSoulItem holeItem;
@@ -1480,12 +1480,19 @@
{
if (SatisfyLevelUp(holeItem, out error))
{
- levelUpRedpointHole = i;
- levelUpRedpoint.state = RedPointState.Simple;
- return;
+ if (RequireLevelUpCost(holeItem) < cost
+ || cost == 0)
+ {
+ cost = RequireLevelUpCost(holeItem);
+ levelUpRedpointHole = i;
+ }
}
}
}
+ if (levelUpRedpointHole != -1)
+ {
+ levelUpRedpoint.state = RedPointState.Simple;
+ }
}
}
#endregion
--
Gitblit v1.8.0