lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2025-12-29 00:37:59 +08:00
Code Issues Projects Releases Wiki Activity

v1.7.4 修复身宫报错的问题。

Browse Source
This commit is contained in:
6tail
2025-04-29 14:59:08 +08:00
parent 9a302e2a1a
commit 664af99ae0
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nlf/calendar/EightChar.java
View File

@@ -527,12 +527,15 @@ public class EightChar {
public String getShenGong() {
int monthZhiIndex = LunarUtil.find(getMonthZhi(), MONTH_ZHI, 0);
int timeZhiIndex = LunarUtil.find(getTimeZhi(), LunarUtil.ZHI, 0);
int offset = (monthZhiIndex + timeZhiIndex - 1) % 12;
int offset = monthZhiIndex + timeZhiIndex;
if (offset > 12) {
offset -= 12;
}
int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + offset;
while (ganIndex > 10) {
ganIndex -= 10;
}
return LunarUtil.GAN[ganIndex + 1] + MONTH_ZHI[offset + 1];
return LunarUtil.GAN[ganIndex] + MONTH_ZHI[offset];
}
/**