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

Fix Basic Rogue Event

Browse Source
This commit is contained in:
Somebody
2024-08-10 15:16:29 +08:00
parent fe7c51c996
commit b8e7b41d5e
37 changed files with 225 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GameServer/Game/Activity/Loaders/TrialActivityEntityLoader.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Enums.Scene;
using EggLink.DanhengServer.GameServer.Game.Player;

2
GameServer/Game/Challenge/ChallengeEntityLoader.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Enums.Scene;
using EggLink.DanhengServer.GameServer.Game.Player;

2
GameServer/Game/ChessRogue/Cell/ChessRogueEntityLoader.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Enums.Rogue;
using EggLink.DanhengServer.Enums.Scene;

2
GameServer/Game/Mission/StoryLineEntityLoader.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Enums.Scene;
using EggLink.DanhengServer.GameServer.Game.Scene;

4
GameServer/Game/Rogue/BaseRogueInstance.cs
View File

@@ -359,10 +359,10 @@ public abstract class BaseRogueInstance(PlayerInstance player, int rogueVersionI
public async ValueTask<RogueEventInstance> GenerateEvent(RogueNpc npc)
{
RogueNPCDialogueExcel? dialogue;
RogueNPCExcel? dialogue;
do
{
dialogue = GameData.RogueNPCDialogueData.Values.ToList().RandomElement();
dialogue = GameData.RogueNPCData.Values.ToList().RandomElement();
} while (!dialogue.CanUseInVer(RogueType));
var instance = new RogueEventInstance(dialogue, npc, CurEventUniqueID++);

8
GameServer/Game/Rogue/Event/RogueEventInstance.cs
View File

@@ -8,12 +8,12 @@ namespace EggLink.DanhengServer.GameServer.Game.Rogue.Event;
public class RogueEventInstance(int eventId, RogueNpc npc, List<RogueEventParam> optionIds, int uniqueId)
{
public RogueEventInstance(RogueNPCDialogueExcel excel, RogueNpc npc, int uniqueId) : this(excel.RogueNPCID, npc, [],
public RogueEventInstance(RogueNPCExcel excel, RogueNpc npc, int uniqueId) : this(excel.RogueNPCID, npc, [],
uniqueId) // check in RogueInstance.cs
{
foreach (var option in excel.DialogueInfo!.DialogueIds)
foreach (var option in excel.RogueNpcConfig!.DialogueList[0].OptionInfo?.OptionList ?? [])
{
GameData.DialogueEventData.TryGetValue(option, out var dialogueEvent);
GameData.DialogueEventData.TryGetValue(option.OptionID, out var dialogueEvent);
if (dialogueEvent == null) continue;
var argId = 0;
@@ -25,7 +25,7 @@ public class RogueEventInstance(int eventId, RogueNpc npc, List<RogueEventParam>
Options.Add(new RogueEventParam
{
OptionId = option,
OptionId = option.OptionID,
ArgId = argId
});
}

4
GameServer/Game/Rogue/Event/RogueEventManager.cs
View File

@@ -108,8 +108,7 @@ public class RogueEventManager
await Player.SendPacket(new PacketSelectRogueCommonDialogueOptionScRsp());
return;
}
option.IsSelected = true;
await Player.SendPacket(new PacketSyncRogueCommonDialogueDataScNotify(eventInstance));
var param = dialogueEvent.RogueEffectParamList;
if (option.ArgId > 0)
@@ -138,6 +137,7 @@ public class RogueEventManager
// send rsp
await Player.SendPacket(new PacketSyncRogueCommonDialogueOptionFinishScNotify(eventInstance));
option.IsSelected = true;
await Player.SendPacket(new PacketSelectRogueCommonDialogueOptionScRsp(eventInstance));
}
}

2
GameServer/Game/Rogue/Scene/Entity/RogueNpc.cs
View File

@@ -1,4 +1,4 @@
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.GameServer.Game.Rogue.Event;
using EggLink.DanhengServer.GameServer.Game.Scene;
using EggLink.DanhengServer.GameServer.Game.Scene.Entity;

2
GameServer/Game/Rogue/Scene/Entity/RogueProp.cs
View File

@@ -1,4 +1,4 @@
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.GameServer.Game.Scene;
using EggLink.DanhengServer.GameServer.Game.Scene.Entity;

2
GameServer/Game/Rogue/Scene/RogueEntityLoader.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Enums.Scene;
using EggLink.DanhengServer.GameServer.Game.Player;
using EggLink.DanhengServer.GameServer.Game.Rogue.Scene.Entity;

2
GameServer/Game/Scene/Entity/EntityMonster.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Database.Inventory;
using EggLink.DanhengServer.Enums.Mission;

2
GameServer/Game/Scene/Entity/EntityNpc.cs
View File

@@ -1,4 +1,4 @@
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.GameServer.Game.Battle;
using EggLink.DanhengServer.Proto;
using EggLink.DanhengServer.Util;

2
GameServer/Game/Scene/Entity/EntityProp.cs
View File

@@ -1,4 +1,4 @@
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Enums.Scene;
using EggLink.DanhengServer.GameServer.Game.Battle;

2
GameServer/Game/Scene/SceneEntityLoader.cs
View File

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Enums;
using EggLink.DanhengServer.Enums.Mission;
using EggLink.DanhengServer.Enums.Scene;

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

@@ -1,5 +1,5 @@
using EggLink.DanhengServer.Data;
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Database.Avatar;
using EggLink.DanhengServer.Enums.Scene;

1
GameServer/Game/Task/LevelTask.cs
View File

@@ -1,4 +1,5 @@
using EggLink.DanhengServer.Data.Config;
using EggLink.DanhengServer.Data.Config.Scene;
using EggLink.DanhengServer.Data.Config.Task;
using EggLink.DanhengServer.Data.Excel;
using EggLink.DanhengServer.Enums.Mission;