Merge branch 'master' of http://192.168.200.25:3000/Lenheart/MXD-Server
This commit is contained in:
commit
696ec96a5f
Binary file not shown.
|
|
@ -2945,7 +2945,7 @@ public class GameConstants {
|
||||||
} else if (level < 110) {
|
} else if (level < 110) {
|
||||||
max += 13000;
|
max += 13000;
|
||||||
} else {
|
} else {
|
||||||
max = 2140000001;
|
max = 2144444444;
|
||||||
}
|
}
|
||||||
return max;
|
return max;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ public class Fishing extends JPanel {
|
||||||
reward.clear();
|
reward.clear();
|
||||||
for (int i = 0; i < tableMode2.getRowCount(); i++) {
|
for (int i = 0; i < tableMode2.getRowCount(); i++) {
|
||||||
Integer id = (Integer) tableMode2.getValueAt(i, 0);
|
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 itemId = (Integer) tableMode2.getValueAt(i, 2);
|
||||||
Integer min = (Integer) tableMode2.getValueAt(i, 3);
|
Integer min = (Integer) tableMode2.getValueAt(i, 3);
|
||||||
Integer max = (Integer) tableMode2.getValueAt(i, 4);
|
Integer max = (Integer) tableMode2.getValueAt(i, 4);
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ public class WorldBoss extends JPanel {
|
||||||
{null, null, null, null, null, null, null},
|
{null, null, null, null, null, null, null},
|
||||||
},
|
},
|
||||||
new String[] {
|
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);
|
scrollPane1.setViewportView(table1);
|
||||||
|
|
|
||||||
|
|
@ -253,7 +253,7 @@ public class DamageParse {
|
||||||
player.dropMessage("[GM 密语系统] " + player.getName() + " (等级 " + (int) player.getLevel() + ") 伤害异常。 最高伤害 40 本次伤害 " + eachd + " 技能ID " + attack.skill);
|
player.dropMessage("[GM 密语系统] " + player.getName() + " (等级 " + (int) player.getLevel() + ") 伤害异常。 最高伤害 40 本次伤害 " + eachd + " 技能ID " + attack.skill);
|
||||||
}
|
}
|
||||||
boolean ban = false;
|
boolean ban = false;
|
||||||
int atk = 2140000001;
|
int atk = 2144444444;
|
||||||
if (eachd.intValue() < 0) {
|
if (eachd.intValue() < 0) {
|
||||||
if (!player.hasGmLevel(1)) {
|
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());
|
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);
|
player.dropMessage("[GM 密语系统] " + player.getName() + " (等级 " + (int) player.getLevel() + ") 伤害异常。 最高伤害 40 本次伤害 " + eachd + " 技能ID " + attack.skill);
|
||||||
}
|
}
|
||||||
int atk = 2140000001;
|
int atk = 2144444444;
|
||||||
if (eachd.intValue() < 0) {
|
if (eachd.intValue() < 0) {
|
||||||
if (!player.hasGmLevel(1)) {
|
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());
|
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());
|
||||||
|
|
|
||||||
|
|
@ -683,7 +683,7 @@ public final class MapleMap {
|
||||||
if (mob.getStats().isBoss()) {
|
if (mob.getStats().isBoss()) {
|
||||||
if (Randomizer.nextInt(10000) <= ((Integer) Start.ConfigValuesMap.get("BOSS出装备概率")).intValue()) {
|
if (Randomizer.nextInt(10000) <= ((Integer) Start.ConfigValuesMap.get("BOSS出装备概率")).intValue()) {
|
||||||
final IItem idrop = ii.randomizeStats((Equip) ii.getEquipById(de2.itemId));
|
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;
|
double price;
|
||||||
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
||||||
price = (double) ii.getWholePrice(idrop.getItemId());
|
price = (double) ii.getWholePrice(idrop.getItemId());
|
||||||
|
|
@ -694,7 +694,7 @@ public final class MapleMap {
|
||||||
if (price != -1.0 && recvMesos > 0) {
|
if (price != -1.0 && recvMesos > 0) {
|
||||||
chr.gainMeso(recvMesos, true);
|
chr.gainMeso(recvMesos, true);
|
||||||
if (recvMesos >= 10000) {
|
if (recvMesos >= 10000) {
|
||||||
chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币");
|
chr.dropMessage(6, "掉落物品:[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得:" + recvMesos + "金币");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -703,7 +703,7 @@ public final class MapleMap {
|
||||||
}
|
}
|
||||||
} else if (Randomizer.nextInt(10000) <= ((Integer) Start.ConfigValuesMap.get("出装备概率")).intValue()) {
|
} else if (Randomizer.nextInt(10000) <= ((Integer) Start.ConfigValuesMap.get("出装备概率")).intValue()) {
|
||||||
final IItem idrop = ii.randomizeStats((Equip) ii.getEquipById(de2.itemId));
|
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;
|
double price;
|
||||||
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
||||||
price = (double) ii.getWholePrice(idrop.getItemId());
|
price = (double) ii.getWholePrice(idrop.getItemId());
|
||||||
|
|
@ -714,7 +714,7 @@ public final class MapleMap {
|
||||||
if (price != -1.0 && recvMesos > 0) {
|
if (price != -1.0 && recvMesos > 0) {
|
||||||
chr.gainMeso(recvMesos, true);
|
chr.gainMeso(recvMesos, true);
|
||||||
if (recvMesos >= 10000) {
|
if (recvMesos >= 10000) {
|
||||||
chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币");
|
chr.dropMessage(6, "掉落物品:[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得:" + recvMesos + "金币");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -725,7 +725,7 @@ public final class MapleMap {
|
||||||
final int range = Math.abs(de2.Maximum - de2.Minimum);
|
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);
|
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;
|
double price;
|
||||||
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
||||||
price = (double) ii.getWholePrice(idrop.getItemId());
|
price = (double) ii.getWholePrice(idrop.getItemId());
|
||||||
|
|
@ -736,7 +736,7 @@ public final class MapleMap {
|
||||||
if (price != -1.0 && recvMesos > 0) {
|
if (price != -1.0 && recvMesos > 0) {
|
||||||
chr.gainMeso(recvMesos, true);
|
chr.gainMeso(recvMesos, true);
|
||||||
if (recvMesos >= 10000) {
|
if (recvMesos >= 10000) {
|
||||||
chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币");
|
chr.dropMessage(6, "掉落物品:[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得:" + recvMesos + "金币");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -803,7 +803,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);
|
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 (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;
|
double price;
|
||||||
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
if (GameConstants.isThrowingStar(idrop.getItemId()) || GameConstants.isBullet(idrop.getItemId())) {
|
||||||
price = (double) ii.getWholePrice(idrop.getItemId());
|
price = (double) ii.getWholePrice(idrop.getItemId());
|
||||||
|
|
@ -814,7 +814,7 @@ public final class MapleMap {
|
||||||
if (price != -1.0 && recvMesos > 0) {
|
if (price != -1.0 && recvMesos > 0) {
|
||||||
chr.gainMeso(recvMesos, true);
|
chr.gainMeso(recvMesos, true);
|
||||||
if (recvMesos >= 10000) {
|
if (recvMesos >= 10000) {
|
||||||
chr.dropMessage(6, "掉落物品名称:" + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " 自动为你售卖掉获得:" + recvMesos + "金币");
|
chr.dropMessage(6, "掉落物品:[ " + MapleItemInformationProvider.getInstance().getName(idrop.getItemId()) + " ] 自动卖出获得:" + recvMesos + "金币");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
//TIP 要<b>运行</b>代码,请按 <shortcut actionId="Run"/> 或
|
||||||
|
// 点击装订区域中的 <icon src="AllIcons.Actions.Execute"/> 图标。
|
||||||
|
public class Main {
|
||||||
|
public static void main(String[] args) {
|
||||||
|
//TIP 当文本光标位于高亮显示的文本处时按 <shortcut actionId="ShowIntentionActions"/>
|
||||||
|
// 查看 IntelliJ IDEA 建议如何修正。
|
||||||
|
System.out.printf("Hello and welcome!");
|
||||||
|
|
||||||
|
for (int i = 1; i <= 5; i++) {
|
||||||
|
//TIP 按 <shortcut actionId="Debug"/> 开始调试代码。我们已经设置了一个 <icon src="AllIcons.Debugger.Db_set_breakpoint"/> 断点
|
||||||
|
// 但您始终可以通过按 <shortcut actionId="ToggleLineBreakpoint"/> 添加更多断点。
|
||||||
|
System.out.println("i = " + i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
Loading…
Reference in New Issue