From 1be0e26fa7c1b82e95b1bdb00638ce9907b5e8ee Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 17 九月 2018 14:09:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PlayerPackModels.cs | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/System/KnapSack/Logic/PlayerPackModels.cs b/System/KnapSack/Logic/PlayerPackModels.cs
index d540f7b..4b4fbe2 100644
--- a/System/KnapSack/Logic/PlayerPackModels.cs
+++ b/System/KnapSack/Logic/PlayerPackModels.cs
@@ -55,7 +55,6 @@
makeDruglist.Add(fruitlist[i]);
}
}
- makeDruglist.Sort(CompareMakeDrug);
StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;
SetDevourEquipPlace();
@@ -1585,15 +1584,35 @@
{
return configS.LV.CompareTo(configE.LV);
}
+
+ int x = makeDruglist.IndexOf(start);
+ int y = makeDruglist.IndexOf(end);
+ if (x.CompareTo(y) != 0) x.CompareTo(y);
+
return 0;
}
List<AttrFruitConfig> drugOrderlist = new List<AttrFruitConfig>();
+ List<AttrFruitConfig> haveDruglist = new List<AttrFruitConfig>();
public List<AttrFruitConfig> GetDrugOrderByCnt()
{
drugOrderlist.Clear();
+ haveDruglist.Clear();
drugOrderlist.AddRange(makeDruglist);
drugOrderlist.Sort(CompareByIsHave);
+ for(int i = 0; i < drugOrderlist.Count; i++)
+ {
+ if(IsHaveDrugUse(drugOrderlist[i]))
+ {
+ haveDruglist.Add(drugOrderlist[i]);
+ }
+ }
+ haveDruglist.Sort(CompareMakeDrug);
+ for (int i = 0; i < haveDruglist.Count; i++)
+ {
+ drugOrderlist[i] = haveDruglist[i];
+ }
+
return drugOrderlist;
}
--
Gitblit v1.8.0