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.5.6 更新2024年法定假日数据；十神优化。

Browse Source
This commit is contained in:
6tail
2023-10-25 21:52:46 +08:00
parent c5831b7e1e
commit 1949a785f8
4 changed files with 108 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lunar/eightchar/EightChar.cs
View File

@@ -118,7 +118,7 @@ namespace Lunar.EightChar
{
var hideGan = LunarUtil.ZHI_HIDE_GAN[zhi];
var l = new List<string>(hideGan.Count);
l.AddRange(hideGan.Select(gan => LunarUtil.SHI_SHEN_ZHI[$"{DayGan}{zhi}{gan}"]));
l.AddRange(hideGan.Select(gan => LunarUtil.SHI_SHEN_ZHI[$"{DayGan}{gan}"]));
return l;
}

12
lunar/lunar.csproj
View File

@@ -6,7 +6,7 @@
<RootNamespace>Lunar</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<PackageId>lunar-csharp</PackageId>
<PackageVersion>1.5.5</PackageVersion>
<PackageVersion>1.5.6</PackageVersion>
<Title>无依赖的阳历、阴历、道历和佛历工具库</Title>
<Authors>6tail</Authors>
<Description>日历、公历(阳历)、农历(阴历、老黄历)、佛历、道历，节假日、星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。</Description>
@@ -16,11 +16,11 @@
<RepositoryType>git</RepositoryType>
<PackageTags>日历;公历;阳历;农历;阴历;老黄历;佛历;道历;法定假日</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyVersion>1.5.5</AssemblyVersion>
<FileVersion>1.5.5</FileVersion>
<PackageReleaseNotes>中元节改为农历七月十五；修复Solar的nextMonth超期问题。</PackageReleaseNotes>
<PackageIcon>https://github.com/6tail/lunar-csharp/raw/master/lunar.png</PackageIcon>
<PackageLicenseUrl>https://github.com/6tail/lunar-csharp/raw/master/LICENSE</PackageLicenseUrl>
<AssemblyVersion>1.5.6</AssemblyVersion>
<FileVersion>1.5.6</FileVersion>
<PackageReleaseNotes>更新2024年法定假日数据；十神优化。</PackageReleaseNotes>
<PackageIcon>https://raw.githubusercontent.com/6tail/lunar-csharp/master/lunar.png</PackageIcon>
<PackageLicenseUrl>https://raw.githubusercontent.com/6tail/lunar-csharp/master/LICENSE</PackageLicenseUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

2
lunar/util/HolidayUtil.cs
View File

File diff suppressed because one or more lines are too long

380
lunar/util/LunarUtil.cs
View File

