@@ -155,26 +155,37 @@ function paiQiYi() {
155
155
}
156
156
function paiFeiPan () {
157
157
zhiFu .value = XING_F [xunShouGong - 1 ]
158
- zhiShi .value = MEN_F [xunShouGong - 1 ]
158
+ zhiShi .value = xunShouGong === 5 ? ' 死 ' : [ ... MEN_F . slice ( 0 , 4 ), ' ' , ... MEN_F . slice ( - 3 )] [xunShouGong - 1 ]
159
159
for (let i = 0 ; i < 9 ; i++ ) {
160
- const index = XING_F .indexOf (zhiFu .value )
161
- cfg .value [(shiGanGong + i - 1 ) % 9 + 1 ][5 ] = [... XING_F, ... XING_F][index + i]
160
+ cfg .value [(shiGanGong + i - 1 ) % 9 + 1 ][5 ] = [... XING_F, ... XING_F][XING_F .indexOf (zhiFu .value ) + i]
161
+ }
162
+ let mark = 0
163
+ for (let i = 0 ; i < 8 ; i++ ) {
164
+ if ((shiZhiGong + i) % 9 === 5 ) mark = 1
165
+ cfg .value [(shiZhiGong + i + mark - 1 ) % 9 + 1 ][8 ] = [... MEN_F, ... MEN_F][MEN_F .indexOf (zhiShi .value ) + i]
162
166
}
163
- // for (let i = 0; i < 8; i++) {
164
- // const tmp = (shiZhiGong + i - 1) % 9 + 1
165
- // if (tmp === 5) continue
166
- // const index = MEN_F.indexOf(zhiShi.value)
167
- // cfg.value[tmp][8] = [...MEN_F, ...MEN_F][index + i]
168
- // }
169
167
for (let i = 0 ; i < 9 ; i++ ) {
170
168
const shenList = juShu .value > 0 ? SHEN_F : [SHEN_F [0 ], ... SHEN_F .slice ().reverse ()]
171
169
cfg .value [(shiGanGong + i - 1 ) % 9 + 1 ][2 ] = shenList[i]
172
170
}
173
171
}
174
172
function paiZhuanPan () {
175
- const transer = [1 , 8 , 3 , 4 , 9 , 2 , 7 , 6 ]
173
+ const transer = [1 ,8 , 3 , 4 , 9 , 2 , 7 , 6 , 1 , 8 , 3 , 4 , 9 , 2 , 7 , 6 ]
176
174
zhiFu .value = xunShouGong === 5 ? ' 禽' : XING_Z [transer .indexOf (xunShouGong)]
177
- zhiShi .value = xunShouGong === 5 ? ' 中' : MEN_Z [transer .indexOf (xunShouGong)]
175
+ zhiShi .value = xunShouGong === 5 ? ' 死' : MEN_Z [transer .indexOf (xunShouGong)]
176
+ for (let i = 0 ; i < 8 ; i++ ) {
177
+ const j = transer[transer .indexOf (shiGanGong) + i]
178
+ cfg .value [j][5 ] = [... XING_Z, ... XING_Z][XING_Z .indexOf (zhiFu .value === ' 禽' ? ' 芮' : zhiFu .value ) + i]
179
+ }
180
+ for (let i = 0 ; i < 8 ; i++ ) {
181
+ const j = transer[transer .indexOf (shiZhiGong) + i]
182
+ cfg .value [j][8 ] = [... MEN_Z, ... MEN_Z][MEN_Z .indexOf (zhiShi .value ) + i]
183
+ }
184
+ for (let i = 0 ; i < 8 ; i++ ) {
185
+ const j = transer[transer .indexOf (shiGanGong) + i]
186
+ const shenList = juShu .value > 0 ? SHEN_Z : [SHEN_Z [0 ], ... SHEN_Z .slice ().reverse ()]
187
+ cfg .value [j][2 ] = shenList[i]
188
+ }
178
189
}
179
190
function paiPan (type ) {
180
191
if (! shiGan .value || ! shiZhi .value || ! juShu .value ) return
0 commit comments