Lenheart
/
MXD-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zuixin

This commit is contained in:
雪风 2025-03-05 23:27:22 +08:00 committed by Lenheart
parent 8a7b1ac9ae
commit 50fe7bf170
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src.zip
View File

Binary file not shown.

2
src/client/MapleCharacter.java
View File

@ -3908,7 +3908,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
if (integers == null) return; if (integers == null) return;
if (this.meso > integers.get(0)) { if (this.meso > integers.get(0)) {
int i = this.meso / integers.get(0); int i = this.meso / integers.get(0);
this.gainItem(integers.get(1), i); this.gainItem(integers.get(1), i*integers.get(2));
gainMeso(-integers.get(0) * i, false, true, true); gainMeso(-integers.get(0) * i, false, true, true);
} }
} }

12
src/gui/UI_LenheartUI/ItemRecovery.java
View File

@ -42,9 +42,9 @@ public class ItemRecovery extends JPanel {
Map<String, List<Integer>> ConfigItemJson = new HashMap<>(); Map<String, List<Integer>> ConfigItemJson = new HashMap<>();
for (int i = 0; i < rowCount; i++) { for (int i = 0; i < rowCount; i++) {
String Key = tableModel.getValueAt(i, 0).toString(); String Key = tableModel.getValueAt(i, 2).toString();
Integer A = (int) tableModel.getValueAt(i, 2); Integer A = (int) tableModel.getValueAt(i, 3);
Integer B = (int) tableModel.getValueAt(i, 3); Integer B = (int) tableModel.getValueAt(i, 0);
Integer C = (int) tableModel.getValueAt(i, 1); Integer C = (int) tableModel.getValueAt(i, 1);
List<Integer> Data = new ArrayList<>(); List<Integer> Data = new ArrayList<>();
@ -83,7 +83,7 @@ public class ItemRecovery extends JPanel {
new Object[][] { new Object[][] {
}, },
new String[] { new String[] {
"\u5151\u6362\u7269\u54c1\u4ee3\u7801", "\u7269\u54c1\u5151\u6362\u6570\u91cf", "\u6240\u9700\u7269\u54c1\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u6570\u91cf" "\u7269\u54c1\u5151\u6362\u6570\u91cf", "\u7269\u54c1\u5151\u6362\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u4ee3\u7801", "\u6240\u9700\u7269\u54c1\u6570\u91cf"
} }
) { ) {
Class<?>[] columnTypes = new Class<?>[] { Class<?>[] columnTypes = new Class<?>[] {
@ -126,8 +126,8 @@ public class ItemRecovery extends JPanel {
/* ItemTable.addColumn(new TableColumn(0));*/ /* ItemTable.addColumn(new TableColumn(0));*/
Start.ConfigItemJson.forEach((k, v) -> { Start.ConfigItemJson.forEach((k, v) -> {
Integer ItemId = Integer.valueOf(k); Integer NeedItemId = Integer.valueOf(k);
Integer NeedItemId = v.get(1); Integer ItemId = v.get(1);
Integer NeedCount = v.get(0); Integer NeedCount = v.get(0);
Integer GiveCount = v.get(2); Integer GiveCount = v.get(2);

2
src/gui/UI_LenheartUI/ItemRecovery.jfd
View File

@ -12,8 +12,8 @@ new FormModel {
add( new FormComponent( "javax.swing.JTable" ) { add( new FormComponent( "javax.swing.JTable" ) {
name: "ItemTable" name: "ItemTable"
"model": new com.jformdesigner.model.SwingTableModel( new java.util.Vector, new java.util.Vector { "model": new com.jformdesigner.model.SwingTableModel( new java.util.Vector, new java.util.Vector {
add( "兑换物品代码" )
add( "物品兑换数量" ) add( "物品兑换数量" )
add( "物品兑换代码" )
add( "所需物品代码" ) add( "所需物品代码" )
add( "所需物品数量" ) add( "所需物品数量" )
}, new java.util.Vector { }, new java.util.Vector {

4
src/handling/channel/handler/DamageParse.java
View File

@ -706,14 +706,14 @@ public class DamageParse {
d = String.format("%-" + length + "s", d) ; d = String.format("%-" + length + "s", d) ;
} }
int targetWidth = e.length()+6; // 目标显示宽度（半角字符数） int targetWidth = e.length()+10; // 目标显示宽度（半角字符数）
String f = ""; String f = "";
String[] strs = {a, b, c, d, e}; String[] strs = {a, b, c, d, e};
for (String s : strs) { for (String s : strs) {
if (s.isEmpty())continue; if (s.isEmpty())continue;
int currentWidth = getDisplayWidth(s); int currentWidth = getDisplayWidth(s);
int spacesNeeded = (currentWidth >= targetWidth) ? 0 : (targetWidth - currentWidth); int spacesNeeded = (currentWidth >= targetWidth) ? 1 : (targetWidth - currentWidth);
// 填充空格并截断‌:ml-citation{ref="2,3" data="citationList"} // 填充空格并截断‌:ml-citation{ref="2,3" data="citationList"}
s= String.format("%s%" + spacesNeeded + "s", s, "").substring(0, Math.min(s.length() + spacesNeeded, s.length() + targetWidth)) ; s= String.format("%s%" + spacesNeeded + "s", s, "").substring(0, Math.min(s.length() + spacesNeeded, s.length() + targetWidth)) ;