From 89e64894e18d796e4ddccde60307fa7efa9b38a6 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Thu, 14 Nov 2024 00:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20CharacterBuilder=EF=BC=9B?=
 =?UTF-8?q?=E4=B8=BA=20Item=20=E6=B7=BB=E5=8A=A0=E4=BA=86=20Guid=EF=BC=9B?=
 =?UTF-8?q?=E5=BC=80=E5=B7=A5=E5=BA=93=E5=AD=98=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OshimaModules/Modules/CharacterModule.cs | 24 ++++++++++++++++++++++++
 OshimaModules/Modules/SkillModule.cs     | 14 ++------------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/OshimaModules/Modules/CharacterModule.cs b/OshimaModules/Modules/CharacterModule.cs
index 78d29fd..4b61826 100644
--- a/OshimaModules/Modules/CharacterModule.cs
+++ b/OshimaModules/Modules/CharacterModule.cs
@@ -1,5 +1,6 @@
 using Milimoe.FunGame.Core.Api.Utility;
 using Milimoe.FunGame.Core.Entity;
+using Oshima.FunGame.OshimaModules.Characters;
 
 namespace Oshima.FunGame.OshimaModules
 {
@@ -19,5 +20,28 @@ namespace Oshima.FunGame.OshimaModules
                 return config;
             }
         }
+
+        protected override Factory.EntityFactoryDelegate<Character> EntityFactory()
+        {
+            return (id, name, args) =>
+            {
+                return id switch
+                {
+                    1 => new OshimaShiya(),
+                    2 => new XinYin(),
+                    3 => new Yang(),
+                    4 => new NanGanYu(),
+                    5 => new NiuNan(),
+                    6 => new DokyoMayor(),
+                    7 => new MagicalGirl(),
+                    8 => new QingXiang(),
+                    9 => new QWQAQW(),
+                    10 => new ColdBlue(),
+                    11 => new dddovo(),
+                    12 => new Quduoduo(),
+                    _ => null,
+                };
+            };
+        }
     }
 }
diff --git a/OshimaModules/Modules/SkillModule.cs b/OshimaModules/Modules/SkillModule.cs
index e393d28..982ca53 100644
--- a/OshimaModules/Modules/SkillModule.cs
+++ b/OshimaModules/Modules/SkillModule.cs
@@ -26,7 +26,7 @@ namespace Oshima.FunGame.OshimaModules
         {
             return (id, name, args) =>
             {
-                Skill skill = id switch
+                return id switch
                 {
                     (long)MagicID.冰霜攻击 => new 冰霜攻击(),
                     (long)MagicID.火之矢 => new 火之矢(),
@@ -64,18 +64,8 @@ namespace Oshima.FunGame.OshimaModules
                     (long)PassiveID.敏捷之刃 => new 敏捷之刃(),
                     (long)PassiveID.弱者猎手 => new 弱者猎手(),
                     (long)ItemPassiveID.攻击之爪 => new 攻击之爪技能(),
-                    _ => new OpenSkill(id, name, args)
+                    _ => null
                 };
-
-                if (skill is OpenSkill && args.TryGetValue("values", out object? value) && value is Dictionary<string, object> dict)
-                {
-                    foreach (string key in dict.Keys)
-                    {
-                        skill.Values[key] = dict[key];
-                    }
-                }
-
-                return skill;
             };
         }