Oshima-Studios/OshimaGameModule
3
1
Fork 1
mirror of https://github.com/oshima-studios/OshimaGameModule.git synced 2025-08-02 12:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

.NET 9

Browse Source
This commit is contained in:
milimoe 2024-11-14 22:50:46 +08:00
parent 89e64894e1
commit e0be8706d5
Signed by: milimoe
GPG Key ID: 05D280912DA6C69E
7 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OshimaCore/OshimaCore.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Oshima.Core</RootNamespace> <RootNamespace>Oshima.Core</RootNamespace>
@ -24,10 +24,11 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OshimaModules\OshimaModules.csproj" /> <ProjectReference Include="..\OshimaModules\OshimaModules.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="FunGame.Core"> <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>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
OshimaCore/Utils/FunGameUtil.cs
View File

@ -899,6 +899,7 @@ namespace Oshima.Core.Utils
public static void GenerateAndAddSkillToMagicCard(Item item, int total) public static void GenerateAndAddSkillToMagicCard(Item item, int total)
{ {
Skill magic = Magics[Random.Shared.Next(Magics.Count)].Copy(); Skill magic = Magics[Random.Shared.Next(Magics.Count)].Copy();
magic.Guid = item.Guid;
magic.Level = (int)item.QualityType switch magic.Level = (int)item.QualityType switch
{ {
2 => 2, 2 => 2,
@ -975,6 +976,12 @@ namespace Oshima.Core.Utils
if (magic.Level > 1) item.Name += $" +{magic.Level - 1}"; if (magic.Level > 1) item.Name += $" +{magic.Level - 1}";
skill.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); item.Skills.Passives.Add(skill);
} }
@ -1079,6 +1086,7 @@ namespace Oshima.Core.Utils
else else
{ {
Skill magic = skill.Copy(); Skill magic = skill.Copy();
magic.Guid = item.Guid;
magic.Level = skill.Level; magic.Level = skill.Level;
item.Skills.Magics.Add(magic); item.Skills.Magics.Add(magic);
} }

4
OshimaMaps/OshimaMaps.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Company>Oshima Studios</Company> <Company>Oshima Studios</Company>
@ -24,7 +24,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="FunGame.Core"> <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>
</ItemGroup> </ItemGroup>

4
OshimaModes/OshimaModes.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework> <TargetFramework>net9.0-windows7.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
@ -27,7 +27,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="FunGame.Core"> <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>
<Reference Include="FunGame.Desktop"> <Reference Include="FunGame.Desktop">
<HintPath>..\..\FunGame.Desktop\bin\Debug\net8.0-windows\FunGame.Desktop.dll</HintPath> <HintPath>..\..\FunGame.Desktop\bin\Debug\net8.0-windows\FunGame.Desktop.dll</HintPath>

7
OshimaModes/UserControsl/CustomProgressBar.cs
View File

@ -1,4 +1,6 @@
namespace Oshima.FunGame.OshimaModes using System.ComponentModel;
namespace Oshima.FunGame.OshimaModes
{ {
public class CustomProgressBar : UserControl public class CustomProgressBar : UserControl
{ {
@ -6,6 +8,7 @@
private double _maximum = 100; private double _maximum = 100;
private Color _progressColor = Color.Red; private Color _progressColor = Color.Red;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double Value public double Value
{ {
get => _value; get => _value;
@ -16,6 +19,7 @@
} }
} }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public double Maximum public double Maximum
{ {
get => _maximum; get => _maximum;
@ -26,6 +30,7 @@
} }
} }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Color ProgressColor public Color ProgressColor
{ {
get => _progressColor; get => _progressColor;

4
OshimaModules/OshimaModules.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<RootNamespace>Oshima.FunGame.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace> <RootNamespace>Oshima.FunGame.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
@ -24,7 +24,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="FunGame.Core"> <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>
</ItemGroup> </ItemGroup>

4
OshimaServers/OshimaServers.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<BaseOutputPath>..\bin\</BaseOutputPath> <BaseOutputPath>..\bin\</BaseOutputPath>
@ -23,7 +23,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="FunGame.Core"> <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>
</ItemGroup> </ItemGroup>