From e0be8706d5f1dedae2c15c3c8d043fb8a0cf6fbf Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Thu, 14 Nov 2024 22:50:46 +0800
Subject: [PATCH] .NET 9

---
 OshimaCore/OshimaCore.csproj                  | 9 +++++----
 OshimaCore/Utils/FunGameUtil.cs               | 8 ++++++++
 OshimaMaps/OshimaMaps.csproj                  | 4 ++--
 OshimaModes/OshimaModes.csproj                | 4 ++--
 OshimaModes/UserControsl/CustomProgressBar.cs | 7 ++++++-
 OshimaModules/OshimaModules.csproj            | 4 ++--
 OshimaServers/OshimaServers.csproj            | 4 ++--
 7 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/OshimaCore/OshimaCore.csproj b/OshimaCore/OshimaCore.csproj
index 4470065..a4aa4f6 100644
--- a/OshimaCore/OshimaCore.csproj
+++ b/OshimaCore/OshimaCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<RootNamespace>Oshima.Core</RootNamespace>
@@ -24,10 +24,11 @@
 	<ItemGroup>
 		<ProjectReference Include="..\OshimaModules\OshimaModules.csproj" />
 	</ItemGroup>
+
 	<ItemGroup>
-		<Reference Include="FunGame.Core">
-			<HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
-		</Reference>
+	  <Reference Include="FunGame.Core">
+	    <HintPath>..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll</HintPath>
+	  </Reference>
 	</ItemGroup>
 
 </Project>
diff --git a/OshimaCore/Utils/FunGameUtil.cs b/OshimaCore/Utils/FunGameUtil.cs
index 6b08e6b..0b17b8a 100644
--- a/OshimaCore/Utils/FunGameUtil.cs
+++ b/OshimaCore/Utils/FunGameUtil.cs
@@ -899,6 +899,7 @@ namespace Oshima.Core.Utils
         public static void GenerateAndAddSkillToMagicCard(Item item, int total)
         {
             Skill magic = Magics[Random.Shared.Next(Magics.Count)].Copy();
+            magic.Guid = item.Guid;
             magic.Level = (int)item.QualityType switch
             {
                 2 => 2,
@@ -975,6 +976,12 @@ namespace Oshima.Core.Utils
 
             if (magic.Level > 1) item.Name += $" +{magic.Level - 1}";
             skill.Level = 1;
+            List<string> strings = [];
+            if (str > 0) strings.Add($"{str:0.##} 点力量");
+            if (agi > 0) strings.Add($"{agi:0.##} 点敏捷");
+            if (intelligence > 0) strings.Add($"{intelligence:0.##} 点智力");
+            item.Description = $"包含魔法：{item.Skills.Active.Name}\r\n" +
+                $"增加角色属性：{string.Join("，", strings)}";
             item.Skills.Passives.Add(skill);
         }
 
@@ -1079,6 +1086,7 @@ namespace Oshima.Core.Utils
                     else
                     {
                         Skill magic = skill.Copy();
+                        magic.Guid = item.Guid;
                         magic.Level = skill.Level;
                         item.Skills.Magics.Add(magic);
                     }
diff --git a/OshimaMaps/OshimaMaps.csproj b/OshimaMaps/OshimaMaps.csproj
index d583dd3..2961f66 100644
--- a/OshimaMaps/OshimaMaps.csproj
+++ b/OshimaMaps/OshimaMaps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Company>Oshima Studios</Company>
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
+      <HintPath>..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/OshimaModes/OshimaModes.csproj b/OshimaModes/OshimaModes.csproj
index 761ec56..8f43196 100644
--- a/OshimaModes/OshimaModes.csproj
+++ b/OshimaModes/OshimaModes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -27,7 +27,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
+      <HintPath>..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll</HintPath>
     </Reference>
     <Reference Include="FunGame.Desktop">
       <HintPath>..\..\FunGame.Desktop\bin\Debug\net8.0-windows\FunGame.Desktop.dll</HintPath>
diff --git a/OshimaModes/UserControsl/CustomProgressBar.cs b/OshimaModes/UserControsl/CustomProgressBar.cs
index 4c810c0..590ceaa 100644
--- a/OshimaModes/UserControsl/CustomProgressBar.cs
+++ b/OshimaModes/UserControsl/CustomProgressBar.cs
@@ -1,4 +1,6 @@
-namespace Oshima.FunGame.OshimaModes
+using System.ComponentModel;
+
+namespace Oshima.FunGame.OshimaModes
 {
     public class CustomProgressBar : UserControl
     {
@@ -6,6 +8,7 @@
         private double _maximum = 100;
         private Color _progressColor = Color.Red;
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public double Value
         {
             get => _value;
@@ -16,6 +19,7 @@
             }
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public double Maximum
         {
             get => _maximum;
@@ -26,6 +30,7 @@
             }
         }
 
+        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         public Color ProgressColor
         {
             get => _progressColor;
diff --git a/OshimaModules/OshimaModules.csproj b/OshimaModules/OshimaModules.csproj
index 6273e18..d118c40 100644
--- a/OshimaModules/OshimaModules.csproj
+++ b/OshimaModules/OshimaModules.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>Oshima.FunGame.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
+      <HintPath>..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/OshimaServers/OshimaServers.csproj b/OshimaServers/OshimaServers.csproj
index 3ed18ec..63b7a61 100644
--- a/OshimaServers/OshimaServers.csproj
+++ b/OshimaServers/OshimaServers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <BaseOutputPath>..\bin\</BaseOutputPath>
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <Reference Include="FunGame.Core">
-      <HintPath>..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll</HintPath>
+      <HintPath>..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll</HintPath>
     </Reference>
   </ItemGroup>