From 64a354d806f46c366f69680f9c321ed6024e0c60 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期五, 17 十月 2025 09:53:24 +0800 Subject: [PATCH] 0312 删除旧的仙盟和日常代码 --- Main/System/Guild/EmblemHelper.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Main/System/FairyEmblem/EmblemHelper.cs b/Main/System/Guild/EmblemHelper.cs similarity index 75% rename from Main/System/FairyEmblem/EmblemHelper.cs rename to Main/System/Guild/EmblemHelper.cs index b56819f..053105a 100644 --- a/Main/System/FairyEmblem/EmblemHelper.cs +++ b/Main/System/Guild/EmblemHelper.cs @@ -31,26 +31,26 @@ { if (FamilyEmblemConfig.HasKey(id)) return id; - return !FamilyEmblemConfig.HasKey(FairyEmblemModel.Instance.defaultFamilyEmblemId) ? 0 : FairyEmblemModel.Instance.defaultFamilyEmblemId; + return !FamilyEmblemConfig.HasKey(GuildEmblemModel.Instance.defaultFamilyEmblemId) ? 0 : GuildEmblemModel.Instance.defaultFamilyEmblemId; } public static int GetMyEmblemID() { - int emblemID = (int)PlayerDatas.Instance.fairyData.fairy.Extra6; - if (FamilyEmblemConfig.HasKey(emblemID) && FairyEmblemModel.Instance.IsUnLock(emblemID)) + int emblemID = (int)PlayerDatas.Instance.fairyData.fairy.EmblemID; + if (FamilyEmblemConfig.HasKey(emblemID) && GuildEmblemModel.Instance.IsUnLock(emblemID)) return emblemID; - return !FamilyEmblemConfig.HasKey(FairyEmblemModel.Instance.defaultFamilyEmblemId) ? 0 : FairyEmblemModel.Instance.defaultFamilyEmblemId; + return !FamilyEmblemConfig.HasKey(GuildEmblemModel.Instance.defaultFamilyEmblemId) ? 0 : GuildEmblemModel.Instance.defaultFamilyEmblemId; } public static int GetEmblemEffectID(int id) { - FairyEmblemModel.Instance.TryGetEffectID(id, out int effectID); + GuildEmblemModel.Instance.TryGetEffectID(id, out int effectID); return effectID; } public static int GetDefaultFamilyEmblemId() { - return FairyEmblemModel.Instance.defaultFamilyEmblemId; + return GuildEmblemModel.Instance.defaultFamilyEmblemId; } } -- Gitblit v1.8.0