From bc5df5e27bda18cc0ba2e82232fec8bd2cff2601 Mon Sep 17 00:00:00 2001 From: Lenheart <947330670@qq.com> Date: Wed, 4 Jun 2025 21:26:40 +0800 Subject: [PATCH] 1212 --- src/client/PlayerStats.java | 4 +-- src/constants/GameConstants.java | 2 +- src/gui/UI_LenheartUI/Fishing.java | 2 +- src/gui/UI_LenheartUI/WorldBoss.java | 2 +- src/handling/channel/handler/DamageParse.java | 4 +-- src/server/maps/MapleMap.java | 16 +++++----- src/untitled/.gitignore | 29 +++++++++++++++++++ src/untitled/src/Main.java | 15 ++++++++++ src/untitled/untitled.iml | 11 +++++++ 9 files changed, 70 insertions(+), 15 deletions(-) create mode 100644 src/untitled/.gitignore create mode 100644 src/untitled/src/Main.java create mode 100644 src/untitled/untitled.iml diff --git a/src/client/PlayerStats.java b/src/client/PlayerStats.java index 9ca2ce4..acaffd4 100644 --- a/src/client/PlayerStats.java +++ b/src/client/PlayerStats.java @@ -641,8 +641,8 @@ public class PlayerStats implements Serializable { if (!first_login) { int currentDsbbh = dsbbh.incrementAndGet(); // 原子自增并获取最新值 for (AotuNpc npc : Start.aotuNpcs) { -// Start.executor.schedule(() -> dsnpcfw(chra, npc, currentDsbbh), npc.getTime(), TimeUnit.MILLISECONDS); - dsnpcfw(chra, npc, currentDsbbh); + Start.executor.schedule(() -> dsnpcfw(chra, npc, currentDsbbh), npc.getTime(), TimeUnit.MILLISECONDS); +// dsnpcfw(chra, npc, currentDsbbh); } } diff --git a/src/constants/GameConstants.java b/src/constants/GameConstants.java index 3bd922b..57e6b8e 100644 --- a/src/constants/GameConstants.java +++ b/src/constants/GameConstants.java @@ -2945,7 +2945,7 @@ public class GameConstants { } else if (level < 110) { max += 13000; } else { - max = 2140000001; + max = 2144444444; } return max; } diff --git a/src/gui/UI_LenheartUI/Fishing.java b/src/gui/UI_LenheartUI/Fishing.java index 2ece73c..ccffdaf 100644 --- a/src/gui/UI_LenheartUI/Fishing.java +++ b/src/gui/UI_LenheartUI/Fishing.java @@ -191,7 +191,7 @@ public class Fishing extends JPanel { reward.clear(); for (int i = 0; i < tableMode2.getRowCount(); i++) { Integer id = (Integer) tableMode2.getValueAt(i, 0); - String itemName = (String) tableMode2.getValueAt(i, 1); + String itemName = tableMode2.getValueAt(i, 1).toString(); Integer itemId = (Integer) tableMode2.getValueAt(i, 2); Integer min = (Integer) tableMode2.getValueAt(i, 3); Integer max = (Integer) tableMode2.getValueAt(i, 4); diff --git a/src/gui/UI_LenheartUI/WorldBoss.java b/src/gui/UI_LenheartUI/WorldBoss.java index 2280612..61754f5 100644 --- a/src/gui/UI_LenheartUI/WorldBoss.java +++ b/src/gui/UI_LenheartUI/WorldBoss.java @@ -79,7 +79,7 @@ public class WorldBoss extends JPanel { {null, null, null, null, null, null, null}, }, new String[] { - "\u91ce\u5916BOSS", "\u8840\u91cf(\u767e\u4e07)", "\u5730\u56fe\u4ee3\u7801", "X\u5750\u6807", "Y\u5750\u6807", "\u8bf4\u660e", "\u5237\u65b0\u95f4\u9694/\u5206" + "\u91ce\u5916BOSS", "\u8840\u91cf(\u4ebf)", "\u5730\u56fe\u4ee3\u7801", "X\u5750\u6807", "Y\u5750\u6807", "\u8bf4\u660e", "\u5237\u65b0\u95f4\u9694/\u5206" } )); scrollPane1.setViewportView(table1); diff --git a/src/handling/channel/handler/DamageParse.java b/src/handling/channel/handler/DamageParse.java index 1758289..2f02ebc 100644 --- a/src/handling/channel/handler/DamageParse.java +++ b/src/handling/channel/handler/DamageParse.java @@ -253,7 +253,7 @@ public class DamageParse { player.dropMessage("[GM 密语系统] " + player.getName() + " (等级 " + (int) player.getLevel() + ") 伤害异常。 最高伤害 40 本次伤害 " + eachd + " 技能ID " + attack.skill); } boolean ban = false; - int atk = 2140000001; + int atk = 2144444444; if (eachd.intValue() < 0) { if (!player.hasGmLevel(1)) { FileoutputUtil.logToFile("logs/Hack/Ban/伤害异常.txt", "\r\n " + FileoutputUtil.NowTime() + " 玩家<" + (int) player.getLevel() + ">: " + player.getName() + " 怪物 " + monster.getId() + " 地图: " + player.getMapId() + " 技能代码: " + attack.skill + " 伤害过低导致越界 本次伤害 :" + eachd + " 预计伤害: " + (int) maxDamagePerHit + "是否为BOSS: " + monster.getStats().isBoss()); @@ -884,7 +884,7 @@ public class DamageParse { } player.dropMessage("[GM 密语系统] " + player.getName() + " (等级 " + (int) player.getLevel() + ") 伤害异常。 最高伤害 40 本次伤害 " + eachd + " 技能ID " + attack.skill); } - int atk = 2140000001; + int atk = 2144444444; if (eachd.intValue() < 0) { if (!player.hasGmLevel(1)) { FileoutputUtil.logToFile("logs/Hack/Ban/伤害异常.txt", "\r\n " + FileoutputUtil.NowTime() + " 玩家<" + (int) player.getLevel() + ">: " + player.getName() + " 怪物 " + monster.getId() + " 地图: " + player.getMapId() + " 技能代码: " + attack.skill + " 伤害过低导致越界 本次伤害 :" + eachd + " 预计伤害: " + (int) maxDamagePerHit + "是否为BOSS: " + monster.getStats().isBoss()); diff --git a/src/server/maps/MapleMap.java b/src/server/maps/MapleMap.java index d2a6fab..aec714c 100644 --- a/src/server/maps/MapleMap.java +++ b/src/server/maps/MapleMap.java @@ -683,7 +683,7 @@ public final class MapleMap { if (mob.getStats().isBoss()) { if (Randomizer.nextInt(10000) <= ((Integer) Start.ConfigValuesMap.get("BOSS出装备概率")).intValue()) { final IItem idrop = ii.randomizeStats((Equip) ii.getEquipById(de2.itemId)); - if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>200000&&idrop.getItemId()<2100000)))) { + if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>1999999&&idrop.getItemId()<2021000)||(idrop.getItemId()>2059999&&idrop.getItemId()<2080000)||(idrop.getItemId()>2329999&&idrop.getItemId()<2340000)))) { double price; if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) { price = (double) ii.getWholePrice(idrop.getItemId()); @@ -694,7 +694,7 @@ public final class MapleMap { if (price != -1.0 && recvMesos > 0) { chr.gainMeso(recvMesos, true); if (recvMesos >= 10000) { - chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币"); + chr.dropMessage(6, "掉落物品：[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得：" + recvMesos + "金币"); } } } else { @@ -703,7 +703,7 @@ public final class MapleMap { } } else if (Randomizer.nextInt(10000) <= ((Integer) Start.ConfigValuesMap.get("出装备概率")).intValue()) { final IItem idrop = ii.randomizeStats((Equip) ii.getEquipById(de2.itemId)); - if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>200000&&idrop.getItemId()<2100000)))) { + if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>1999999&&idrop.getItemId()<2021000)||(idrop.getItemId()>2059999&&idrop.getItemId()<2080000)||(idrop.getItemId()>2329999&&idrop.getItemId()<2340000)))) { double price; if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) { price = (double) ii.getWholePrice(idrop.getItemId()); @@ -714,7 +714,7 @@ public final class MapleMap { if (price != -1.0 && recvMesos > 0) { chr.gainMeso(recvMesos, true); if (recvMesos >= 10000) { - chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币"); + chr.dropMessage(6, "掉落物品：[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得：" + recvMesos + "金币"); } } } else { @@ -725,7 +725,7 @@ public final class MapleMap { final int range = Math.abs(de2.Maximum - de2.Minimum); final IItem idrop = new Item(de2.itemId, (short) 0, (short) ((de2.Maximum != 1) ? (Randomizer.nextInt((range <= 0) ? 1 : range) + de2.Minimum) : 1), (byte) 0); - if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>200000&&idrop.getItemId()<2100000)))) { + if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>1999999&&idrop.getItemId()<2021000)||(idrop.getItemId()>2059999&&idrop.getItemId()<2080000)||(idrop.getItemId()>2329999&&idrop.getItemId()<2340000)))) { double price; if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) { price = (double) ii.getWholePrice(idrop.getItemId()); @@ -736,7 +736,7 @@ public final class MapleMap { if (price != -1.0 && recvMesos > 0) { chr.gainMeso(recvMesos, true); if (recvMesos >= 10000) { - chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币"); + chr.dropMessage(6, "掉落物品：[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得：" + recvMesos + "金币"); } } } else { @@ -788,7 +788,7 @@ public final class MapleMap { idrop = new Item(de3.itemId, (short) 0, (short) ((de3.Maximum != 1) ? (Randomizer.nextInt(de3.Maximum - de3.Minimum) + de3.Minimum) : 1), (byte) 0); } if (mob.getId() != 9300175) { - if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>200000&&idrop.getItemId()<2100000)))) { + if ((chr.get刷钱模式() == 1 && idrop.getItemId() != 0) || (chr.get刷钱模式() == 2 && (idrop.getItemId() / 1000000 == 1||(idrop.getItemId()>1999999&&idrop.getItemId()<2021000)||(idrop.getItemId()>2059999&&idrop.getItemId()<2080000)||(idrop.getItemId()>2329999&&idrop.getItemId()<2340000)))) { double price; if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) { price = (double) ii.getWholePrice(idrop.getItemId()); @@ -799,7 +799,7 @@ public final class MapleMap { if (price != -1.0 && recvMesos > 0) { chr.gainMeso(recvMesos, true); if (recvMesos >= 10000) { - chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币"); + chr.dropMessage(6, "掉落物品：[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得：" + recvMesos + "金币"); } } } else { diff --git a/src/untitled/.gitignore b/src/untitled/.gitignore new file mode 100644 index 0000000..f68d109 --- /dev/null +++ b/src/untitled/.gitignore @@ -0,0 +1,29 @@ +### IntelliJ IDEA ### +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/src/untitled/src/Main.java b/src/untitled/src/Main.java new file mode 100644 index 0000000..fe7aa2b --- /dev/null +++ b/src/untitled/src/Main.java @@ -0,0 +1,15 @@ +//TIP 要运行代码，请按 或 +// 点击装订区域中的 图标。 +public class Main { + public static void main(String[] args) { + //TIP 当文本光标位于高亮显示的文本处时按 + // 查看 IntelliJ IDEA 建议如何修正。 + System.out.printf("Hello and welcome!"); + + for (int i = 1; i <= 5; i++) { + //TIP 按 开始调试代码。我们已经设置了一个 断点 + // 但您始终可以通过按 添加更多断点。 + System.out.println("i = " + i); + } + } +} \ No newline at end of file diff --git a/src/untitled/untitled.iml b/src/untitled/untitled.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/src/untitled/untitled.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file