diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java index 7ece1f0..1f59338 100644 --- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java +++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java @@ -143,10 +143,10 @@ public class BattleRootTask extends AbtParentTask { } injuredConsume = Long.valueOf(RandomUtil.getSecureRandom().nextInt(3)); ammunitionConsume = intervalDuringTime * (0.1D + RandomUtil.getSecureRandom().nextDouble()); - foodConsume = intervalDuringTime * FOOD_SPREED; - waterConsume = intervalDuringTime * WATER_SPREED; + foodConsume = FOOD_SPREED; + waterConsume = WATER_SPREED; - medicalConsume = intervalDuringTime * MEDICAL_SPREED* RoomManager.getMag(roomId); + medicalConsume = MEDICAL_SPREED; if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunition - ammunitionConsume)>0) { @@ -271,7 +271,11 @@ public class BattleRootTask extends AbtParentTask { battleConsume.setLng(teamLng); battleConsume.setId(IdUtils.simpleUUID()); battleConsume.setAmmunition(ammunitionConsume); - battleConsume.setDeath(Integer.valueOf(Double.valueOf(deathConsume).intValue())); + if(deathConsume == 0L){ + battleConsume.setDeath(0); + }else { + battleConsume.setDeath(Integer.valueOf(Double.valueOf(deathConsume).intValue())); + } battleConsume.setInjured(Integer.valueOf(Double.valueOf(injuredConsume).intValue())); battleConsume.setFood(foodConsume); // battleConsume.setFuel(fuelConsume); @@ -340,6 +344,18 @@ public class BattleRootTask extends AbtParentTask { respObj.setScenarioId(scenarioTask.getScenarioId()); respObj.setCmdType("deathRequest"); Global.sendCmdInfoQueue.add(respObj); + log.info("================================begin death Supplier Task====================================="); + produceTask(scenarioInfoOnTime.getPerson().getDeath()); + String jsonInjured = (String)redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),"scenarioInfo"); + ScenarioInfo scenarioInfoInjured =JSONObject.parseObject(jsonInjured,ScenarioInfo.class); + scenarioInfoInjured.getPerson().setDeath(Long.valueOf(0).intValue()); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoInjured)); + String updJsonStr = (String) redisUtil.hget(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "updScenarioInfo"); + EditScenarioInfo updScenarioInfo = JSON.parseObject(updJsonStr, EditScenarioInfo.class); + updScenarioInfo.getJbxx().getPerson().setDeath(Long.valueOf(0).intValue()); + redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), + "updScenarioInfo", JSON.toJSONString(updScenarioInfo)); + log.info("================================end death Supplier Task====================================="); suppleFlagMap.put("death", true); } Long restInjured = Long.valueOf(scenarioInfoOnTime.getPerson().getInjured()); diff --git a/src/main/resources/application-rule.properties b/src/main/resources/application-rule.properties index 7d377bc..9e3c6dd 100644 --- a/src/main/resources/application-rule.properties +++ b/src/main/resources/application-rule.properties @@ -1,5 +1,5 @@ -injured.warn = 10 -death.warn = 56 +injured.warn = 20 +death.warn = 2 ammunition.warn = 3 food.warn = 3 water.warn = 3