StarRailPS/DanhengServer-OpenSource
1
0
Fork 0
mirror of https://github.com/EggLinks/DanhengServer-OpenSource.git synced 2026-01-02 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix StoryLine

Browse Source
This commit is contained in:
Somebody
2024-08-05 10:49:14 +08:00
parent fdd700bc06
commit de9b6db0c5
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
GameServer/Game/Player/PlayerInstance.cs
View File

@@ -28,7 +28,6 @@ using EggLink.DanhengServer.GameServer.Game.Scene.Entity;
using EggLink.DanhengServer.GameServer.Game.Shop;
using EggLink.DanhengServer.GameServer.Game.Task;
using EggLink.DanhengServer.GameServer.Server;
using EggLink.DanhengServer.GameServer.Server.Packet;
using EggLink.DanhengServer.GameServer.Server.Packet.Send.Avatar;
using EggLink.DanhengServer.GameServer.Server.Packet.Send.Lineup;
using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player;
@@ -471,6 +470,12 @@ public class PlayerInstance(PlayerData data)
var floorSavedKey = prop.PropInfo.Name.Replace("Controller_", "");
var key = $"FSV_ML{floorSavedKey}{(config.TargetState == PropStateEnum.Open ? "Started" : "Complete")}";
if (prop.Group.GroupName.Contains("JigsawPuzzle") && prop.Group.GroupName.Contains("MainLine"))
{
var splits = prop.Group.GroupName.Split('_');
key = $"JG_ML_{splits[3]}_Puzzle{(config.TargetState == PropStateEnum.Open ? "Started" : "Complete")}";
}
if (SceneInstance?.FloorInfo?.SavedValues.Find(x => x.Name == key) != null)
{
// should save

3
GameServer/Game/Scene/SceneInstance.cs
View File

@@ -55,7 +55,8 @@ public class SceneInstance
FloorId = (uint)FloorId,
EntryId = (uint)EntryId,
SceneMissionInfo = new MissionStatusBySceneInfo(),
DimensionId = (uint)(EntityLoader is StoryLineEntityLoader loader ? loader.DimensionId : 0)
DimensionId = (uint)(EntityLoader is StoryLineEntityLoader loader ? loader.DimensionId : 0),
GameStoryLineId = (uint)(Player.StoryLineManager?.StoryLineData.CurStoryLineId ?? 0),
};
var playerGroupInfo = new SceneEntityGroupInfo(); // avatar group

4
GameServer/Server/Packet/Send/Scene/PacketGetSceneMapInfoScRsp.cs
View File

@@ -24,8 +24,8 @@ public class PacketGetSceneMapInfoScRsp : BasePacket
{
EntryId = entry,
EntryStoryLineId = (uint)(player.StoryLineManager?.StoryLineData.CurStoryLineId ?? 0),
DimensionId = (uint)(player.SceneInstance?.EntityLoader is StoryLineEntityLoader loader ? loader.DimensionId
: 0)
//DimensionId = (uint)(player.SceneInstance?.EntityLoader is StoryLineEntityLoader loader ? loader.DimensionId
// : 0)
};
GameData.MapEntranceData.TryGetValue((int)entry, out var mapData);
if (mapData == null)