diff --git a/src/classes/action/move_to_direction.py b/src/classes/action/move_to_direction.py index 223fbf2..ef6eefa 100644 --- a/src/classes/action/move_to_direction.py +++ b/src/classes/action/move_to_direction.py @@ -82,7 +82,7 @@ class MoveToDirection(DefineAction, ActualActionMixin): self.start_monthstamp = self.world.month_stamp self.direction = direction direction_cn = Direction.get_cn_name(direction) - return Event(self.world.month_stamp, f"{self.avatar.name} 开始向{direction_cn}方探索未知区域", related_avatars=[self.avatar.id]) + return Event(self.world.month_stamp, f"{self.avatar.name} 开始向{direction_cn}方移动", related_avatars=[self.avatar.id]) def step(self, direction: str) -> ActionResult: # 确保方向已设置 @@ -108,7 +108,7 @@ class MoveToDirection(DefineAction, ActualActionMixin): async def finish(self, direction: str) -> list[Event]: direction_cn = Direction.get_cn_name(direction) - return [Event(self.world.month_stamp, f"{self.avatar.name} 结束了向{direction_cn}方的探索", related_avatars=[self.avatar.id])] + return [Event(self.world.month_stamp, f"{self.avatar.name} 结束了向{direction_cn}方的移动", related_avatars=[self.avatar.id])] def _execute(self, *args, **kwargs): pass \ No newline at end of file diff --git a/src/classes/region.py b/src/classes/region.py index 61c03c8..5742ee6 100644 --- a/src/classes/region.py +++ b/src/classes/region.py @@ -101,7 +101,7 @@ class Region(ABC): } -@dataclass +@dataclass(eq=False) class NormalRegion(Region): """普通区域""" animal_ids: list[int] = field(default_factory=list) @@ -171,7 +171,7 @@ class NormalRegion(Region): return info -@dataclass +@dataclass(eq=False) class CultivateRegion(Region): """修炼区域""" essence_type: EssenceType = EssenceType.GOLD # 默认值避免 dataclass 继承错误 @@ -225,7 +225,7 @@ class CultivateRegion(Region): return info -@dataclass +@dataclass(eq=False) class CityRegion(Region): """城市区域""" def get_region_type(self) -> str: diff --git a/src/classes/sect_region.py b/src/classes/sect_region.py index 19482ba..32e3699 100644 --- a/src/classes/sect_region.py +++ b/src/classes/sect_region.py @@ -4,7 +4,7 @@ from pathlib import Path from src.classes.region import Region -@dataclass +@dataclass(eq=False) class SectRegion(Region): """ 宗门总部区域:仅用于显示宗门总部的名称与描述。 diff --git a/src/sim/simulator.py b/src/sim/simulator.py index 0d7270a..be9c405 100644 --- a/src/sim/simulator.py +++ b/src/sim/simulator.py @@ -87,7 +87,7 @@ class Simulator: # 记录事件 event = Event( self.world.month_stamp, - f"路过 {region.name},发现无主,将其占据。", + f"{avatar.name} 路过 {region.name},发现无主,将其占据。", related_avatars=[avatar.id] ) avatar.add_event(event) diff --git a/web/src/components/game/panels/info/RegionDetail.vue b/web/src/components/game/panels/info/RegionDetail.vue index 43138df..5300603 100644 --- a/web/src/components/game/panels/info/RegionDetail.vue +++ b/web/src/components/game/panels/info/RegionDetail.vue @@ -2,6 +2,7 @@ import { ref } from 'vue'; import type { RegionDetail, EffectEntity } from '@/types/core'; import EntityRow from './components/EntityRow.vue'; +import RelationRow from './components/RelationRow.vue'; import SecondaryPopup from './components/SecondaryPopup.vue'; import { useUiStore } from '@/stores/ui'; @@ -21,6 +22,10 @@ function showDetail(item: EffectEntity | undefined) { function jumpToSect(id: number) { uiStore.select('sect', id.toString()); } + +function jumpToAvatar(id: string) { + uiStore.select('avatar', id); +}