From 8cf67fe69bb5fca89ced59210011d73313c3c938 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 20 九月 2018 20:59:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/TreasureSoulWin.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/System/Treasure/TreasureSoulWin.cs b/System/Treasure/TreasureSoulWin.cs
index 7656d22..98c492f 100644
--- a/System/Treasure/TreasureSoulWin.cs
+++ b/System/Treasure/TreasureSoulWin.cs
@@ -83,6 +83,7 @@
model.treasureSoulEvent += TreasureSoulEvent;
m_TreasureSoulBtn.state = TitleBtnState.Click;
Display();
+ model.SetViewTreasureNewGot();
}
protected override void OnActived()
@@ -113,6 +114,7 @@
m_TreasureSouls[i].Dispose();
}
m_SelectSoul = model.selectSoul;
+ model.newGotSoul = 0;
}
protected override void OnAfterClose()
@@ -178,6 +180,11 @@
{
_select = sortSouls[i];
}
+ }
+ if (model.newGotSoul != 0 && sortSouls.Contains(model.newGotSoul))
+ {
+ _select = model.newGotSoul;
+ model.newGotSoul = 0;
}
_select = _select == 0 ? sortSouls[0] : _select;
return _select;
@@ -423,11 +430,11 @@
int Compare(int x, int y)
{
- TreasureSpecialData special_x;
- TreasureSpecialData special_y;
- if (model.TryGetTreasureSoul(x, out special_x) && model.TryGetTreasureSoul(y, out special_y))
+ var leftConfig = Config.Instance.Get<TreasurePrivilegeConfig>(x);
+ var rightConfig = Config.Instance.Get<TreasurePrivilegeConfig>(y);
+ if (leftConfig != null && rightConfig != null)
{
- return special_x.treasureId.CompareTo(special_y.treasureId);
+ return leftConfig.sort.CompareTo(rightConfig.sort);
}
return x.CompareTo(y);
}
--
Gitblit v1.8.0