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

1.6.0更新

Browse Source
This commit is contained in:
谦君
2026-01-06 03:00:02 +08:00
parent 1ad051cd6d
commit 9e7560cc4b
50 changed files with 2374 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/campaign/QuestMap.vue
View File

@@ -9,7 +9,7 @@
<!-- 可缩放内容包装器 -->
<div
class="map-content origin-top-left transition-transform duration-200"
:style="{ transform: `scale(${zoomLevel})`, minWidth: calculatedMapWidth + 'px', minHeight: calculatedMapHeight + 'px' }"
:style="{ transform: `scale3d(${zoomLevel}, ${zoomLevel}, 1)`, minWidth: calculatedMapWidth + 'px', minHeight: calculatedMapHeight + 'px' }"
>
<!-- SVG连接线 - 位置与节点容器对齐 -->
<svg

2
src/components/campaign/QuestNode.vue
View File

@@ -176,7 +176,7 @@
}
.quest-available .quest-node:hover {
transform: scale(1.05);
transform: scale3d(1.05, 1.05, 1);
}
@keyframes pulse-glow {

23
src/components/common/ItemDetailView.vue
View File

@@ -491,9 +491,20 @@
return currentPlanet.value.buildings['naniteFactory'] || 0
})
// 获取研究所等级（用于研究时间计算）
// 获取有效研究所等级（考虑星际研究网络）
const researchLabLevel = computed(() => {
if (!currentPlanet.value) return 0
const intergalacticResearchNetworkLevel = gameStore.player.technologies[TechnologyType.IntergalacticResearchNetwork] || 0
// 如果有星际研究网络，计算有效实验室等级
if (intergalacticResearchNetworkLevel > 0) {
return researchLogic.calculateEffectiveLabLevel(
gameStore.player.planets,
currentPlanet.value.id,
intergalacticResearchNetworkLevel
)
}
return currentPlanet.value.buildings['researchLab'] || 0
})
@@ -502,6 +513,12 @@
return gameStore.player.technologies['energyTechnology'] || 0
})
// 获取大学等级（用于研究时间计算）
const universityLevel = computed(() => {
if (!currentPlanet.value) return 0
return currentPlanet.value.buildings['university'] || 0
})
// 翻译键（转换为复数形式）
const typeKey = computed(() => {
const typeMap = {
@@ -931,7 +948,9 @@
level - 1,
activeBonuses.value.researchSpeedBonus,
researchLabLevel.value,
energyTechLevel.value
energyTechLevel.value,
1,
universityLevel.value
)
let researchSpeedBonus = 0

176
src/components/dialogs/BattleAnimationPlayer.vue
View File

@@ -178,6 +178,16 @@
type: 'attacker-loss' | 'defender-loss' | 'info'
}
const battleLogs = ref<BattleLog[]>([])
const MAX_LOGS = 100 // 限制日志数量，防止100回合战斗导致性能问题
// 添加日志的辅助函数，自动限制数量
const addBattleLog = (log: BattleLog) => {
battleLogs.value.push(log)
// 如果超过最大数量，删除最旧的日志
if (battleLogs.value.length > MAX_LOGS) {
battleLogs.value = battleLogs.value.slice(-MAX_LOGS)
}
}
// 计算属性
const totalRounds = computed(() => props.report.roundDetails?.length || props.report.rounds || 1)
@@ -367,97 +377,101 @@
if (currentRoundIndex.value >= totalRounds.value) return
isPlayingRound = true
const speed = parseFloat(speedMultiplier.value)
const roundIndex = currentRoundIndex.value
const roundData = props.report.roundDetails?.[roundIndex]
try {
const speed = parseFloat(speedMultiplier.value) || 1
const roundIndex = currentRoundIndex.value
const roundData = props.report.roundDetails?.[roundIndex]
// 攻击动画阶段
attackAnimationPhase.value = 'attack'
// 攻击动画阶段
attackAnimationPhase.value = 'attack'
// 添加日志
battleLogs.value.push({
round: roundIndex + 1,
message: t('messagesView.roundStarted').replace('{round}', String(roundIndex + 1)),
type: 'info'
})
// 添加日志
addBattleLog({
round: roundIndex + 1,
message: t('messagesView.roundStarted').replace('{round}', String(roundIndex + 1)),
type: 'info'
})
// 等待攻击动画
await sleep(400 / speed)
// 等待攻击动画
await sleep(400 / speed)
// 伤害阶段
attackAnimationPhase.value = 'damage'
// 伤害阶段
attackAnimationPhase.value = 'damage'
// 计算当前回合的损失数字
if (roundData) {
const attackerLoss = Object.values(roundData.attackerLosses).reduce((sum, count) => sum + count, 0)
const defenderLoss =
Object.values(roundData.defenderLosses.fleet || {}).reduce((sum, count) => sum + count, 0) +
Object.values(roundData.defenderLosses.defense || {}).reduce((sum, count) => sum + count, 0)
displayedLosses.value = { attacker: attackerLoss, defender: defenderLoss }
} else {
displayedLosses.value = { attacker: 0, defender: 0 }
// 计算当前回合的损失数字
if (roundData) {
const attackerLoss = Object.values(roundData.attackerLosses || {}).reduce((sum, count) => sum + count, 0)
const defenderLoss =
Object.values(roundData.defenderLosses?.fleet || {}).reduce((sum, count) => sum + count, 0) +
Object.values(roundData.defenderLosses?.defense || {}).reduce((sum, count) => sum + count, 0)
displayedLosses.value = { attacker: attackerLoss, defender: defenderLoss }
} else {
displayedLosses.value = { attacker: 0, defender: 0 }
}
showDamageNumbers.value = true
if (roundData) {
// 记录攻击方损失
for (const [shipType, count] of Object.entries(roundData.attackerLosses || {})) {
if (count > 0) {
explodingShips.value.push({ side: 'attacker', type: shipType })
addBattleLog({
round: roundIndex + 1,
message: t('messagesView.shipDestroyed')
.replace('{count}', String(count))
.replace('{ship}', SHIPS.value[shipType as ShipType]?.name || shipType),
type: 'attacker-loss'
})
}
}
// 记录防守方损失
for (const [shipType, count] of Object.entries(roundData.defenderLosses?.fleet || {})) {
if (count > 0) {
explodingShips.value.push({ side: 'defender', type: shipType })
addBattleLog({
round: roundIndex + 1,
message: t('messagesView.shipDestroyed')
.replace('{count}', String(count))
.replace('{ship}', SHIPS.value[shipType as ShipType]?.name || shipType),
type: 'defender-loss'
})
}
}
for (const [defType, count] of Object.entries(roundData.defenderLosses?.defense || {})) {
if (count > 0) {
explodingShips.value.push({ side: 'defender', type: defType })
addBattleLog({
round: roundIndex + 1,
message: t('messagesView.defenseDestroyed')
.replace('{count}', String(count))
.replace('{defense}', DEFENSES.value[defType as DefenseType]?.name || defType),
type: 'defender-loss'
})
}
}
}
// 等待伤害显示
await sleep(600 / speed)
// 清理状态
attackAnimationPhase.value = 'idle'
showDamageNumbers.value = false
explodingShips.value = []
currentRoundIndex.value++
} finally {
// 确保锁始终被释放，即使发生错误
isPlayingRound = false
}
showDamageNumbers.value = true
if (roundData) {
// 记录攻击方损失
for (const [shipType, count] of Object.entries(roundData.attackerLosses)) {
if (count > 0) {
explodingShips.value.push({ side: 'attacker', type: shipType })
battleLogs.value.push({
round: roundIndex + 1,
message: t('messagesView.shipDestroyed')
.replace('{count}', String(count))
.replace('{ship}', SHIPS.value[shipType as ShipType]?.name || shipType),
type: 'attacker-loss'
})
}
}
// 记录防守方损失
for (const [shipType, count] of Object.entries(roundData.defenderLosses.fleet || {})) {
if (count > 0) {
explodingShips.value.push({ side: 'defender', type: shipType })
battleLogs.value.push({
round: roundIndex + 1,
message: t('messagesView.shipDestroyed')
.replace('{count}', String(count))
.replace('{ship}', SHIPS.value[shipType as ShipType]?.name || shipType),
type: 'defender-loss'
})
}
}
for (const [defType, count] of Object.entries(roundData.defenderLosses.defense || {})) {
if (count > 0) {
explodingShips.value.push({ side: 'defender', type: defType })
battleLogs.value.push({
round: roundIndex + 1,
message: t('messagesView.defenseDestroyed')
.replace('{count}', String(count))
.replace('{defense}', DEFENSES.value[defType as DefenseType]?.name || defType),
type: 'defender-loss'
})
}
}
}
// 等待伤害显示
await sleep(600 / speed)
// 清理状态
attackAnimationPhase.value = 'idle'
showDamageNumbers.value = false
explodingShips.value = []
currentRoundIndex.value++
isPlayingRound = false
}
const nextRound = () => {
const nextRound = async () => {
if (currentRoundIndex.value < totalRounds.value) {
pause()
playRound()
await playRound()
}
}

2
src/components/ui/progress/Progress.vue
View File

@@ -7,7 +7,7 @@
<ProgressIndicator
data-slot="progress-indicator"
class="bg-primary h-full w-full flex-1 transition-all"
:style="`transform: translateX(-${100 - (props.modelValue ?? 0)}%);`"
:style="`transform: translate3d(-${100 - (props.modelValue ?? 0)}%, 0, 0);`"
/>
</ProgressRoot>
</template>