From 4c6fb6dd6cf7a22064142c738e1c548febf7607f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=AA=E9=A3=8E?= <1213457484@qq.com> Date: Fri, 14 Mar 2025 21:30:21 +0800 Subject: [PATCH] =?UTF-8?q?6.=20=E5=A4=9A=E5=80=8D=20=E5=A4=9A=E6=AE=B5=20?= =?UTF-8?q?=E5=88=87=E5=89=B2=20=E9=9E=AD=E5=B0=B8=20=20=E8=BF=99=E4=BA=9B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=85=B3=E9=97=AD=E5=90=8E=20=20=E8=A7=A3?= =?UTF-8?q?=E5=8D=A1=E5=A4=B4=E9=A1=B6=E5=BA=94=E8=AF=A5=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E8=BF=99=E4=BA=9B=E6=96=87=E5=AD=97=207.=20?= =?UTF-8?q?=E9=9E=AD=E5=B0=B8=E6=89=93=E5=BC=80=E5=90=8E=20=E5=87=A0?= =?UTF-8?q?=E7=8E=87=E5=A6=82=E6=9E=9C=E6=98=AF0=20=E9=82=A3=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=BE=E7=A4=BA=200%=20=20=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E7=8E=B0=E5=9C=A8=E7=9A=84=200.00%=209.=20=E6=88=98?= =?UTF-8?q?=E5=8A=9B=E5=90=8E=E9=9D=A2=E7=9A=84=E9=A3=9E=E5=8D=87=E7=A7=B0?= =?UTF-8?q?=E5=8F=B7=EF=BC=9A=E5=8A=9F=E8=83=BD=E6=9C=89=E5=BC=80=E5=85=B3?= =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E7=9A=84=E7=8A=B6=E6=80=81=E4=B8=8B?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=88=98=E5=8A=9B=EF=BC=81=E6=89=93?= =?UTF-8?q?=E5=BC=80=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E6=88=98=E5=8A=9B=E5=90=8E=E9=9D=A2=EF=BC=9B=E8=BF=99?= =?UTF-8?q?=E6=98=AF=E9=9C=80=E6=B1=82=E5=86=85=E7=9A=84=20=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=81=9A=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gui/Start.java | 2 +- src/gui/特殊控制台.java | 3 ++- .../channel/handler/PlayersHandler.java | 24 +++++++++++++++++-- src/tools/MaplePacketCreator.java | 17 ++++++++----- 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/gui/Start.java b/src/gui/Start.java index c188b44..34d82ea 100644 --- a/src/gui/Start.java +++ b/src/gui/Start.java @@ -109,7 +109,7 @@ public class Start { public static BsConfig bsConfig = null; public static List zlConfigs = new ArrayList<>(); - + public static int zlkg = 0; diff --git a/src/gui/特殊控制台.java b/src/gui/特殊控制台.java index b606c48..b1b7126 100644 --- a/src/gui/特殊控制台.java +++ b/src/gui/特殊控制台.java @@ -1050,7 +1050,7 @@ public class 特殊控制台 extends JFrame { JSONObject jsonObject2 = JSONObject.parseObject(result4); JSONArray zl = jsonObject2.getJSONArray("zl"); Start.zlConfigs = zl .toJavaList(ZLConfig.class).stream().sorted(Comparator.comparing(ZLConfig::getNum)).collect(Collectors.toList()); - + Start.zlkg = jsonObject2.getInteger("zlkg"); }catch (Exception e){ e.printStackTrace(); } @@ -1084,6 +1084,7 @@ public class 特殊控制台 extends JFrame { JSONObject jsonObject2 = new JSONObject(); jsonObject2.put("zl", Start.zlConfigs); + jsonObject2.put("zlkg", Start.zlkg); String jsonString2 = jsonObject2.toJSONString(); fileWriter = new FileWriter(new File(property + "\\配置文件\\战力显示.ini")); diff --git a/src/handling/channel/handler/PlayersHandler.java b/src/handling/channel/handler/PlayersHandler.java index cb34755..20367db 100644 --- a/src/handling/channel/handler/PlayersHandler.java +++ b/src/handling/channel/handler/PlayersHandler.java @@ -4,6 +4,7 @@ import server.maps.MapleMap; import client.MapleLieDetector; import server.maps.FieldLimitType; +import java.text.DecimalFormat; import java.util.Map; import client.inventory.ItemFlag; @@ -144,8 +145,27 @@ public class PlayersHandler { string += "经验 " + Math.round((float) 人物经验) * MapleParty.活动经验倍率 + "倍,物品 " + Math.round((float) 人物物品爆率) + "倍, 金币 " + Math.round((float) 人物金币爆率) + "倍,\r\n\r\n"; string += "#b个人倍率\r\n"; string += "经验 " + (long) (Math.round((float) c.getPlayer().getEXPMod()) * 100) * Math.round(c.getPlayer().getStat().expBuff / 100.0) + "%, 爆率 " + (long) (Math.round((float) c.getPlayer().getDropMod()) * 100) * Math.round(c.getPlayer().getStat().dropBuff / 100.0) + "%, 金币 " +(long) (Math.round((float) c.getPlayer().getCashMod()) * 100) * Math.round(c.getPlayer().getStat().mesoBuff / 100.0) + "%\r\n"; - string += "伤害加成"+player.getDB()+"% 多段次数 " +player.getDD() + "次\r\n" ; - string += "切割伤害"+DamageParse.process(player.getQG().toString())+" 鞭尸几率" +String.format("%.2f", player.getBSJL()/100.0)+"%\r\n"; + + if (Start.ConfigValuesJson.getInteger("isdb") ==1){ + string += "伤害加成"+player.getDB()+" " ; + } + + if (Start.ConfigValuesJson.getInteger("isdd") ==1){ + string += "多段次数 " +player.getDD() + "次\r\n" ; + }else { + string += "\r\n" ; + } + + if (Start.ConfigValuesJson.getInteger("isqg") ==1){ + string += "切割伤害"+DamageParse.process(player.getQG().toString())+" "; + } + if (Start.bskg == 1) { + double v = player.getBSJL() / 100.0; + DecimalFormat df = new DecimalFormat("#.##"); + string += "鞭尸几率" + df.format(v) + "%\r\n"; + }else { + string += "\r\n" ; + } string += "#r个人资产\r\n"; string += "拥有：" + c.getPlayer().getCSPoints(1) + " 点劵\r\n\r\n"; string += "延迟 " + c.getPlayer().getClient().getLatency() + " 毫秒\r\n"; diff --git a/src/tools/MaplePacketCreator.java b/src/tools/MaplePacketCreator.java index cf418c4..8beaa9a 100644 --- a/src/tools/MaplePacketCreator.java +++ b/src/tools/MaplePacketCreator.java @@ -2872,14 +2872,19 @@ public class MaplePacketCreator { xl = "[☆超级王者☆]"; else if (c.getCombat() > 1100000) xl = "[☆宇宙王者☆]"; - int 转生次数 = c.getAccountidLogByCid("飞升"); - int cs = 转生次数; - String name = "转生次数" + cs +"层"; - for (ZLConfig zlConfig : Start.zlConfigs) { - if (zlConfig.getNum() <= 转生次数){ - name = zlConfig.getName() +(转生次数 -zlConfig.getNum())+ zlConfig.getName2(); + + String name=""; + if (Start.zlkg == 1) { + int 转生次数 = c.getAccountidLogByCid("飞升"); + int cs = 转生次数; + name = "转生次数" + cs + "层"; + for (ZLConfig zlConfig : Start.zlConfigs) { + if (zlConfig.getNum() <= 转生次数) { + name = zlConfig.getName() + (转生次数 - zlConfig.getNum()) + zlConfig.getName2(); + } } } + mplew.writeMapleAsciiString("战力：" + c.getCombat()+" "+name); mplew.write(0); mplew.writeInt(0);