Update Repo (#879730c)

- Fix Public Issue #10 - Fix Rogue Event - Correct Technique Point Sync & Better Gacha chance
EggLinks · Aug 17, 2024 · fc0d12a · fc0d12a
1 parent bd1f7f3
commit fc0d12a
Show file tree

Hide file tree

Showing 106 changed files with 1,445 additions and 501 deletions.
diff --git a/Common/Configuration/ConfigContainer.cs b/Common/Configuration/ConfigContainer.cs
@@ -14,13 +14,19 @@ public class ConfigContainer
 
 public class HttpServerConfig
 {
+    public string BindAddress { get; set; } = "0.0.0.0";
     public string PublicAddress { get; set; } = "127.0.0.1";
-    public int PublicPort { get; set; } = 443;
+    public int Port { get; set; } = 443;
     public bool UseSSL { get; set; } = true;
 
     public string GetDisplayAddress()
     {
-        return (UseSSL ? "https" : "http") + "://" + PublicAddress + ":" + PublicPort;
+        return (UseSSL ? "https" : "http") + "://" + PublicAddress + ":" + Port;
+    }
+
+    public string GetBindDisplayAddress()
+    {
+        return (UseSSL ? "https" : "http") + "://" + BindAddress + ":" + Port;
     }
 }
 
@@ -32,16 +38,16 @@ public class KeyStoreConfig
 
 public class GameServerConfig
 {
+    public string BindAddress { get; set; } = "0.0.0.0";
     public string PublicAddress { get; set; } = "127.0.0.1";
-    public uint PublicPort { get; set; } = 23301;
+    public uint Port { get; set; } = 23301;
     public string GameServerId { get; set; } = "dan_heng";
     public string GameServerName { get; set; } = "DanhengServer";
     public string GameServerDescription { get; set; } = "A re-implementation of StarRail server";
-    public int KcpInterval { get; set; } = 40;
 
     public string GetDisplayAddress()
     {
-        return PublicAddress + ":" + PublicPort;
+        return PublicAddress + ":" + Port;
     }
 }
 

diff --git a/Common/Data/Config/AnchorInfo.cs b/Common/Data/Config/AnchorInfo.cs
diff --git a/Common/Data/Config/Rogue/RogueDialogueBaseConfigInfo.cs b/Common/Data/Config/Rogue/RogueDialogueBaseConfigInfo.cs
@@ -0,0 +1,62 @@
+using EggLink.DanhengServer.Internationalization;
+using EggLink.DanhengServer.Util;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace EggLink.DanhengServer.Data.Config.Rogue;
+
+public class RogueDialogueBaseConfigInfo
+{
+    public string OptionPath { get; set; } = string.Empty;
+    public string DialoguePath { get; set; } = string.Empty;
+
+    public LevelGraphConfigInfo? DialogueInfo { get; set; }
+    public RogueDialogueEventConfigInfo? OptionInfo { get; set; }
+
+    public void Loaded()
+    {
+        var logger = Logger.GetByClassName();
+        if (!string.IsNullOrEmpty(OptionPath))
+        {
+            var path = ConfigManager.Config.Path.ResourcePath + "/" + OptionPath;
+            var file = new FileInfo(path);
+            if (!file.Exists) return;
+            try
+            {
+                using var reader = file.OpenRead();
+                using StreamReader reader2 = new(reader);
+                var text = reader2.ReadToEnd();
+                var info = JsonConvert.DeserializeObject<RogueDialogueEventConfigInfo>(text);
+                OptionInfo = info;
+            }
+            catch (Exception ex)
+            {
+                logger.Error(
+                    I18nManager.Translate("Server.ServerInfo.FailedToReadItem", file.Name,
+                        I18nManager.Translate("Word.Error")), ex);
+            }
+        }
+
+        if (!string.IsNullOrEmpty(DialoguePath))
+        {
+            var path = ConfigManager.Config.Path.ResourcePath + "/" + DialoguePath;
+            var file = new FileInfo(path);
+            if (!file.Exists) return;
+            try
+            {
+                using var reader = file.OpenRead();
+                using StreamReader reader2 = new(reader);
+                var text = reader2.ReadToEnd().Replace("$type", "Type");
+                var obj = JObject.Parse(text);
+                var info = LevelGraphConfigInfo.LoadFromJsonObject(obj);
+                DialogueInfo = info;
+            }
+            catch (Exception ex)
+            {
+                logger.Error(
+                    I18nManager.Translate("Server.ServerInfo.FailedToReadItem", file.Name,
+                        I18nManager.Translate("Word.Error")), ex);
+            }
+        }
+    }
+}
diff --git a/Common/Data/Config/Rogue/RogueDialogueEventConfigInfo.cs b/Common/Data/Config/Rogue/RogueDialogueEventConfigInfo.cs
@@ -0,0 +1,6 @@
+namespace EggLink.DanhengServer.Data.Config.Rogue;
+
+public class RogueDialogueEventConfigInfo
+{
+    public List<RogueDialogueEventOptionConfigInfo> OptionList { get; set; } = [];
+}
diff --git a/Common/Data/Config/Rogue/RogueDialogueEventOptionConfigInfo.cs b/Common/Data/Config/Rogue/RogueDialogueEventOptionConfigInfo.cs
@@ -0,0 +1,13 @@
+namespace EggLink.DanhengServer.Data.Config.Rogue;
+
+public class RogueDialogueEventOptionConfigInfo
+{
+    public int OptionID { get; set; }
+    public int DisplayID { get; set; }
+    public int SpecialOptionID { get; set; }
+    public Dictionary<int, RogueDialogueEventOptionDynamicConfigInfo> DynamicMap { get; set; } = [];
+    public int DescValue { get; set; }
+    public int DescValue2 { get; set; }
+    public int DescValue3 { get; set; }
+    public int DescValue4 { get; set; }
+}
diff --git a/Common/Data/Config/Rogue/RogueDialogueEventOptionDynamicConfigInfo.cs b/Common/Data/Config/Rogue/RogueDialogueEventOptionDynamicConfigInfo.cs
@@ -0,0 +1,7 @@
+namespace EggLink.DanhengServer.Data.Config.Rogue;
+
+public class RogueDialogueEventOptionDynamicConfigInfo
+{
+    public int DisplayID { get; set; }
+    public int DisplayID2 { get; set; }
+}
diff --git a/Common/Data/Config/Rogue/RogueNPCConfigInfo.cs b/Common/Data/Config/Rogue/RogueNPCConfigInfo.cs
@@ -0,0 +1,20 @@
+using EggLink.DanhengServer.Enums.Rogue;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace EggLink.DanhengServer.Data.Config.Rogue;
+
+public class RogueNPCConfigInfo
+{
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RogueDialogueTypeEnum DialogueType { get; set; }
+
+    public List<RogueNPCDialogueConfigInfo> DialogueList { get; set; } = [];
+
+    public void Loaded()
+    {
+        if (DialogueList.Count == 0) return;
+
+        foreach (var info in DialogueList) info.Loaded();
+    }
+}
diff --git a/Common/Data/Config/Rogue/RogueNPCDialogueConfigInfo.cs b/Common/Data/Config/Rogue/RogueNPCDialogueConfigInfo.cs
@@ -0,0 +1,8 @@
+namespace EggLink.DanhengServer.Data.Config.Rogue;
+
+public class RogueNPCDialogueConfigInfo : RogueDialogueBaseConfigInfo
+{
+    public int DialogueProgress { get; set; }
+    public int UnlockID { get; set; }
+    public int TalkNameID { get; set; }
+}
diff --git a/Common/Data/Config/Scene/AnchorInfo.cs b/Common/Data/Config/Scene/AnchorInfo.cs
@@ -0,0 +1,5 @@
+namespace EggLink.DanhengServer.Data.Config.Scene;
+
+public class AnchorInfo : PositionInfo
+{
+}
diff --git a/Common/Data/Config/FloorInfo.cs → Common/Data/Config/Scene/FloorInfo.cs b/Common/Data/Config/FloorInfo.cs → Common/Data/Config/Scene/FloorInfo.cs
@@ -1,7 +1,7 @@
 using EggLink.DanhengServer.Enums.Scene;
 using Newtonsoft.Json;
 
-namespace EggLink.DanhengServer.Data.Config;
+namespace EggLink.DanhengServer.Data.Config.Scene;
 
 public class FloorInfo
 {

diff --git a/Common/Data/Config/GroupInfo.cs → Common/Data/Config/Scene/GroupInfo.cs b/Common/Data/Config/GroupInfo.cs → Common/Data/Config/Scene/GroupInfo.cs
@@ -6,7 +6,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace EggLink.DanhengServer.Data.Config;
+namespace EggLink.DanhengServer.Data.Config.Scene;
 
 public class GroupInfo
 {

diff --git a/Common/Data/Config/MonsterInfo.cs → Common/Data/Config/Scene/MonsterInfo.cs b/Common/Data/Config/MonsterInfo.cs → Common/Data/Config/Scene/MonsterInfo.cs
@@ -1,4 +1,4 @@
-namespace EggLink.DanhengServer.Data.Config;
+namespace EggLink.DanhengServer.Data.Config.Scene;
 
 public class MonsterInfo : PositionInfo
 {

diff --git a/Common/Data/Config/NpcInfo.cs → Common/Data/Config/Scene/NpcInfo.cs b/Common/Data/Config/NpcInfo.cs → Common/Data/Config/Scene/NpcInfo.cs
@@ -1,4 +1,4 @@
-namespace EggLink.DanhengServer.Data.Config;
+namespace EggLink.DanhengServer.Data.Config.Scene;
 
 public class NpcInfo : PositionInfo
 {

diff --git a/Common/Data/Config/PositionInfo.cs → Common/Data/Config/Scene/PositionInfo.cs b/Common/Data/Config/PositionInfo.cs → Common/Data/Config/Scene/PositionInfo.cs
@@ -1,6 +1,6 @@
 using EggLink.DanhengServer.Util;
 
-namespace EggLink.DanhengServer.Data.Config;
+namespace EggLink.DanhengServer.Data.Config.Scene;
 
 public class PositionInfo
 {

diff --git a/Common/Data/Config/PropInfo.cs → Common/Data/Config/Scene/PropInfo.cs b/Common/Data/Config/PropInfo.cs → Common/Data/Config/Scene/PropInfo.cs
@@ -3,7 +3,7 @@
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 
-namespace EggLink.DanhengServer.Data.Config;
+namespace EggLink.DanhengServer.Data.Config.Scene;
 
 public class PropInfo : PositionInfo
 {

diff --git a/Common/Data/Excel/RogueBuffGroupExcel.cs b/Common/Data/Excel/RogueBuffGroupExcel.cs
@@ -34,21 +34,19 @@ public void LoadBuff()
     {
         if (IsLoaded) return;
         var count = 0;
-        foreach (var buffID in BuffTagList)
-            if (GameData.RogueBuffData.FirstOrDefault(x => x.Value.RogueBuffTag == buffID).Value is RogueBuffExcel buff)
+        foreach (var buffId in BuffTagList)
+            if (GameData.RogueBuffData.FirstOrDefault(x => x.Value.RogueBuffTag == buffId).Value is RogueBuffExcel buff)
             {
                 BuffList.SafeAdd(buff);
                 count++;
             }
             else
             {
                 // might is group id
-                if (GameData.RogueBuffGroupData.TryGetValue(buffID, out var group))
-                {
-                    group.LoadBuff();
-                    BuffList.SafeAddRange(group.BuffList);
-                    count++;
-                }
+                if (!GameData.RogueBuffGroupData.TryGetValue(buffId, out var group)) continue;
+                group.LoadBuff();
+                BuffList.SafeAddRange(group.BuffList);
+                count++;
             }
 
         if (count == BuffTagList.Count) IsLoaded = true;

diff --git a/Common/Data/Excel/RogueDLCAreaExcel.cs b/Common/Data/Excel/RogueDLCAreaExcel.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using EggLink.DanhengServer.Enums.Rogue;
+using Newtonsoft.Json;
 
 namespace EggLink.DanhengServer.Data.Excel;
 
@@ -13,7 +14,7 @@ public class RogueDLCAreaExcel : ExcelResource
 
     public List<RogueDLCAreaScoreMap> AreaScoreMap { get; set; } = [];
 
-    [JsonIgnore] public int RogueVersionId { get; set; }
+    [JsonIgnore] public RogueSubModeEnum RogueVersionId { get; set; }
 
     public override int GetId()
     {
@@ -24,10 +25,7 @@ public override void Loaded()
     {
         GameData.RogueDLCAreaData[AreaID] = this;
 
-        if (SubType.Contains("Nous"))
-            RogueVersionId = 202;
-        else
-            RogueVersionId = 201;
+        RogueVersionId = SubType.Contains("Nous") ? RogueSubModeEnum.ChessRogueNous : RogueSubModeEnum.ChessRogue;
     }
 }
 

diff --git a/Common/Data/Excel/RogueNPCDialogueExcel.cs b/Common/Data/Excel/RogueNPCDialogueExcel.cs
diff --git a/Common/Data/Excel/RogueNPCExcel.cs b/Common/Data/Excel/RogueNPCExcel.cs
@@ -0,0 +1,27 @@
+using EggLink.DanhengServer.Data.Config.Rogue;
+
+namespace EggLink.DanhengServer.Data.Excel;
+
+[ResourceEntity("RogueNPC.json")]
+public class RogueNPCExcel : ExcelResource
+{
+    public int RogueNPCID { get; set; }
+    public string NPCJsonPath { get; set; } = string.Empty;
+
+    public RogueNPCConfigInfo? RogueNpcConfig { get; set; }
+
+    public override int GetId()
+    {
+        return RogueNPCID;
+    }
+
+    public override void Loaded()
+    {
+        GameData.RogueNPCData.TryAdd(RogueNPCID, this);
+    }
+
+    public bool CanUseInVer(int version)
+    {
+        return RogueNpcConfig != null;
+    }
+}
diff --git a/Common/Data/Excel/RogueTournAreaExcel.cs b/Common/Data/Excel/RogueTournAreaExcel.cs
@@ -0,0 +1,39 @@
+using EggLink.DanhengServer.Enums.TournRogue;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace EggLink.DanhengServer.Data.Excel;
+
+[ResourceEntity("RogueTournArea.json")]
+public class RogueTournAreaExcel : ExcelResource
+{
+    public List<int> MonsterDisplayItemList { get; set; } = [];
+    public List<int> LayerIDList { get; set; } = [];
+    public List<int> DifficultyIDList { get; set; } = [];
+    public int WorldLevelLimit { get; set; }
+    public int FirstReward { get; set; }
+
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RogueTournDifficultyTypeEnum Difficulty { get; set; }
+    public int ExpScoreID { get; set; }
+    public int UnlockID { get; set; }
+    public int AreaID { get; set; }
+    public HashName AreaNameID { get; set; } = new();
+    public bool IsHard { get; set; }
+
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RogueTournModeEnum TournMode { get; set; }
+
+    [JsonConverter(typeof(StringEnumConverter))]
+    public RogueTournAreaGroupIDEnum AreaGroupID { get; set; }
+
+    public override int GetId()
+    {
+        return AreaID;
+    }
+
+    public override void Loaded()
+    {
+        GameData.RogueTournAreaData.TryAdd(AreaID, this);
+    }
+}