mirror of
https://gitee.com/6tail/lunar-csharp.git
synced 2025-12-06 10:19:07 +08:00
v1.6.2 修改每日宜忌默认流派;更新2018之后的△T参数。
This commit is contained in:
@@ -19,3 +19,7 @@
|
||||
1. 修复九星错别字;
|
||||
2. 修复每日宜忌错别字;
|
||||
3. 去除每日宜忌的重复项。
|
||||
|
||||
## [1.6.2] - 2025-03-06
|
||||
1. 修改每日宜忌默认流派。
|
||||
2. 更新2018之后的△T参数。
|
||||
|
||||
@@ -1354,15 +1354,35 @@ namespace Lunar
|
||||
/// </summary>
|
||||
public string MonthPositionTai => Month < 0 ? "" : LunarUtil.POSITION_TAI_MONTH[Month - 1];
|
||||
|
||||
/// <summary>
|
||||
/// 日宜,如果没有,返回["无"],默认流派1
|
||||
/// </summary>
|
||||
public List<string> DayYi => GetDayYi();
|
||||
|
||||
/// <summary>
|
||||
/// 日宜,如果没有,返回["无"]
|
||||
/// </summary>
|
||||
public List<string> DayYi => LunarUtil.GetDayYi(MonthInGanZhiExact, DayInGanZhi);
|
||||
/// <param name="sect">流派,1以节交接当天起算月,2以节交接时刻起算月</param>
|
||||
/// <returns>宜</returns>
|
||||
public List<string> GetDayYi(int sect = 1)
|
||||
{
|
||||
return LunarUtil.GetDayYi(2 == sect ? MonthInGanZhiExact : MonthInGanZhi, DayInGanZhi);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 日忌,如果没有,返回["无"],默认流派1
|
||||
/// </summary>
|
||||
public List<string> DayJi => GetDayJi();
|
||||
|
||||
/// <summary>
|
||||
/// 日忌,如果没有,返回["无"]
|
||||
/// </summary>
|
||||
public List<string> DayJi => LunarUtil.GetDayJi(MonthInGanZhiExact, DayInGanZhi);
|
||||
/// <param name="sect">流派,1以节交接当天起算月,2以节交接时刻起算月</param>
|
||||
/// <returns>忌</returns>
|
||||
public List<string> GetDayJi(int sect = 1)
|
||||
{
|
||||
return LunarUtil.GetDayJi(2 == sect ? MonthInGanZhiExact : MonthInGanZhi, DayInGanZhi);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 日吉神(宜趋),如果没有,返回["无"]
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
<RootNamespace>Lunar</RootNamespace>
|
||||
<GenerateDocumentationFile>True</GenerateDocumentationFile>
|
||||
<PackageId>lunar-csharp</PackageId>
|
||||
<PackageVersion>1.6.1</PackageVersion>
|
||||
<Title>无依赖的阳历、阴历、道历和佛历工具库</Title>
|
||||
<Authors>6tail</Authors>
|
||||
<Description>日历、公历(阳历)、农历(阴历、老黄历)、佛历、道历,节假日、星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。</Description>
|
||||
@@ -16,12 +15,13 @@
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<PackageTags>日历;公历;阳历;农历;阴历;老黄历;佛历;道历;法定假日</PackageTags>
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<AssemblyVersion>1.6.1</AssemblyVersion>
|
||||
<FileVersion>1.6.1</FileVersion>
|
||||
<PackageReleaseNotes>修复九星错别字;修复每日宜忌错别字;去除每日宜忌的重复项。。</PackageReleaseNotes>
|
||||
<PackageIcon>lunar.png</PackageIcon>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageVersion>1.6.2</PackageVersion>
|
||||
<AssemblyVersion>1.6.2</AssemblyVersion>
|
||||
<FileVersion>1.6.2</FileVersion>
|
||||
<PackageReleaseNotes>修改每日宜忌默认流派;更新2018之后的△T参数。</PackageReleaseNotes>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
|
||||
@@ -70,8 +70,10 @@ 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, 69.0, 0.36, 0, 0,
|
||||
2028, 72.6
|
||||
2018, 73.6, 0.40, 0, 0,
|
||||
2021, 78.1, 0.44, 0, 0,
|
||||
2024, 83.1, 0.55, 0, 0,
|
||||
2028, 98.6
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -30,14 +30,14 @@ namespace test
|
||||
public void Test3()
|
||||
{
|
||||
var lunar = Lunar.Lunar.FromYmdHms(2050, 12, 1);
|
||||
Assert.Equal("2050-12-07 06:41:13", lunar.JieQiTable["DA_XUE"].YmdHms);
|
||||
Assert.Equal("2050-12-07 06:40:53", lunar.JieQiTable["DA_XUE"].YmdHms);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Test4()
|
||||
{
|
||||
var lunar = Solar.FromYmdHms(2023, 6, 1).Lunar;
|
||||
Assert.Equal("2022-12-22 05:48:11", lunar.JieQiTable["冬至"].YmdHms);
|
||||
Assert.Equal("2022-12-22 05:48:01", lunar.JieQiTable["冬至"].YmdHms);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user