Fix scene problem (maybe)
This commit is contained in:
@@ -64,20 +64,12 @@ class SceneManager(BaseModel):
|
|||||||
proto.world_id = maze_plane.WorldID
|
proto.world_id = maze_plane.WorldID
|
||||||
|
|
||||||
loaded_npc = [13199,13321,1313,13227,13190,13191,13192,13141,13246,13407 ,13223,13152]
|
loaded_npc = [13199,13321,1313,13227,13190,13191,13192,13141,13246,13407 ,13223,13152]
|
||||||
loaded_group = []
|
|
||||||
groups = []
|
|
||||||
for group_id,group in floor_infos.groups.items():
|
for group_id,group in floor_infos.groups.items():
|
||||||
if group.LoadSide == "Client":
|
if group.LoadSide == "Client":
|
||||||
continue
|
continue
|
||||||
# if group_id in loaded_group:
|
if group.GroupName:
|
||||||
# continue
|
if "TrainVisitor" in group.GroupName or "DeployPuzzle_Repeat_Area" in group.GroupName or "TrainVisiter" in group.GroupName:
|
||||||
# if group_id > 150 and group_id < 200:
|
continue
|
||||||
# continue
|
|
||||||
# if group_id > 300:
|
|
||||||
# continue
|
|
||||||
if group_id in groups:
|
|
||||||
continue
|
|
||||||
groups.append(group_id)
|
|
||||||
group_info = SceneEntityGroupInfo(
|
group_info = SceneEntityGroupInfo(
|
||||||
group_id=group_id
|
group_id=group_id
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -8,19 +8,6 @@ from game_server.resource.configdb.sub_type.prop_info import PropInfo,PropState
|
|||||||
|
|
||||||
T = TypeVar('T')
|
T = TypeVar('T')
|
||||||
|
|
||||||
class GroupLoadSide(Enum):
|
|
||||||
CLIENT = "Client"
|
|
||||||
SERVER = "Server"
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_value(cls, value):
|
|
||||||
if value in ("Server"):
|
|
||||||
return cls.SERVER
|
|
||||||
elif value in ("Client"):
|
|
||||||
return cls.CLIENT
|
|
||||||
raise ValueError(f"{value!r} is not a valid GroupLoadSide")
|
|
||||||
|
|
||||||
|
|
||||||
@dataclasses.dataclass
|
@dataclasses.dataclass
|
||||||
class GroupInfo:
|
class GroupInfo:
|
||||||
NPCList: List[NpcInfo] = dataclasses.field(default_factory=list)
|
NPCList: List[NpcInfo] = dataclasses.field(default_factory=list)
|
||||||
@@ -31,6 +18,7 @@ class GroupInfo:
|
|||||||
MonsterList: Optional[List[MonsterInfo]] = dataclasses.field(default_factory=list)
|
MonsterList: Optional[List[MonsterInfo]] = dataclasses.field(default_factory=list)
|
||||||
PropList: Optional[List[PropInfo]] = dataclasses.field(default_factory=list)
|
PropList: Optional[List[PropInfo]] = dataclasses.field(default_factory=list)
|
||||||
LoadSide: Optional[str] = None
|
LoadSide: Optional[str] = None
|
||||||
|
GroupName: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
def parse_dataclass(cls: Type[T], raw_data: dict) -> T:
|
def parse_dataclass(cls: Type[T], raw_data: dict) -> T:
|
||||||
@@ -85,5 +73,6 @@ def parse_group_info(raw_data: dict) -> GroupInfo:
|
|||||||
)
|
)
|
||||||
for prop in (raw_data.get("PropList") or [])
|
for prop in (raw_data.get("PropList") or [])
|
||||||
],
|
],
|
||||||
LoadSide=raw_data.get("LoadSide") if raw_data.get("LoadSide") else None,
|
LoadSide=raw_data.get("LoadSide") if raw_data.get("LoadSide") else "Client",
|
||||||
|
GroupName=raw_data.get("GroupName") if raw_data.get("GroupName") else "",
|
||||||
)
|
)
|
||||||
Reference in New Issue
Block a user