Commit 298ec401 authored by fallenstardust's avatar fallenstardust

微调禁限类型查询不生效的问题

加载扩展卡lflist名称错误的问题
parent 8a0f2dd5
...@@ -638,8 +638,7 @@ public class CardSearcher implements View.OnClickListener { ...@@ -638,8 +638,7 @@ public class CardSearcher implements View.OnClickListener {
.atk(text(atkText)) .atk(text(atkText))
.def(text(defText)) .def(text(defText))
.pscale(getIntSelect(pScale)) .pscale(getIntSelect(pScale))
.limitType(getIntSelect(limitSpinner)) .limitType(limitSpinner.getVisibility() == View.VISIBLE ? getIntSelect(limitSpinner) : getIntSelect(genesys_limitSpinner))
.limitType(getIntSelect(genesys_limitSpinner))
.limitName(getSelectText(limitListSpinner)) .limitName(getSelectText(limitListSpinner))
.setcode(getSelect(setCodeSpinner)) .setcode(getSelect(setCodeSpinner))
.category(getSelect(categorySpinner)) .category(getSelect(categorySpinner))
......
...@@ -116,7 +116,7 @@ public class LimitManager implements Closeable { ...@@ -116,7 +116,7 @@ public class LimitManager implements Closeable {
} }
} }
// 2.读取扩展卡文件夹中的lflist.conf文件 // 2.读取扩展卡文件夹中的lflist.conf文件
if (file.isFile() && file.getName().equals(Constants.CORE_CUSTOM_LIMIT_PATH)) { if (file.isFile() && file.getName().equals(Constants.CORE_LIMIT_PATH)) {
expansion_rs2 = loadFile(file); expansion_rs2 = loadFile(file);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment