From c9edcbc69743e3230f2c7b8a2065c36646f34efe Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Sun, 25 Oct 2020 13:16:39 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.27=20=E4=BF=AE=E5=A4=8D=E5=85=AB=E5=AD=97?= =?UTF-8?q?=E6=8E=92=E7=9B=98=E6=B5=81=E5=B9=B4=E5=B9=B2=E6=94=AF=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lunar.js | 7 ++++--- package.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lunar.js b/lunar.js index f9c185d..d9207fe 100644 --- a/lunar.js +++ b/lunar.js @@ -2855,17 +2855,18 @@ }; }; var buildDaYun = function(yun, index){ + var birthYear = yun.getLunar().getSolar().getYear(); var year = yun.getStartSolar().getYear(); var startYear,startAge,endYear,endAge; if (index < 1) { - startYear = lunar.getSolar().getYear(); + startYear = birthYear; startAge = 1; endYear = year - 1; - endAge = yun.getStartYear(); + endAge = year - birthYear; } else { var add = (index - 1) * 10; startYear = year + add; - startAge = yun.getStartYear() + add + 1; + startAge = startYear - birthYear + 1; endYear = startYear + 9; endAge = startAge + 9; } diff --git a/package.json b/package.json index a00bc88..1ddde5d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lunar-javascript", - "version": "1.0.26", + "version": "1.0.27", "description": "lunar is a calendar library for Solar and Chinese Lunar.", "main": "index.js", "scripts": {