liyudong/simulation-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend

Browse Source
This commit is contained in:
李玉东 2025-09-22 15:03:00 +08:00
commit 053c1a9984
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/hivekion/room/bean/BattleRootTask.java
View File

@ -145,7 +145,6 @@ public class BattleRootTask extends AbtParentTask {
ammunitionConsume = intervalDuringTime * (0.1D + RandomUtil.getSecureRandom().nextDouble());
foodConsume = FOOD_SPREED;
waterConsume = WATER_SPREED;
medicalConsume = MEDICAL_SPREED;
@ -237,6 +236,19 @@ public class BattleRootTask extends AbtParentTask {
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(),
"updScenarioInfo", JSON.toJSONString(updScenarioInfo));
}
if(scenarioInfoOnTime.getAmmunition().getCurrent() - Double.valueOf(ammunition - ammunitionConsume)<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
}
if(scenarioInfoOnTime.getFood().getCurrent() -Double.valueOf(food - foodConsume)<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
}
if(scenarioInfoOnTime.getMedical().getCurrent() -Double.valueOf(medical - medicalConsume)<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
}
if(scenarioInfoOnTime.getWater().getCurrent() - Double.valueOf(water - waterConsume)<0) {
scenarioInfoOnTime.getAmmunition().setCurrent(0D);
}
redisUtil.hset(scenarioTask.getScenarioId() + "-" + roomId + "-" + scenarioTask.getResourceId(), "scenarioInfo", JSONObject.toJSONString(scenarioInfoOnTime));
}catch (Exception ex){
ex.printStackTrace();
log.error("==============================设置消耗信息失败=============================================",ex.getMessage());