Skip to content

Commit 5d7376f

Browse files
committed
change:更正寿星天文历日干支未与时辰关联的问题(影响时间介于23点到凌晨0点的时间段)。
1 parent 44a71cb commit 5d7376f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

box_calendar/calendar_v2.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ bool CCalenderV2::set_datetime(const CDateTime& datetime)
3030
sz_.hg_ = gz.tg;
3131
sz_.hz_ = gz.dz;
3232

33+
if (dt_.time_.h_ == 23) {
34+
sz_.dg_ = CCalenderBase::remain(10, sz_.dg_ + 1);
35+
sz_.dz_ = CCalenderBase::remain(12, sz_.dz_ + 1);
36+
}
37+
3338
leap_ = day_->isLunarLeap();
3439
std::vector<sxtwl::JieQiInfo> jq_vec{};
3540
if (dt_.date_.mon_ == 1) {

csp_base.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef CSP_HEADER_H
22
#define CSP_HEADER_H
33

4-
#define CSP_VERSION "v1.3.3"
4+
#define CSP_VERSION "v1.3.4"
55

66
#include "box_calendar/calendar_base.h"
77

0 commit comments

Comments
 (0)