1
0
mirror of synced 2025-12-28 08:17:59 +08:00

v1.7.3 修复个别日太岁方位的错误;修复八字身宫计算错误的问题。

This commit is contained in:
6tail
2025-04-07 19:05:18 +08:00
parent 264481532b
commit 9a302e2a1a
7 changed files with 21 additions and 14 deletions

View File

@@ -527,15 +527,12 @@ 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;
while (offset > 12) {
offset -= 12;
}
int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + (offset % 12);
int offset = (monthZhiIndex + timeZhiIndex - 1) % 12;
int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + offset;
while (ganIndex > 10) {
ganIndex -= 10;
}
return LunarUtil.GAN[ganIndex] + MONTH_ZHI[offset];
return LunarUtil.GAN[ganIndex + 1] + MONTH_ZHI[offset + 1];
}
/**