Merge branch 'v1.1.0-SNAPSHOT'

src/main/java/com/nlf/calendar/Lunar.java

@@ -1307,10 +1307,20 @@ public class Lunar{
    */
   public String getDayTianShen(){
     String monthZhi = getMonthZhi();
-    int offset = LunarUtil.MONTH_ZHI_TIAN_SHEN_OFFSET.get(monthZhi);
+    int offset = LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(monthZhi);
     return LunarUtil.TIAN_SHEN[(dayZhiIndex+offset)%12+1];
   }
 
+  /**
+   * 获取值时天神
+   * @return 值时天神
+   */
+  public String getTimeTianShen(){
+    String dayZhi = getDayZhiExact();
+    int offset = LunarUtil.ZHI_TIAN_SHEN_OFFSET.get(dayZhi);
+    return LunarUtil.TIAN_SHEN[(timeZhiIndex+offset)%12+1];
+  }
+
   /**
    * 获取值日天神类型：黄道/黑道
    * @return 值日天神类型：黄道/黑道
@@ -1319,6 +1329,14 @@ public class Lunar{
     return LunarUtil.TIAN_SHEN_TYPE.get(getDayTianShen());
   }
 
+  /**
+   * 获取值时天神类型：黄道/黑道
+   * @return 值时天神类型：黄道/黑道
+   */
+  public String getTimeTianShenType(){
+    return LunarUtil.TIAN_SHEN_TYPE.get(getTimeTianShen());
+  }
+
   /**
    * 获取值日天神吉凶
    * @return 吉/凶
@@ -1327,6 +1345,14 @@ public class Lunar{
     return LunarUtil.TIAN_SHEN_TYPE_LUCK.get(getDayTianShenType());
   }
 
+  /**
+   * 获取值时天神吉凶
+   * @return 吉/凶
+   */
+  public String getTimeTianShenLuck(){
+    return LunarUtil.TIAN_SHEN_TYPE_LUCK.get(getTimeTianShenType());
+  }
+
   /**
    * 获取逐日胎神方位
    * @return 逐日胎神方位