From f11a7aae6f821913aa4bc415961db4cb18f3e3b6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 20 八月 2018 21:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/KnapSack/Logic/PackModelInterface.cs | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/System/KnapSack/Logic/PackModelInterface.cs b/System/KnapSack/Logic/PackModelInterface.cs
index f4e6205..1205a85 100644
--- a/System/KnapSack/Logic/PackModelInterface.cs
+++ b/System/KnapSack/Logic/PackModelInterface.cs
@@ -588,7 +588,7 @@
SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
if (singlePack == null) return false;
- int startLockIndex = singlePack.openGridCount - GetInitGridCount(PackType.rptItem);
+ int startLockIndex = singlePack.openGridCount - playerPack.InitBagGridCnt;
FuncConfigConfig _tagFuncModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OpenBagItem");
int haveCount = playerPack.GetItemCountByID(PackType.rptItem,itemId);
Equation.Instance.Clear();
@@ -779,22 +779,20 @@
#region 瑙ｉ攣鏍煎瓙
- public int GetInitGridCount(PackType type)
- {
- FuncConfigConfig initGridCount = null;
- if (type == PackType.rptItem)
- initGridCount = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("InitBagCellCount");
- else if (type == PackType.rptWarehouse)
- initGridCount = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("InitDepotCellCount");
-
- return int.Parse(initGridCount.Numerical1);
- }
-
public void OpenGrid(int chooseGridCount, PackType type)
{
SinglePackModel singlePack = playerPack.GetSinglePackModel(type);
int openCount = chooseGridCount - singlePack.openGridCount;
- int index = chooseGridCount - GetInitGridCount(type);
+ int index = 0;
+ switch(type)
+ {
+ case PackType.rptItem:
+ index = chooseGridCount - playerPack.InitBagGridCnt;
+ break;
+ case PackType.rptWarehouse:
+ index = chooseGridCount - playerPack.InitDepotGridCnt;
+ break;
+ }
itemTipsModel.SetExtendGirdModel(openCount,index, type);
WindowCenter.Instance.Open<ExtendWin>();
}
--
Gitblit v1.8.0