diff --git a/fortune_generator/fortune.js b/fortune_generator/fortune.js index dd2353e..230fc2d 100644 --- a/fortune_generator/fortune.js +++ b/fortune_generator/fortune.js @@ -21,6 +21,7 @@ const allGood = `萬事皆宜諸事不宜`; function Appear() { + $('#btn').html('打卡成功'); let p = 0; let num = [0, 0, 0, 0]; for(let i = 0; i < 14; i++) { @@ -36,7 +37,7 @@ function Appear() { const goodLen = goodFortunes.length; const badLen = badFortunes.length; - let status = `§ ${fortuneStatus[seed % 7]} §`; + let status = `§ ${fortuneStatus[seed % 7]} §`; $('#ip-to-fortune').html(status); let l_1_event, l_1_desc, l_2_event, l_2_desc, r_1_event, r_1_desc, r_2_event, r_2_desc; @@ -44,22 +45,22 @@ function Appear() { let set = new Set(); l1 = seed % goodLen; set.add(goodFortunes[l1].event); - l2 = (seed + d.getDate()) % goodLen; + l2 = ((seed << 1) + d.getDate()) % goodLen; while(set.has(goodFortunes[l2].event)) l2 = (l2 + 1) % goodLen; set.add(goodFortunes[l2].event); - r1 = (seed + d.getMonth() << 3) % badLen; + r1 = ((seed >> 1) + (d.getMonth() << 3)) % badLen; while(set.has(badFortunes[r1].event)) r1 = (r1 + 2) % badLen; set.add(badFortunes[r1].event); - r2 = (seed + (d.getFullYear() >> 5) * (d.getDate << 2)) % badLen; + r2 = ((seed << 3 ) + (d.getFullYear() >> 5) * (d.getDate << 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);