Merge branch 'master' into master

data/events.csv

@@ -86,7 +86,7 @@ $id,event,postEvent,effect:CHR,effect:INT,effect:STR,effect:MNY,effect:SPR,effec
 10061,一个人在家，非常寂寞。,,,,,,-1,,,EVT?[10024],EVT?[10025],,SPR<2:10062
 10062,你的情绪越来越低落，尝试自杀。,没有成功。,,,,,,,1,,,,SPR<1:10000
 10063,你的爷爷奶奶只想要男孩，把你活埋了。,,,,,,,,,(CHR<3)&(MNY<3)&(EVT?[10009]),"(EVT?[10063,10001])|(TLT?[1015])",,MNY<3:10000
-10064,你被卖给了人贩子。人贩子运送路上你很虚弱。,,,,,,,,,(STR<3)&((MNY<3)&(EVT?[10009]),"(EVT?[10064,10001,10019])|(TLT?[1015])",,STR<3:10000
+10064,你被卖给了人贩子。人贩子运送路上你很虚弱。,,,,,,,,,(STR<3)&(MNY<3)&(EVT?[10009]),"(EVT?[10064,10001,10019])|(TLT?[1015])",,STR<3:10000
 10065,空气很新鲜，生活很健康。,,,,1,,,,,EVT?[10009],"EVT?[10065,10025]",,
 10066,你的生活很自由，没有什么束缚。,,,,,,1,,,EVT?[10009],EVT?[10066],,
 10067,有一只鸟撞在了你家窗户上。,你把它养好后放了。,,,,,,,,EVT?[10009],EVT?[10067],,INT<6:10068

data/events.json

@@ -613,7 +613,7 @@
     "10064": {
         "id": 10064,
         "event": "你被卖给了人贩子。人贩子运送路上你很虚弱。",
-        "include": "(STR<3)&((MNY<3)&(EVT?[10009])",
+        "include": "(STR<3)&(MNY<3)&(EVT?[10009])",
         "exclude": "(EVT?[10064,10001,10019])|(TLT?[1015])",
         "branch": [
             "STR<3:10000"

src/app.js

@@ -84,7 +84,7 @@ class App{
         } else{
             indexPage.find('#themeToggleBtn').text('白')
         }
-        
+
         indexPage
             .find("#themeToggleBtn")
             .click(() => {
@@ -110,7 +110,8 @@ class App{
                 <ul class="g1"></ul>
                 <ul class="g2"></ul>
             </div>
-            <button id="sponsor" class="mainBtn" onclick="window.open('https://afdian.net/@LifeRestart')">打赏作者</button>
+            <button class="sponsor" onclick="window.open('https://afdian.net/@LifeRestart')" style="background: linear-gradient(90deg,#946ce6,#7e5fd9); left:auto; right:50%; transform: translate(-2rem,-50%);">打赏策划(爱发电)</button>
+            <button class="sponsor" onclick="window.open('https://dun.mianbaoduo.com/@vickscarlet')" style="background-color:#c69; left:50%; right:auto; transform: translate(2rem,-50%);">打赏程序(顿顿饭)</button>
         </div>
         `);
 

view/dark.css

@@ -134,6 +134,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
+.sponsor,
 #specialthanks,
 #rank {
   position: fixed;
@@ -156,11 +157,11 @@ body {
   top: 1rem;
 }
 
-#sponsor {
+.sponsor {
-  position: fixed;
+  top: auto;
   bottom: 0;
-  left: 0;
+  width: auto;
-  right: 0;
+  padding: 0.5rem;
 }
 
 #spthx {

view/light.css

@@ -133,6 +133,7 @@ body {
   -moz-osx-font-smoothing: grayscale;
 }
 
+.sponsor,
 #specialthanks,
 #rank {
   position: fixed;
@@ -155,11 +156,11 @@ body {
   top: 1rem;
 }
 
-#sponsor {
+.sponsor {
-  position: fixed;
+  top: auto;
   bottom: 0;
-  left: 0;
+  width: auto;
-  right: 0;
+  padding: 0.5rem;
 }
 
 #spthx {