Commit Graph

149 Commits

Author SHA1 Message Date
wangwenhua
ac0f3caa79 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 21:56:47 +08:00
wangwenhua
be0d17a242 设置全局scenario值 2025-09-20 21:56:39 +08:00
李玉东
25507ce2aa 任务相关 2025-09-20 21:51:45 +08:00
李玉东
35995ce8ff 任务相关 2025-09-20 20:14:26 +08:00
李玉东
50395edce4 任务相关 2025-09-20 18:28:11 +08:00
李玉东
aef2cb7771 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 18:21:24 +08:00
李玉东
b83d98c178 任务相关 2025-09-20 18:21:04 +08:00
wangwenhua
3330180a8a 设置全局scenario值 2025-09-20 17:55:00 +08:00
wangwenhua
b1d913698d Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
 Conflicts:
	src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
2025-09-20 17:17:40 +08:00
wangwenhua
a5b56ac249 设置全局scenario值 2025-09-20 17:16:00 +08:00
李玉东
4d5cc0489c 任务相关 2025-09-20 17:14:47 +08:00
李玉东
e0dc6d32f8 任务相关 2025-09-20 16:12:21 +08:00
李玉东
f59eabb06f Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 15:58:04 +08:00
李玉东
2e303227c3 任务相关 2025-09-20 15:57:25 +08:00
wangwenhua
8d31f6fdd1 Merge remote-tracking branch 'origin/main' 2025-09-20 15:56:39 +08:00
wangwenhua
17ce8ecebd 设置全局scenario值 2025-09-20 15:56:14 +08:00
李玉东
9862c48de3 任务相关 2025-09-20 15:55:00 +08:00
李玉东
f070c479a7 任务相关 2025-09-20 15:53:49 +08:00
李玉东
f5ba96e225 任务相关 2025-09-20 15:48:14 +08:00
李玉东
d7dc7d6110 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
# Conflicts:
#	src/main/java/com/hivekion/room/bean/AbtParentTask.java
#	src/main/java/com/hivekion/room/bean/Room.java
2025-09-20 15:08:20 +08:00
wangwenhua
6f2cef9edc 设置全局scenario值 2025-09-20 15:07:48 +08:00
李玉东
179c28020b 任务相关 2025-09-20 15:07:45 +08:00
wangwenhua
c5d8988ee7 设置全局scenario值 2025-09-20 14:56:17 +08:00
wangwenhua
81e4cb3ce6 Merge remote-tracking branch 'origin/main' 2025-09-20 14:28:21 +08:00
wangwenhua
c4bedbde70 设置全局scenario值 2025-09-20 14:28:08 +08:00
李玉东
fb0b35d38c 任务相关 2025-09-20 14:24:47 +08:00
李玉东
361edfe774 任务相关 2025-09-20 12:07:36 +08:00
李玉东
299a4e20a4 任务相关 2025-09-20 11:15:10 +08:00
李玉东
a23584f415 任务相关 2025-09-20 11:12:38 +08:00
李玉东
07aeee82d0 任务相关 2025-09-20 11:10:20 +08:00
李玉东
a0f8a1ec96 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-20 10:56:11 +08:00
wangwenhua
41e82f91c1 websocket接收msg 2025-09-20 09:16:27 +08:00
wangwenhua
6a117c0a79 战斗任务消耗资源代码 2025-09-19 20:20:34 +08:00
wangwenhua
ef28e62361 战斗任务消耗资源代码 2025-09-19 20:06:32 +08:00
李玉东
f724eac193 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-19 20:04:41 +08:00
wangwenhua
54f1f993f3 战斗任务消耗资源代码 2025-09-19 20:02:02 +08:00
李玉东
31be71a1d2 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend 2025-09-19 20:02:02 +08:00
李玉东
3924e206f6 任务相关 2025-09-19 20:01:21 +08:00
wangwenhua
bd8ab8142a 战斗任务消耗资源代码 2025-09-19 16:35:52 +08:00
wangwenhua
1c10bd9660 Merge remote-tracking branch 'origin/main' 2025-09-19 16:30:36 +08:00
wangwenhua
ea615272c0 战斗任务消耗资源代码 2025-09-19 16:30:13 +08:00
李玉东
f539feef7f 任务相关 2025-09-19 16:27:33 +08:00
李玉东
c6104d5d19 Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend
# Conflicts:
#	src/main/resources/application-rule.properties
2025-09-19 16:13:38 +08:00
李玉东
1af5e030e8 任务相关 2025-09-19 16:13:10 +08:00
wangwenhua
7d144a39bb 战斗任务消耗资源代码 2025-09-19 15:43:17 +08:00
李玉东
5d078e0dac 任务相关 2025-09-19 15:40:22 +08:00
wangwenhua
3a22f7fa7d Merge remote-tracking branch 'origin/main' 2025-09-19 15:31:14 +08:00
wangwenhua
a40b23cbe9 战斗任务消耗资源代码 2025-09-19 15:30:45 +08:00
李玉东
f775eb9214 任务相关 2025-09-19 15:29:58 +08:00
李玉东
de3028c19a 任务相关 2025-09-19 15:11:47 +08:00