From 8b374be752f136f3df150d4b1440a66e254c5bad Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Tue, 29 Apr 2025 15:39:49 +0800 Subject: [PATCH] =?UTF-8?q?v1.7.3=20=E4=BF=AE=E5=A4=8D=E8=BA=AB=E5=AE=AB?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +++ lunar.js | 7 +++++-- package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce3dbd6..f206a72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,3 +26,6 @@ ## [1.7.2] - 2025-04-07 1. 修复八字身宫计算错误的问题。 + +## [1.7.3] - 2025-04-29 +1. 修复身宫报错的问题。 diff --git a/lunar.js b/lunar.js index 84139a9..d4e7f04 100644 --- a/lunar.js +++ b/lunar.js @@ -5727,12 +5727,15 @@ getShenGong:function(){ var monthZhiIndex = LunarUtil.index(this.getMonthZhi(), LunarUtil.MONTH_ZHI, 0); var timeZhiIndex = LunarUtil.index(this.getTimeZhi(), LunarUtil.ZHI, 0); - var offset = (monthZhiIndex + timeZhiIndex - 1) % 12; + var offset = monthZhiIndex + timeZhiIndex; + if (offset > 12) { + offset -= 12; + } var ganIndex = (this._p.lunar.getYearGanIndexExact() + 1) * 2 + offset; while (ganIndex > 10) { ganIndex -= 10; } - return LunarUtil.GAN[ganIndex + 1] + LunarUtil.MONTH_ZHI[offset + 1]; + return LunarUtil.GAN[ganIndex] + LunarUtil.MONTH_ZHI[offset]; }, getShenGongNaYin:function(){return LunarUtil.NAYIN[this.getShenGong()];}, getLunar:function(){return this._p.lunar;}, diff --git a/package.json b/package.json index e56ad08..15e2dd2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lunar-javascript", - "version": "1.7.2", + "version": "1.7.3", "description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.", "main": "index.js", "scripts": {