From 6334c44e356a743c7f505087a8c8e9408e99772e Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Mon, 22 Sep 2025 15:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hivekion/room/bean/BattleRootTask.java     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java
index 1f59338..2d4271c 100644
--- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java
+++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java
@@ -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());