修正星宿计算错误；增加阴历星期的获取。
This commit is contained in:
6tail
@@ -26,7 +26,7 @@ lunar是一个无依赖的支持阳历和阴历的日历工具库。
|
||||
输出结果：
|
||||
|
||||
1986-05-29 星期四 双子座
|
||||
壹玖捌陆年肆月廿一 丙寅(虎)年 癸巳(蛇)月 癸酉(鸡)日 纳音[炉中火 长流水 剑锋金] 北方玄武 危月燕 彭祖百忌[癸不词讼理弱敌强 酉不会客醉坐颠狂] 喜神方位[巽](东南) 阳贵神方位[巽](东南) 阴贵神方位[震](正东) 福神方位[兑](正西) 财神方位[离](正南) 冲[(丁卯)兔] 刹[东]
|
||||
壹玖捌陆年肆月廿一 丙寅(虎)年 癸巳(蛇)月 癸酉(鸡)日 纳音[炉中火 长流水 剑锋金] 星期四 北方玄武 斗木獬 彭祖百忌[癸不词讼理弱敌强 酉不会客醉坐颠狂] 喜神方位[巽](东南) 阳贵神方位[巽](东南) 阴贵神方位[震](正东) 福神方位[兑](正西) 财神方位[离](正南) 冲[(丁卯)兔] 煞[东]
|
||||
|
||||
## 文档
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
|
||||
Output:
|
||||
|
||||
1986-05-29 星期四 双子座
|
||||
壹玖捌陆年肆月廿一 丙寅(虎)年 癸巳(蛇)月 癸酉(鸡)日 纳音[炉中火 长流水 剑锋金] 北方玄武 危月燕 彭祖百忌[癸不词讼理弱敌强 酉不会客醉坐颠狂] 喜神方位[巽](东南) 阳贵神方位[巽](东南) 阴贵神方位[震](正东) 福神方位[兑](正西) 财神方位[离](正南) 冲[(丁卯)兔] 刹[东]
|
||||
壹玖捌陆年肆月廿一 丙寅(虎)年 癸巳(蛇)月 癸酉(鸡)日 纳音[炉中火 长流水 剑锋金] 星期四 北方玄武 斗木獬 彭祖百忌[癸不词讼理弱敌强 酉不会客醉坐颠狂] 喜神方位[巽](东南) 阳贵神方位[巽](东南) 阴贵神方位[震](正东) 福神方位[兑](正西) 财神方位[离](正南) 冲[(丁卯)兔] 煞[东]
|
||||
|
||||
## Documentation
|
||||
|
||||
|
||||
42
lunar.js
42
lunar.js
@@ -377,8 +377,14 @@
|
||||
if(solarDay===term) s = LunarUtil.QI[solarMonth-1];
|
||||
return s;
|
||||
},
|
||||
getWeek:function(){
|
||||
return (this._p.dayOffset+LunarUtil.BASE_WEEK_INDEX)%7;
|
||||
},
|
||||
getWeekInChinese:function(){
|
||||
return SolarUtil.WEEK[this.getWeek()];
|
||||
},
|
||||
getXiu:function(){
|
||||
return LunarUtil.XIU[this._p.day-1][Math.abs(this._p.month)-1];
|
||||
return LunarUtil.XIU[this.getDayZhi()+this.getWeek()];
|
||||
},
|
||||
getZheng:function(){
|
||||
return LunarUtil.ZHENG[this.getXiu()];
|
||||
@@ -886,6 +892,7 @@
|
||||
BASE_INDEX:0,
|
||||
BASE_DAY_GANZHI_INDEX:15,
|
||||
BASE_MONTH_ZHI_INDEX:2,
|
||||
BASE_WEEK_INDEX:2,
|
||||
GAN:['','甲','乙','丙','丁','戊','己','庚','辛','壬','癸'],
|
||||
POSITION_XI:['','艮','乾','坤','离','巽','艮','乾','坤','离','巽'],
|
||||
POSITION_YANG_GUI:['','坤','坤','兑','乾','艮','坎','离','艮','震','巽'],
|
||||
@@ -908,38 +915,7 @@
|
||||
QI:['大寒','雨水','春分','谷雨','夏满','夏至','大暑','处暑','秋分','霜降','小雪','冬至'],
|
||||
QI_YEAR:[[13,45,81,113,149,185,201],[21,57,93,125,161,193,201],[21,56,88,120,152,188,200,201],[21,49,81,116,144,176,200,201],[17,49,77,112,140,168,200,201],[28,60,88,116,148,180,200,201],[25,53,84,112,144,172,200,201],[29,57,89,120,148,180,200,201],[17,45,73,108,140,168,200,201],[28,60,92,124,160,192,200,201],[16,44,80,112,148,180,200,201],[17,53,88,120,156,188,200,201]],
|
||||
QI_MAP:[[21,21,21,21,21,20,21,21,21,20,20,21,21,20,20,20,20,20,20,20,20,19,20,20,20,19,19,20],[20,19,19,20,20,19,19,19,19,19,19,19,19,18,19,19,19,18,18,19,19,18,18,18,18,18,18,18],[21,21,21,22,21,21,21,21,20,21,21,21,20,20,21,21,20,20,20,21,20,20,20,20,19,20,20,20,20],[20,21,21,21,20,20,21,21,20,20,20,21,20,20,20,20,19,20,20,20,19,19,20,20,19,19,19,20,20],[21,22,22,22,21,21,22,22,21,21,21,22,21,21,21,21,20,21,21,21,20,20,21,21,20,20,20,21,21],[22,22,22,22,21,22,22,22,21,21,22,22,21,21,21,22,21,21,21,21,20,21,21,21,20,20,21,21,21],[23,23,24,24,23,23,23,24,23,23,23,23,22,23,23,23,22,22,23,23,22,22,22,23,22,22,22,22,23],[23,24,24,24,23,23,24,24,23,23,23,24,23,23,23,23,22,23,23,23,22,22,23,23,22,22,22,23,23],[23,24,24,24,23,23,24,24,23,23,23,24,23,23,23,23,22,23,23,23,22,22,23,23,22,22,22,23,23],[24,24,24,24,23,24,24,24,23,23,24,24,23,23,23,24,23,23,23,23,22,23,23,23,22,22,23,23,23],[23,23,23,23,22,23,23,23,22,22,23,23,22,22,22,23,22,22,22,22,21,22,22,22,21,21,22,22,22],[22,22,23,23,22,22,22,23,22,22,22,22,21,22,22,22,21,21,22,22,21,21,21,22,21,21,21,21,22]],
|
||||
XIU:[
|
||||
['室','奎','胃','毕','参','鬼','张','角','氐','心','斗','虚'],
|
||||
['壁','娄','昴','觜','井','柳','翼','亢','房','尾','女','危'],
|
||||
['奎','胃','毕','参','鬼','星','轸','氐','心','箕','虚','室'],
|
||||
['娄','昴','觜','井','柳','张','角','房','尾','斗','危','壁'],
|
||||
['胃','毕','参','鬼','星','翼','亢','心','箕','女','室','奎'],
|
||||
['昴','觜','井','柳','张','轸','氐','尾','斗','虚','壁','娄'],
|
||||
['毕','参','鬼','星','翼','角','房','箕','女','危','奎','胃'],
|
||||
['觜','井','柳','张','轸','亢','心','斗','虚','室','娄','昴'],
|
||||
['参','鬼','星','翼','角','氐','尾','女','危','壁','胃','毕'],
|
||||
['井','柳','张','轸','亢','房','箕','虚','室','奎','昴','觜'],
|
||||
['鬼','星','翼','角','氐','心','斗','危','壁','娄','毕','参'],
|
||||
['柳','张','轸','亢','房','尾','女','室','奎','胃','觜','井'],
|
||||
['星','翼','角','氐','心','箕','虚','壁','娄','昴','参','鬼'],
|
||||
['张','轸','亢','房','尾','斗','危','奎','胃','毕','井','柳'],
|
||||
['翼','角','氐','心','箕','女','室','娄','昴','觜','鬼','星'],
|
||||
['轸','亢','房','尾','斗','虚','壁','胃','毕','参','柳','张'],
|
||||
['角','氐','心','箕','女','危','奎','昴','觜','井','星','翼'],
|
||||
['亢','房','尾','斗','虚','室','娄','毕','参','鬼','张','轸'],
|
||||
['氐','心','箕','女','危','壁','胃','觜','井','柳','翼','角'],
|
||||
['房','尾','斗','虚','室','奎','昴','参','鬼','星','轸','亢'],
|
||||
['心','箕','女','危','壁','娄','毕','井','柳','张','角','氐'],
|
||||
['尾','斗','虚','室','奎','胃','觜','鬼','星','翼','亢','房'],
|
||||
['箕','女','危','壁','娄','昴','参','柳','张','轸','氐','心'],
|
||||
['斗','虚','室','奎','胃','毕','井','星','翼','角','房','尾'],
|
||||
['女','危','壁','娄','昴','觜','鬼','张','轸','亢','心','箕'],
|
||||
['虚','室','奎','胃','毕','参','柳','翼','角','氐','尾','斗'],
|
||||
['危','壁','娄','昴','觜','井','星','轸','亢','房','箕','女'],
|
||||
['室','奎','胃','毕','参','鬼','张','角','氐','心','斗','虚'],
|
||||
['壁','娄','昴','觜','井','柳','翼','亢','房','尾','女','危'],
|
||||
['胃','鬼','氐','心','虚','星','轸','氐','心','箕','虚','室']
|
||||
],
|
||||
XIU:{'申1':'毕','申2':'翌','申3':'箕','申4':'奎','申5':'鬼','申6':'氐','申0':'虚','子1':'毕','子2':'翌','子3':'箕','子4':'奎','子5':'鬼','子6':'氐','子0':'虚','辰1':'毕','辰2':'翌','辰3':'箕','辰4':'奎','辰5':'鬼','辰6':'氐','辰0':'虚','巳1':'危','巳2':'觜','巳3':'轸','巳4':'斗','巳5':'娄','巳6':'柳','巳0':'房','酉1':'危','酉2':'觜','酉3':'轸','酉4':'斗','酉5':'娄','酉6':'柳','酉0':'房','丑1':'危','丑2':'觜','丑3':'轸','丑4':'斗','丑5':'娄','丑6':'柳','丑0':'房','寅1':'心','寅2':'室','寅3':'参','寅4':'角','寅5':'牛','寅6':'胃','寅0':'星','午1':'心','午2':'室','午3':'参','午4':'角','午5':'牛','午6':'胃','午0':'星','戌1':'心','戌2':'室','戌3':'参','戌4':'角','戌5':'牛','戌6':'胃','戌0':'星','亥1':'张','亥2':'尾','亥3':'壁','亥4':'井','亥5':'亢','亥6':'女','亥0':'昴','卯1':'张','卯2':'尾','卯3':'壁','卯4':'井','卯5':'亢','卯6':'女','卯0':'昴','未1':'张','未2':'尾','未3':'壁','未4':'井','未5':'亢','未6':'女','未0':'昴'},
|
||||
ZHENG:{'角':'木','井':'木','奎':'木','斗':'木','亢':'金','鬼':'金','娄':'金','牛':'金','氐':'土','柳':'土','胃':'土','女':'土','房':'日','星':'日','昴':'日','虚':'日','心':'月','张':'月','毕':'月','危':'月','尾':'火','翼':'火','觜':'火','室':'火','箕':'水','轸':'水','参':'水','壁':'水' },
|
||||
ANIMAL:{'角':'蛟','斗':'獬','奎':'狼','井':'犴','亢':'龙','牛':'牛','娄':'狗','鬼':'羊','女':'蝠','氐':'貉','胃':'彘','柳':'獐','房':'兔','虚':'鼠','昴':'鸡','星':'马','心':'狐','危':'燕','毕':'乌','张':'鹿','尾':'虎','室':'猪','觜':'猴','翼':'蛇','箕':'豹','壁':'獝','参':'猿','轸':'蚓' },
|
||||
GONG:{'角':'东','井':'南','奎':'西','斗':'北','亢':'东','鬼':'南','娄':'西','牛':'北','氐':'南','柳':'南','胃':'西','女':'北','房':'东','星':'南','昴':'西','虚':'北','心':'东','张':'南','毕':'西','危':'北','尾':'东','翼':'南','觜':'西','室':'北','箕':'东','轸':'南','参':'西','壁':'北' },
|
||||
|
||||
Reference in New Issue
Block a user