From ea615272c09a359a3836da8eb2f76cf3a9d609bb Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 16:30:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/hivekion/room/bean/BattleRootTask.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java
index e997018..daf1bb7 100644
--- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java
+++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java
@@ -177,6 +177,9 @@ public class BattleRootTask extends AbtParentTask  {
             jsonObject.put("teamLat",teamLat);
             jsonObject.put("teamLng",teamLng);
             sendConsumeMsg.setData(jsonObject);
+            sendConsumeMsg.setRoom(roomId);
+            sendConsumeMsg.setScenarioId(scenarioTask.getScenarioId());
+            sendConsumeMsg.setCmdType("battleConsume");
             Global.sendCmdInfoQueue.add(sendConsumeMsg);
             BattleConsume battleConsume = new BattleConsume();
             battleConsume.setLat(teamLat);

From bd8ab8142a5dbd373cac0f830718fd31615bc49b Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Fri, 19 Sep 2025 16:35:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/hivekion/room/bean/BattleRootTask.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/hivekion/room/bean/BattleRootTask.java b/src/main/java/com/hivekion/room/bean/BattleRootTask.java
index daf1bb7..6b32c60 100644
--- a/src/main/java/com/hivekion/room/bean/BattleRootTask.java
+++ b/src/main/java/com/hivekion/room/bean/BattleRootTask.java
@@ -176,6 +176,7 @@ public class BattleRootTask extends AbtParentTask  {
             jsonObject.put("medicalConsume", medicalConsume);
             jsonObject.put("teamLat",teamLat);
             jsonObject.put("teamLng",teamLng);
+            jsonObject.put("resourceId",scenarioTask.getResourceId());
             sendConsumeMsg.setData(jsonObject);
             sendConsumeMsg.setRoom(roomId);
             sendConsumeMsg.setScenarioId(scenarioTask.getScenarioId());