From cf292541b3cbc5fef9ba1c8a07859144a1a16f15 Mon Sep 17 00:00:00 2001 From: "ProjectKoi-Kalo\\Kalo" Date: Thu, 31 Jul 2025 15:19:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=982?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.6/Assemblies/WulaFallenEmpire.dll | Bin 88576 -> 89088 bytes .../WulaMiscSettingDefs/EventUIConfig.xml | 2 ++ Documentation/EventSystem_Documentation.md | 9 ++++++++ .../WulaFallenEmpire/EventSystem/Condition.cs | 6 ++++++ .../EventSystem/Dialog_CustomDisplay.cs | 20 ++++++++++++------ Source/WulaFallenEmpire/EventSystem/Effect.cs | 7 +++++- .../EventSystem/EventContext.cs | 5 +++++ .../EventSystem/EventUIConfigDef.cs | 2 ++ 8 files changed, 43 insertions(+), 8 deletions(-) diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll index bd2044e6d805eef4de8fd052a6552a640ee59be5..743361135877b3b9012b1b87430c6741ae13600f 100644 GIT binary patch delta 25032 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 delta 24904 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 L>POX7X#M{HEr)zV diff --git a/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml b/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml index c5fa43c5..789a7274 100644 --- a/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml +++ b/1.6/Defs/WulaMiscSettingDefs/EventUIConfig.xml @@ -7,6 +7,8 @@ Small false + true + true diff --git a/Documentation/EventSystem_Documentation.md b/Documentation/EventSystem_Documentation.md index f245cf4a..59fa83d4 100644 --- a/Documentation/EventSystem_Documentation.md +++ b/Documentation/EventSystem_Documentation.md @@ -403,4 +403,13 @@ ``` +### `Condition_VariableNotEqual` +检查一个变量是否 **不等于** 一个特定值。 +```xml +
  • + QuestStage + 3 +
  • +``` + --- diff --git a/Source/WulaFallenEmpire/EventSystem/Condition.cs b/Source/WulaFallenEmpire/EventSystem/Condition.cs index 2bb758d2..1ce61c9e 100644 --- a/Source/WulaFallenEmpire/EventSystem/Condition.cs +++ b/Source/WulaFallenEmpire/EventSystem/Condition.cs @@ -112,4 +112,10 @@ namespace WulaFallenEmpire protected override bool Compare(float var1, float var2) => var1 <= var2; protected override string GetOperatorString() => "<="; } + + public class Condition_VariableNotEqual : Condition_CompareVariable + { + protected override bool Compare(float var1, float var2) => var1 != var2; + protected override string GetOperatorString() => "!="; + } } diff --git a/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs b/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs index c1202d1e..6ef3144f 100644 --- a/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs +++ b/Source/WulaFallenEmpire/EventSystem/Dialog_CustomDisplay.cs @@ -95,14 +95,20 @@ namespace WulaFallenEmpire } // 2. Draw Top-left defName and Label - Text.Font = GameFont.Tiny; - GUI.color = Color.gray; - Widgets.Label(new Rect(5, 5, inRect.width - 10, 20f), def.defName); - GUI.color = Color.white; + if (Config.showDefName) + { + Text.Font = GameFont.Tiny; + GUI.color = Color.gray; + Widgets.Label(new Rect(5, 5, inRect.width - 10, 20f), def.defName); + GUI.color = Color.white; + } - Text.Font = Config.labelFont; - Widgets.Label(new Rect(5, 20f, inRect.width - 10, 30f), def.label); - Text.Font = GameFont.Small; // Reset to default + if (Config.showLabel) + { + Text.Font = Config.labelFont; + Widgets.Label(new Rect(5, 20f, inRect.width - 10, 30f), def.label); + Text.Font = GameFont.Small; // Reset to default + } // 3. Calculate Layout based on ConfigDef float virtualWidth = Config.lihuiSize.x + Config.textSize.x; diff --git a/Source/WulaFallenEmpire/EventSystem/Effect.cs b/Source/WulaFallenEmpire/EventSystem/Effect.cs index ce70d404..c7e548a4 100644 --- a/Source/WulaFallenEmpire/EventSystem/Effect.cs +++ b/Source/WulaFallenEmpire/EventSystem/Effect.cs @@ -293,7 +293,12 @@ namespace WulaFallenEmpire return; } - float currentValue = EventContext.GetVariable(name, 0f); + if (!EventContext.HasVariable(name)) + { + EventContext.SetVariable(name, 0f); + } + + float currentValue = EventContext.GetVariable(name); switch (operation) { diff --git a/Source/WulaFallenEmpire/EventSystem/EventContext.cs b/Source/WulaFallenEmpire/EventSystem/EventContext.cs index 68a2717e..94a1b3fa 100644 --- a/Source/WulaFallenEmpire/EventSystem/EventContext.cs +++ b/Source/WulaFallenEmpire/EventSystem/EventContext.cs @@ -43,6 +43,11 @@ namespace WulaFallenEmpire return defaultValue; } + public static bool HasVariable(string name) + { + return variables.ContainsKey(name); + } + public static void Clear() { variables.Clear(); diff --git a/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs b/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs index e968157c..bfc19f9b 100644 --- a/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs +++ b/Source/WulaFallenEmpire/EventSystem/EventUIConfigDef.cs @@ -8,6 +8,8 @@ namespace WulaFallenEmpire // General Style public GameFont labelFont = GameFont.Small; public bool drawBorders = true; + public bool showDefName = true; + public bool showLabel = true; public string defaultBackgroundImagePath; public Vector2 defaultWindowSize = new Vector2(750f, 500f);