From 48df3a8652254a0602887f2575a9e19943143e38 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 25 Nov 2023 18:09:40 +0800 Subject: [PATCH] feat: increase the convenience of adding new special events When an event in special.json is empty, a general event will be used instead --- fortune_generator/fortune.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fortune_generator/fortune.js b/fortune_generator/fortune.js index 40af50a..84b72b7 100644 --- a/fortune_generator/fortune.js +++ b/fortune_generator/fortune.js @@ -206,11 +206,19 @@ function Appear() { if(status_index == 0){ $('#r-1-event').html(allGood); } - else{ + else{ $('#r-1-event').html(bad_span(Data.badFortunes.r_1_event)); $('#r-1-desc').html(desc_span(Data.badFortunes.r_1_desc)); $('#r-2-event').html(bad_span(Data.badFortunes.r_2_event)); $('#r-2-desc').html(desc_span(Data.badFortunes.r_2_desc)); + if(Data.badFortunes.r_1_event.length == 0){ + $('#r-1-event').html(bad_span(r_1_event)); + $('#r-1-desc').html(desc_span(r_1_desc)); + } + if(Data.badFortunes.r_2_event.length == 0){ + $('#r-2-event').html(bad_span(r_2_event)); + $('#r-2-desc').html(desc_span(r_2_desc)); + } } if(status_index == statusLen - 1){ $('#l-1-event').html(allBad); @@ -220,6 +228,14 @@ function Appear() { $('#l-1-desc').html(desc_span(Data.goodFortunes.l_1_desc)); $('#l-2-event').html(good_span(Data.goodFortunes.l_2_event)); $('#l-2-desc').html(desc_span(Data.goodFortunes.l_2_desc)); + if(Data.goodFortunes.l_1_event.length == 0){ + $('#l-1-event').html(l_1_event); + $('#l-1-desc').html(l_1_desc); + } + if(Data.goodFortunes.l_2_event.length == 0){ + $('#l-2-event').html(l_2_event); + $('#l-2-desc').html(l_2_desc); + } } } else{