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

feat: 新增NPC与外交逻辑，优化UI组件结构

Browse Source 
重构并精简了部分UI组件，移除冗余弹窗与详情组件，新增NPC相关逻辑（npcBehaviorLogic、npcGrowthLogic、npcStore等）及外交逻辑（diplomaticLogic、DiplomacyView）。完善分页、标签、复选框等通用UI组件。优化战报弹窗，调整README下载链接为相对路径，修复部分国际化内容。
This commit is contained in:
谦君
2025-12-15 08:23:45 +08:00
parent 44580909a3
commit 9b9fda0400
164 changed files with 18628 additions and 2775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/logic/buildingValidation.ts
View File

@@ -34,9 +34,10 @@ export const validateBuildingUpgrade = (
// 计算军官加成
const bonuses = officerLogic.calculateActiveBonuses(officers, Date.now())
// 检查建造队列是否已满
// 检查建造队列是否已满（只计算建筑类型的队列项）
const maxQueue = publicLogic.getMaxBuildQueue(planet, bonuses.additionalBuildQueue)
if (planet.buildQueue.length >= maxQueue) {
const buildingQueueCount = planet.buildQueue.filter(item => item.type === 'building' || item.type === 'demolish').length
if (buildingQueueCount >= maxQueue) {
return { valid: false, reason: 'errors.buildQueueFull' }
}
@@ -61,14 +62,29 @@ export const validateBuildingUpgrade = (
/**
* 执行建筑升级（扣除资源，添加到队列）
*/
export const executeBuildingUpgrade = (planet: Planet, buildingType: BuildingType, officers: Record<OfficerType, Officer>): BuildQueueItem => {
export const executeBuildingUpgrade = (
planet: Planet,
buildingType: BuildingType,
officers: Record<OfficerType, Officer>
): BuildQueueItem => {
const currentLevel = planet.buildings[buildingType] || 0
const targetLevel = currentLevel + 1
const cost = buildingLogic.calculateBuildingCost(buildingType, targetLevel)
// 计算军官加成
const bonuses = officerLogic.calculateActiveBonuses(officers, Date.now())
const time = buildingLogic.calculateBuildingTime(buildingType, targetLevel, bonuses.buildingSpeedBonus)
// 获取机器人工厂和纳米工厂等级
const roboticsFactoryLevel = planet.buildings[BuildingType.RoboticsFactory] || 0
const naniteFactoryLevel = planet.buildings[BuildingType.NaniteFactory] || 0
const time = buildingLogic.calculateBuildingTime(
buildingType,
targetLevel,
bonuses.buildingSpeedBonus,
roboticsFactoryLevel,
naniteFactoryLevel
)
// 扣除资源
resourceLogic.deductResources(planet.resources, cost)
@@ -130,9 +146,10 @@ export const validateBuildingDemolish = (
// 计算军官加成
const bonuses = officerLogic.calculateActiveBonuses(officers, Date.now())
// 检查建造队列是否已满
// 检查建造队列是否已满（只计算建筑类型的队列项）
const maxQueue = publicLogic.getMaxBuildQueue(planet, bonuses.additionalBuildQueue)
if (planet.buildQueue.length >= maxQueue) {
const buildingQueueCount = planet.buildQueue.filter(item => item.type === 'building' || item.type === 'demolish').length
if (buildingQueueCount >= maxQueue) {
return { valid: false, reason: 'errors.buildQueueFull' }
}
@@ -142,12 +159,27 @@ export const validateBuildingDemolish = (
/**
* 执行建筑拆除（返还资源，添加到队列）
*/
export const executeBuildingDemolish = (planet: Planet, buildingType: BuildingType, officers: Record<OfficerType, Officer>): BuildQueueItem => {
export const executeBuildingDemolish = (
planet: Planet,
buildingType: BuildingType,
officers: Record<OfficerType, Officer>
): BuildQueueItem => {
const currentLevel = planet.buildings[buildingType] || 0
// 计算军官加成
const bonuses = officerLogic.calculateActiveBonuses(officers, Date.now())
const demolishTime = buildingLogic.calculateDemolishTime(buildingType, currentLevel, bonuses.buildingSpeedBonus)
// 获取机器人工厂和纳米工厂等级
const roboticsFactoryLevel = planet.buildings[BuildingType.RoboticsFactory] || 0
const naniteFactoryLevel = planet.buildings[BuildingType.NaniteFactory] || 0
const demolishTime = buildingLogic.calculateDemolishTime(
buildingType,
currentLevel,
bonuses.buildingSpeedBonus,
roboticsFactoryLevel,
naniteFactoryLevel
)
// 返还50%资源
const refund = buildingLogic.calculateDemolishRefund(buildingType, currentLevel)