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 @@
- net8.0
+ net9.0
enable
enable
Oshima.Core
@@ -24,10 +24,11 @@
+
-
- ..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll
-
+
+ ..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll
+
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 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 @@
- net8.0
+ net9.0
enable
enable
Oshima Studios
@@ -24,7 +24,7 @@
- ..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll
+ ..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll
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 @@
WinExe
- net8.0-windows
+ net9.0-windows7.0
enable
true
enable
@@ -27,7 +27,7 @@
- ..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll
+ ..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll
..\..\FunGame.Desktop\bin\Debug\net8.0-windows\FunGame.Desktop.dll
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 @@
- net8.0
+ net9.0
enable
enable
Oshima.FunGame.$(MSBuildProjectName.Replace(" ", "_"))
@@ -24,7 +24,7 @@
- ..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll
+ ..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll
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 @@
- net8.0
+ net9.0
enable
enable
..\bin\
@@ -23,7 +23,7 @@
- ..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll
+ ..\..\FunGame.Core\bin\Release\net9.0\FunGame.Core.dll