diff --git a/fortune_generator/fortune.js b/fortune_generator/fortune.js index 230fc2d..fb3ecb6 100644 --- a/fortune_generator/fortune.js +++ b/fortune_generator/fortune.js @@ -33,7 +33,8 @@ function Appear() { } let d = new Date(); - let seed = (num[0] >> 3) * (num[1] >> 2) + (num[2] << 1) * (num[3] >> 3) + (d.getDate() << 3) * ((d.getMonth() + 1) << 5) + d.getFullYear(); + let date = d.getDate(); + let seed = (num[0] >> 3) * (num[1] >> 2) + (num[2] << 1) * (num[3] >> 3) + (date << 3) * ((d.getMonth() + 1) << 5) + d.getFullYear(); const goodLen = goodFortunes.length; const badLen = badFortunes.length; @@ -45,22 +46,22 @@ function Appear() { let set = new Set(); l1 = seed % goodLen; set.add(goodFortunes[l1].event); - l2 = ((seed << 1) + d.getDate()) % goodLen; + l2 = ((seed << 1) + date) % goodLen; while(set.has(goodFortunes[l2].event)) l2 = (l2 + 1) % goodLen; set.add(goodFortunes[l2].event); r1 = ((seed >> 1) + (d.getMonth() << 3)) % badLen; while(set.has(badFortunes[r1].event)) r1 = (r1 + 2) % badLen; set.add(badFortunes[r1].event); - r2 = ((seed << 3 ) + (d.getFullYear() >> 5) * (d.getDate << 2)) % badLen; + r2 = ((seed << 3 ) + (d.getFullYear() >> 5) * (date << 2)) % badLen; while(set.has(badFortunes[r2].event)) r2 = (r2 + 1) % badLen; - l_1_event = `宜: ${goodFortunes[l1].event}`; - l_1_desc = `${goodFortunes[l1].description}`; - l_2_event = `宜: ${goodFortunes[l2].event}`; - l_2_desc = `${goodFortunes[l2].description}`; - r_1_event = `忌: ${badFortunes[r1].event}`; - r_1_desc = `${badFortunes[r1].description}`; - r_2_event = `忌: ${badFortunes[r2].event}`; - r_2_desc = `${badFortunes[r2].description}`; + l_1_event = `宜: ${goodFortunes[l1].event}`; + l_1_desc = `${goodFortunes[l1].description}`; + l_2_event = `宜: ${goodFortunes[l2].event}`; + l_2_desc = `${goodFortunes[l2].description}`; + r_1_event = `忌: ${badFortunes[r1].event}`; + r_1_desc = `${badFortunes[r1].description}`; + r_2_event = `忌: ${badFortunes[r2].event}`; + r_2_desc = `${badFortunes[r2].description}`; if(seed % 7 == 0){ $('#r-1-event').html(allGood); $('#l-1-event').html(l_1_event);