leftyer/lunar-csharp
1
0
Fork 0
mirror of https://gitee.com/6tail/lunar-csharp.git synced 2025-12-06 10:19:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

v1.6.5 修复极端情况下八字转公历时刻出现遗漏的问题；更新△T参数；优化吉神宜驱、凶神宜忌；修复候的错别字。

Browse Source
This commit is contained in:
6tail
2025-10-14 20:39:55 +08:00
parent 80e0f3685e
commit 1267683f29
6 changed files with 85 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -30,3 +30,9 @@
## [1.6.4] - 2025-04-29
1. 修复身宫报错的问题。
## [1.6.5] - 2025-10-14
1. 修复：极端情况下八字转公历时刻出现遗漏的问题。
2. 优化：更新△T参数。
3. 优化：吉神宜驱、凶神宜忌。
4. 修复：候的错别字。

4
lunar/Solar.cs
View File

@@ -300,6 +300,10 @@ namespace Lunar
// 验证一下
var solar = FromYmdHms(solarTime.Year, solarTime.Month, solarTime.Day, hour, mi, s);
if (d == 30)
{
solar = solar.NextHour(-1);
}
var lunar = solar.Lunar;
var dgz = (2 == sect) ? lunar.DayInGanZhiExact2 : lunar.DayInGanZhiExact;
if (lunar.YearInGanZhiExact.Equals(yearGanZhi) &&

8
lunar/lunar.csproj
View File

@@ -18,10 +18,10 @@
<PackageIcon>lunar.png</PackageIcon>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageVersion>1.6.4</PackageVersion>
<AssemblyVersion>1.6.4</AssemblyVersion>
<FileVersion>1.6.4</FileVersion>
<PackageReleaseNotes>修复身宫报错的问题。</PackageReleaseNotes>
<PackageVersion>1.6.5</PackageVersion>
<AssemblyVersion>1.6.5</AssemblyVersion>
<FileVersion>1.6.5</FileVersion>
<PackageReleaseNotes>修复极端情况下八字转公历时刻出现遗漏的问题；更新△T参数；优化吉神宜驱、凶神宜忌；修复候的错别字。</PackageReleaseNotes>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

88
lunar/util/LunarUtil.cs
View File

File diff suppressed because one or more lines are too long

18
lunar/util/ShouXingUtil.cs
View File

@@ -6,7 +6,7 @@ using System;
namespace Lunar.Util
{
/// <summary>
/// 寿星天文历工具（http://www.nongli.net/sxwnl/）
/// 寿星天文历工具（https://github.com/sxwnl/sxwnl）
/// </summary>
public static class ShouXingUtil
{
@@ -70,10 +70,18 @@ namespace Lunar.Util
2000, 63.87, 0.1, 0, 0,
2005, 64.7, 0.21, 0, 0,
2012, 66.8, 0.22, 0, 0,
2018, 73.6, 0.40, 0, 0,
2021, 78.1, 0.44, 0, 0,
2024, 83.1, 0.55, 0, 0,
2028, 98.6
// 2018, 69.0, 0.36, 0, 0,
// 使用skyfeild的DE440s△T预测数据拟合
2016, 68.1024, 0.5456, -0.0542, -0.001172,
2020, 69.3612, 0.0422, -0.0502, 0.006216,
2024, 69.1752, -0.0335, -0.0048, 0.000811,
2028, 69.0206, -0.0275, 0.0055, -0.000014,
2032, 68.9981, 0.0163, 0.0054, 0.000006,
2036, 69.1498, 0.0599, 0.0053, 0.000026,
2040, 69.4751, 0.1035, 0.0051, 0.000046,
2044, 69.9737, 0.1469, 0.0050, 0.000066,
2048, 70.6451, 0.1903, 0.0049, 0.000085,
2050, 71.0457
};
/// <summary>

4
test/JieQiTest.cs
View File

@@ -30,14 +30,14 @@ namespace test
public void Test3()
{
var lunar = Lunar.Lunar.FromYmdHms(2050, 12, 1);
Assert.Equal("2050-12-07 06:40:53", lunar.JieQiTable["DA_XUE"].YmdHms);
Assert.Equal("2050-12-07 06:41:54", lunar.JieQiTable["DA_XUE"].YmdHms);
}
[Fact]
public void Test4()
{
var lunar = Solar.FromYmdHms(2023, 6, 1).Lunar;
Assert.Equal("2022-12-22 05:48:01", lunar.JieQiTable["冬至"].YmdHms);
Assert.Equal("2022-12-22 05:48:12", lunar.JieQiTable["冬至"].YmdHms);
}
}
}