@@ -883,286 +883,106 @@ namespace Lunar.Util
/// </summary>
public static readonly Dictionary<string, string> SHI_SHEN_ZHI = new Dictionary<string, string>
{
{"甲子癸", "正印"},
{"甲丑癸", "正印"},
{"甲丑己", "正财"},
{"甲丑辛", "正官"},
{"甲寅丙", "食神"},
{"甲寅甲", "比肩"},
{"甲寅戊", "偏财"},
{"甲卯乙", "劫财"},
{"甲辰乙", "劫财"},
{"甲辰戊", "偏财"},
{"甲辰癸", "正印"},
{"甲巳戊", "偏财"},
{"甲巳丙", "食神"},
{"甲巳庚", "七杀"},
{"甲午丁", "伤官"},
{"甲午己", "正财"},
{"甲未乙", "劫财"},
{"甲未己", "正财"},
{"甲未丁", "伤官"},
{"甲申戊", "偏财"},
{"甲申庚", "七杀"},
{"甲申壬", "偏印"},
{"甲酉辛", "正官"},
{"甲戌辛", "正官"},
{"甲戌戊", "偏财"},
{"甲戌丁", "伤官"},
{"甲亥壬", "偏印"},
{"甲亥甲", "比肩"},
{"乙子癸", "偏印"},
{"乙丑癸", "偏印"},
{"乙丑己", "偏财"},
{"乙丑辛", "七杀"},
{"乙寅丙", "伤官"},
{"乙寅甲", "劫财"},
{"乙寅戊", "正财"},
{"乙卯乙", "比肩"},
{"乙辰乙", "比肩"},
{"乙辰戊", "正财"},
{"乙辰癸", "偏印"},
{"乙巳戊", "正财"},
{"乙巳丙", "伤官"},
{"乙巳庚", "正官"},
{"乙午丁", "食神"},
{"乙午己", "偏财"},
{"乙未乙", "比肩"},
{"乙未己", "偏财"},
{"乙未丁", "食神"},
{"乙申戊", "正财"},
{"乙申庚", "正官"},
{"乙申壬", "正印"},
{"乙酉辛", "七杀"},
{"乙戌辛", "七杀"},
{"乙戌戊", "正财"},
{"乙戌丁", "食神"},
{"乙亥壬", "正印"},
{"乙亥甲", "劫财"},
{"丙子癸", "正官"},
{"丙丑癸", "正官"},
{"丙丑己", "伤官"},
{"丙丑辛", "正财"},
{"丙寅丙", "比肩"},
{"丙寅甲", "偏印"},
{"丙寅戊", "食神"},
{"丙卯乙", "正印"},
{"丙辰乙", "正印"},
{"丙辰戊", "食神"},
{"丙辰癸", "正官"},
{"丙巳戊", "食神"},
{"丙巳丙", "比肩"},
{"丙巳庚", "偏财"},
{"丙午丁", "劫财"},
{"丙午己", "伤官"},
{"丙未乙", "正印"},
{"丙未己", "伤官"},
{"丙未丁", "劫财"},
{"丙申戊", "食神"},
{"丙申庚", "偏财"},
{"丙申壬", "七杀"},
{"丙酉辛", "正财"},
{"丙戌辛", "正财"},
{"丙戌戊", "食神"},
{"丙戌丁", "劫财"},
{"丙亥壬", "七杀"},
{"丙亥甲", "偏印"},
{"丁子癸", "七杀"},
{"丁丑癸", "七杀"},
{"丁丑己", "食神"},
{"丁丑辛", "偏财"},
{"丁寅丙", "劫财"},
{"丁寅甲", "正印"},
{"丁寅戊", "伤官"},
{"丁卯乙", "偏印"},
{"丁辰乙", "偏印"},
{"丁辰戊", "伤官"},
{"丁辰癸", "七杀"},
{"丁巳戊", "伤官"},
{"丁巳丙", "劫财"},
{"丁巳庚", "正财"},
{"丁午丁", "比肩"},
{"丁午己", "食神"},
{"丁未乙", "偏印"},
{"丁未己", "食神"},
{"丁未丁", "比肩"},
{"丁申戊", "伤官"},
{"丁申庚", "正财"},
{"丁申壬", "正官"},
{"丁酉辛", "偏财"},
{"丁戌辛", "偏财"},
{"丁戌戊", "伤官"},
{"丁戌丁", "比肩"},
{"丁亥壬", "正官"},
{"丁亥甲", "正印"},
{"戊子癸", "正财"},
{"戊丑癸", "正财"},
{"戊丑己", "劫财"},
{"戊丑辛", "伤官"},
{"戊寅丙", "偏印"},
{"戊寅甲", "七杀"},
{"戊寅戊", "比肩"},
{"戊卯乙", "正官"},
{"戊辰乙", "正官"},
{"戊辰戊", "比肩"},
{"戊辰癸", "正财"},
{"戊巳戊", "比肩"},
{"戊巳丙", "偏印"},
{"戊巳庚", "食神"},
{"戊午丁", "正印"},
{"戊午己", "劫财"},
{"戊未乙", "正官"},
{"戊未己", "劫财"},
{"戊未丁", "正印"},
{"戊申戊", "比肩"},
{"戊申庚", "食神"},
{"戊申壬", "偏财"},
{"戊酉辛", "伤官"},
{"戊戌辛", "伤官"},
{"戊戌戊", "比肩"},
{"戊戌丁", "正印"},
{"戊亥壬", "偏财"},
{"戊亥甲", "七杀"},
{"己子癸", "偏财"},
{"己丑癸", "偏财"},
{"己丑己", "比肩"},
{"己丑辛", "食神"},
{"己寅丙", "正印"},
{"己寅甲", "正官"},
{"己寅戊", "劫财"},
{"己卯乙", "七杀"},
{"己辰乙", "七杀"},
{"己辰戊", "劫财"},
{"己辰癸", "偏财"},
{"己巳戊", "劫财"},
{"己巳丙", "正印"},
{"己巳庚", "伤官"},
{"己午丁", "偏印"},
{"己午己", "比肩"},
{"己未乙", "七杀"},
{"己未己", "比肩"},
{"己未丁", "偏印"},
{"己申戊", "劫财"},
{"己申庚", "伤官"},
{"己申壬", "正财"},
{"己酉辛", "食神"},
{"己戌辛", "食神"},
{"己戌戊", "劫财"},
{"己戌丁", "偏印"},
{"己亥壬", "正财"},
{"己亥甲", "正官"},
{"庚子癸", "伤官"},
{"庚丑癸", "伤官"},
{"庚丑己", "正印"},
{"庚丑辛", "劫财"},
{"庚寅丙", "七杀"},
{"庚寅甲", "偏财"},
{"庚寅戊", "偏印"},
{"庚卯乙", "正财"},
{"庚辰乙", "正财"},
{"庚辰戊", "偏印"},
{"庚辰癸", "伤官"},
{"庚巳戊", "偏印"},
{"庚巳丙", "七杀"},
{"庚巳庚", "比肩"},
{"庚午丁", "正官"},
{"庚午己", "正印"},
{"庚未乙", "正财"},
{"庚未己", "正印"},
{"庚未丁", "正官"},
{"庚申戊", "偏印"},
{"庚申庚", "比肩"},
{"庚申壬", "食神"},
{"庚酉辛", "劫财"},
{"庚戌辛", "劫财"},
{"庚戌戊", "偏印"},
{"庚戌丁", "正官"},
{"庚亥壬", "食神"},
{"庚亥甲", "偏财"},
{"辛子癸", "食神"},
{"辛丑癸", "食神"},
{"辛丑己", "偏印"},
{"辛丑辛", "比肩"},
{"辛寅丙", "正官"},
{"辛寅甲", "正财"},
{"辛寅戊", "正印"},
{"辛卯乙", "偏财"},
{"辛辰乙", "偏财"},
{"辛辰戊", "正印"},
{"辛辰癸", "食神"},
{"辛巳戊", "正印"},
{"辛巳丙", "正官"},
{"辛巳庚", "劫财"},
{"辛午丁", "七杀"},
{"辛午己", "偏印"},
{"辛未乙", "偏财"},
{"辛未己", "偏印"},
{"辛未丁", "七杀"},
{"辛申戊", "正印"},
{"辛申庚", "劫财"},
{"辛申壬", "伤官"},
{"辛酉辛", "比肩"},
{"辛戌辛", "比肩"},
{"辛戌戊", "正印"},
{"辛戌丁", "七杀"},
{"辛亥壬", "伤官"},
{"辛亥甲", "正财"},
{"壬子癸", "劫财"},
{"壬丑癸", "劫财"},
{"壬丑己", "正官"},
{"壬丑辛", "正印"},
{"壬寅丙", "偏财"},
{"壬寅甲", "食神"},
{"壬寅戊", "七杀"},
{"壬卯乙", "伤官"},
{"壬辰乙", "伤官"},
{"壬辰戊", "七杀"},
{"壬辰癸", "劫财"},
{"壬巳戊", "七杀"},
{"壬巳丙", "偏财"},
{"壬巳庚", "偏印"},
{"壬午丁", "正财"},
{"壬午己", "正官"},
{"壬未乙", "伤官"},
{"壬未己", "正官"},
{"壬未丁", "正财"},
{"壬申戊", "七杀"},
{"壬申庚", "偏印"},
{"壬申壬", "比肩"},
{"壬酉辛", "正印"},
{"壬戌辛", "正印"},
{"壬戌戊", "七杀"},
{"壬戌丁", "正财"},
{"壬亥壬", "比肩"},
{"壬亥甲", "食神"},
{"癸子癸", "比肩"},
{"癸丑癸", "比肩"},
{"癸丑己", "七杀"},
{"癸丑辛", "偏印"},
{"癸寅丙", "正财"},
{"癸寅甲", "伤官"},
{"癸寅戊", "正官"},
{"癸卯乙", "食神"},
{"癸辰乙", "食神"},
{"癸辰戊", "正官"},
{"癸辰癸", "比肩"},
{"癸巳戊", "正官"},
{"癸巳丙", "正财"},
{"癸巳庚", "正印"},
{"癸午丁", "偏财"},
{"癸午己", "七杀"},
{"癸未乙", "食神"},
{"癸未己", "七杀"},
{"癸未丁", "偏财"},
{"癸申戊", "正官"},
{"癸申庚", "正印"},
{"癸申壬", "劫财"},
{"癸酉辛", "偏印"},
{"癸戌辛", "偏印"},
{"癸戌戊", "正官"},
{"癸戌丁", "偏财"},
{"癸亥壬", "劫财"},
{"癸亥甲", "伤官"}
{"甲癸","正印"},
{"甲己","正财"},
{"甲辛","正官"},
{"甲丙","食神"},
{"甲甲","比肩"},
{"甲戊","偏财"},
{"甲乙","劫财"},
{"甲庚","七杀"},
{"甲丁","伤官"},
{"甲壬","偏印"},
{"乙癸","偏印"},
{"乙己","偏财"},
{"乙辛","七杀"},
{"乙丙","伤官"},
{"乙甲","劫财"},
{"乙戊","正财"},
{"乙乙","比肩"},
{"乙庚","正官"},
{"乙丁","食神"},
{"乙壬","正印"},
{"丙癸","正官"},
{"丙己","伤官"},
{"丙辛","正财"},
{"丙丙","比肩"},
{"丙甲","偏印"},
{"丙戊","食神"},
{"丙乙","正印"},
{"丙庚","偏财"},
{"丙丁","劫财"},
{"丙壬","七杀"},
{"丁癸","七杀"},
{"丁己","食神"},
{"丁辛","偏财"},
{"丁丙","劫财"},
{"丁甲","正印"},
{"丁戊","伤官"},
{"丁乙","偏印"},
{"丁庚","正财"},
{"丁丁","比肩"},
{"丁壬","正官"},
{"戊癸","正财"},
{"戊己","劫财"},
{"戊辛","伤官"},
{"戊丙","偏印"},
{"戊甲","七杀"},
{"戊戊","比肩"},
{"戊乙","正官"},
{"戊庚","食神"},
{"戊丁","正印"},
{"戊壬","偏财"},
{"己癸","偏财"},
{"己己","比肩"},
{"己辛","食神"},
{"己丙","正印"},
{"己甲","正官"},
{"己戊","劫财"},
{"己乙","七杀"},
{"己庚","伤官"},
{"己丁","偏印"},
{"己壬","正财"},
{"庚癸","伤官"},
{"庚己","正印"},
{"庚辛","劫财"},
{"庚丙","七杀"},
{"庚甲","偏财"},
{"庚戊","偏印"},
{"庚乙","正财"},
{"庚庚","比肩"},
{"庚丁","正官"},
{"庚壬","食神"},
{"辛癸","食神"},
{"辛己","偏印"},
{"辛辛","比肩"},
{"辛丙","正官"},
{"辛甲","正财"},
{"辛戊","正印"},
{"辛乙","偏财"},
{"辛庚","劫财"},
{"辛丁","七杀"},
{"辛壬","伤官"},
{"壬癸","劫财"},
{"壬己","正官"},
{"壬辛","正印"},
{"壬丙","偏财"},
{"壬甲","食神"},
{"壬戊","七杀"},
{"壬乙","伤官"},
{"壬庚","偏印"},
{"壬丁","正财"},
{"壬壬","比肩"},
{"癸癸","比肩"},
{"癸己","七杀"},
{"癸辛","偏印"},
{"癸丙","正财"},
{"癸甲","伤官"},
{"癸戊","正官"},
{"癸乙","食神"},
{"癸庚","正印"},
{"癸丁","偏财"},
{"癸壬","劫财"}
};
/// <summary>