Moe/ogame-vue-ts
1
0
Fork 0
mirror of https://github.com/setube/ogame-vue-ts.git synced 2026-05-12 07:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
谦君
2025-12-17 23:16:02 +08:00
committed by GitHub
parent d700216cfc d69b842c80
commit bde0532dbd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -9,7 +9,7 @@
}, },
"private": true, "private": true,
"version": "1.3.0", "version": "1.3.0",
"buildDate": "2025/12/17 22:25:06", "buildDate": "2025/12/17 23:15:03",
"main": "dist-electron/main.js", "main": "dist-electron/main.js",
"type": "module", "type": "module",
"scripts": { "scripts": {

8
src/App.vue
View File

@@ -718,7 +718,7 @@
const spyReport = fleetLogic.processSpyArrival(mission, targetPlanet, gameStore.player, null, npcStore.npcs) const spyReport = fleetLogic.processSpyArrival(mission, targetPlanet, gameStore.player, null, npcStore.npcs)
if (spyReport) gameStore.player.spyReports.push(spyReport) if (spyReport) gameStore.player.spyReports.push(spyReport)
} else if (mission.missionType === MissionType.Deploy) { } else if (mission.missionType === MissionType.Deploy) {
const deployed = fleetLogic.processDeployArrival(mission, targetPlanet, gameStore.player.id) const deployed = fleetLogic.processDeployArrival(mission, targetPlanet, gameStore.player.id, gameStore.player.technologies)
// 生成部署任务报告 // 生成部署任务报告
if (!gameStore.player.missionReports) { if (!gameStore.player.missionReports) {
gameStore.player.missionReports = [] gameStore.player.missionReports = []
@@ -733,14 +733,14 @@
targetPlanetId: targetPlanet?.id, targetPlanetId: targetPlanet?.id,
targetPlanetName: targetPlanetName:
targetPlanet?.name || `[${mission.targetPosition.galaxy}:${mission.targetPosition.system}:${mission.targetPosition.position}]`, targetPlanet?.name || `[${mission.targetPosition.galaxy}:${mission.targetPosition.system}:${mission.targetPosition.position}]`,
success: deployed, success: deployed.success,
message: deployed ? t('missionReports.deploySuccess') : t('missionReports.deployFailed'), message: deployed.success ? t('missionReports.deploySuccess') : t('missionReports.deployFailed'),
details: { details: {
deployedFleet: mission.fleet deployedFleet: mission.fleet
}, },
read: false read: false
}) })
if (deployed) { if (deployed.success && !deployed.overflow) {
const missionIndex = gameStore.player.fleetMissions.indexOf(mission) const missionIndex = gameStore.player.fleetMissions.indexOf(mission)
if (missionIndex > -1) gameStore.player.fleetMissions.splice(missionIndex, 1) if (missionIndex > -1) gameStore.player.fleetMissions.splice(missionIndex, 1)
return return