update data

This commit is contained in:
Vick Scarlet
2021-09-09 17:21:32 +08:00
parent 44e05a166e
commit 85ea1c9149
9 changed files with 260 additions and 92 deletions

View File

@@ -234,7 +234,8 @@
"11346*0.1", "11346*0.1",
"11347*0.01", "11347*0.01",
"11348*0.01", "11348*0.01",
"11349" "11349",
"11500*0.1"
] ]
}, },
"5": { "5": {
@@ -356,7 +357,8 @@
"11347*0.01", "11347*0.01",
"11348*0.01", "11348*0.01",
"11349", "11349",
"10008*0.1" "10008*0.1",
"11500*0.1"
] ]
}, },
"6": { "6": {
@@ -633,7 +635,8 @@
"11347*0.01", "11347*0.01",
"11348*0.01", "11348*0.01",
"11349", "11349",
"10008*0.1" "10008*0.1",
"11500*0.1"
] ]
}, },
"8": { "8": {
@@ -821,7 +824,8 @@
"11347*0.01", "11347*0.01",
"11348*0.01", "11348*0.01",
"11349", "11349",
"10008*0.1" "10008*0.1",
"11500*0.1"
] ]
}, },
"9": { "9": {
@@ -1940,7 +1944,7 @@
10161, 10161,
"10162*0.1", "10162*0.1",
10085, 10085,
10086, "10086*5",
10163, 10163,
10164, 10164,
10165, 10165,
@@ -2169,7 +2173,7 @@
10161, 10161,
"10162*0.1", "10162*0.1",
10085, 10085,
10086, "10086*5",
10163, 10163,
10164, 10164,
10165, 10165,
@@ -2408,7 +2412,7 @@
10089, 10089,
10091, 10091,
10085, 10085,
10086, "10086*5",
10163, 10163,
10164, 10164,
10165, 10165,
@@ -2654,7 +2658,7 @@
10081, 10081,
10083, 10083,
"10090*0.5", "10090*0.5",
10086, "10086*5",
10163, 10163,
10164, 10164,
10165, 10165,
@@ -2759,7 +2763,7 @@
10081, 10081,
10083, 10083,
10085, 10085,
10086, "10086*5",
10189, 10189,
10190, 10190,
"10191*99999", "10191*99999",
@@ -2923,7 +2927,7 @@
10081, 10081,
10083, 10083,
"10085*3", "10085*3",
10086, "10086*5",
"10090*0.5", "10090*0.5",
10189, 10189,
10191, 10191,
@@ -3090,7 +3094,7 @@
10081, 10081,
10083, 10083,
"10085*5", "10085*5",
10086, "10086*5",
10189, 10189,
"10192*99999", "10192*99999",
"10195*1000", "10195*1000",
@@ -3256,7 +3260,7 @@
10081, 10081,
10083, 10083,
"10085*10", "10085*10",
10086, "10086*5",
10189, 10189,
"10195*1000", "10195*1000",
"10196*2000", "10196*2000",
@@ -3387,7 +3391,7 @@
10081, 10081,
10083, 10083,
"10085*50", "10085*50",
10086, "10086*5",
10189, 10189,
"10197*99999", "10197*99999",
"10206*99999", "10206*99999",
@@ -3521,7 +3525,8 @@
"11467*33333333333333333", "11467*33333333333333333",
"11458*99999999999999999", "11458*99999999999999999",
"11459*99999999999999999", "11459*99999999999999999",
"30001" "30001",
"11501*0.05"
] ]
}, },
"24": { "24": {
@@ -3533,7 +3538,7 @@
"10071*0.03", "10071*0.03",
10083, 10083,
"10085*500", "10085*500",
10086, "10086*5",
10087, 10087,
10189, 10189,
"10207*99999", "10207*99999",
@@ -3699,7 +3704,8 @@
"11467*33333333333333333", "11467*33333333333333333",
"11458*99999999999999999", "11458*99999999999999999",
"11459*99999999999999999", "11459*99999999999999999",
"11468*0.1" "11468*0.1",
"11501*0.05"
] ]
}, },
"25": { "25": {
@@ -3711,7 +3717,7 @@
"10071*0.03", "10071*0.03",
10083, 10083,
"10085*9999", "10085*9999",
10086, "10086*5",
10087, 10087,
10088, 10088,
10189, 10189,
@@ -3919,7 +3925,7 @@
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
"10085*9999", "10085*9999",
10086, "10086*5",
10087, 10087,
"10088*10", "10088*10",
10189, 10189,
@@ -4167,7 +4173,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
10086, "10086*5",
10087, 10087,
"10088*10", "10088*10",
10189, 10189,
@@ -4416,7 +4422,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
10086, "10086*5",
10087, 10087,
10088, 10088,
10189, 10189,
@@ -4683,7 +4689,7 @@
"11458*99999999999999999", "11458*99999999999999999",
"11459*99999999999999999", "11459*99999999999999999",
"30001*0.1", "30001*0.1",
"20567*0.02" "20567*0.01"
] ]
}, },
"29": { "29": {
@@ -4693,7 +4699,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
10086, "10086*5",
10087, 10087,
10189, 10189,
"10253*0.1", "10253*0.1",
@@ -4960,7 +4966,7 @@
"11458*99999999999999999", "11458*99999999999999999",
"11459*99999999999999999", "11459*99999999999999999",
"30001*0.1", "30001*0.1",
"20567*0.02" "20567*0.01"
] ]
}, },
"30": { "30": {
@@ -4969,7 +4975,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
10086, "10086*5",
10087, 10087,
10189, 10189,
10268, 10268,
@@ -5254,7 +5260,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
"10086*2", "10086*5",
10087, 10087,
10256, 10256,
10268, 10268,
@@ -5503,7 +5509,7 @@
"11459*99999999999999999", "11459*99999999999999999",
"30001*0.1", "30001*0.1",
"11468*0.1", "11468*0.1",
"20567*0.02" "20567*0.01"
] ]
}, },
"32": { "32": {
@@ -5512,7 +5518,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
"10086*3", "10086*5",
10087, 10087,
10254, 10254,
10272, 10272,
@@ -5760,7 +5766,7 @@
"11458*99999999999999999", "11458*99999999999999999",
"11459*99999999999999999", "11459*99999999999999999",
"30001*0.1", "30001*0.1",
"20567*0.02" "20567*0.01"
] ]
}, },
"33": { "33": {
@@ -5769,7 +5775,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
"10086*4", "10086*5",
10087, 10087,
10268, 10268,
10269, 10269,
@@ -6002,7 +6008,8 @@
"11458*99999999999999999", "11458*99999999999999999",
"11459*99999999999999999", "11459*99999999999999999",
"30001*0.1", "30001*0.1",
"11468*0.1" "11468*0.1",
"11501*0.05"
] ]
}, },
"34": { "34": {
@@ -6283,7 +6290,7 @@
"10069*0.03", "10069*0.03",
"10070*0.03", "10070*0.03",
"10071*0.03", "10071*0.03",
"10086*6", "10086*5",
10087, 10087,
10268, 10268,
10269, 10269,
@@ -8526,7 +8533,7 @@
"11448*0.05", "11448*0.05",
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"20567*0.02", "20567*0.01",
"11470*0.1", "11470*0.1",
"11471*0.1", "11471*0.1",
"11472*0.1", "11472*0.1",
@@ -9283,7 +9290,8 @@
"11410", "11410",
"11411", "11411",
"11412", "11412",
"11413" "11413",
"11501*0.05"
] ]
}, },
"46": { "46": {
@@ -9498,7 +9506,7 @@
"11449*0.01", "11449*0.01",
"11450*0.01", "11450*0.01",
"11468*0.1", "11468*0.1",
"20567*0.02", "20567*0.01",
"11470*0.1", "11470*0.1",
"11471*0.1", "11471*0.1",
"11472*0.1", "11472*0.1",
@@ -9719,7 +9727,7 @@
"11448*0.01", "11448*0.01",
"11449*0.01", "11449*0.01",
"11450*0.01", "11450*0.01",
"20567*0.02", "20567*0.01",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05"
] ]
@@ -9938,7 +9946,8 @@
"11447*0.01", "11447*0.01",
"11448*0.01", "11448*0.01",
"11449*0.01", "11449*0.01",
"11450*0.01" "11450*0.01",
"11501*0.05"
] ]
}, },
"49": { "49": {
@@ -10358,7 +10367,7 @@
"11448*0.05", "11448*0.05",
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"20567*0.02", "20567*0.01",
"11484*0.05", "11484*0.05",
"11485*0.05", "11485*0.05",
"11486*0.05", "11486*0.05",
@@ -10370,7 +10379,8 @@
"11492*0.05", "11492*0.05",
"11493*0.05", "11493*0.05",
"11494*0.05", "11494*0.05",
"11495*0.05" "11495*0.05",
"11501*0.05"
] ]
}, },
"51": { "51": {
@@ -10572,9 +10582,10 @@
"11448*0.05", "11448*0.05",
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"20567*0.02", "20567*0.01",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"52": { "52": {
@@ -10978,7 +10989,7 @@
"11448*0.05", "11448*0.05",
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"20567*0.02", "20567*0.01",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05"
] ]
@@ -11182,7 +11193,8 @@
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"55": { "55": {
@@ -11383,7 +11395,8 @@
"11473*0.1", "11473*0.1",
"11474*0.1", "11474*0.1",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"56": { "56": {
@@ -11575,7 +11588,8 @@
"11494*0.05", "11494*0.05",
"11495*0.05", "11495*0.05",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"57": { "57": {
@@ -11767,7 +11781,8 @@
"11495*0.05", "11495*0.05",
"11496*0.1", "11496*0.1",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"58": { "58": {
@@ -11959,7 +11974,8 @@
"11495*0.05", "11495*0.05",
"11496*0.1", "11496*0.1",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"59": { "59": {
@@ -12151,7 +12167,8 @@
"11495*0.05", "11495*0.05",
"11496*0.1", "11496*0.1",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"60": { "60": {
@@ -12362,7 +12379,8 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"61": { "61": {
@@ -12563,7 +12581,7 @@
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"11469", "11469",
"20567*0.02", "20567*0.01",
"11475*0.05", "11475*0.05",
"11476*0.05", "11476*0.05",
"11477*0.05", "11477*0.05",
@@ -12573,7 +12591,8 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"62": { "62": {
@@ -12791,7 +12810,8 @@
"11494*0.05", "11494*0.05",
"11495*0.05", "11495*0.05",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1"
] ]
}, },
"63": { "63": {
@@ -13231,7 +13251,9 @@
"11494*0.05", "11494*0.05",
"11495*0.05", "11495*0.05",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1",
"11501*0.05"
] ]
}, },
"65": { "65": {
@@ -13442,7 +13464,8 @@
"11480*0.05", "11480*0.05",
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05" "11483*0.05",
"11499*0.1"
] ]
}, },
"66": { "66": {
@@ -13648,7 +13671,8 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"67": { "67": {
@@ -13844,7 +13868,7 @@
"11449*0.05", "11449*0.05",
"11450*0.05", "11450*0.05",
"11469", "11469",
"20567*0.02", "20567*0.01",
"11475*0.05", "11475*0.05",
"11476*0.05", "11476*0.05",
"11477*0.05", "11477*0.05",
@@ -13854,7 +13878,8 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"68": { "68": {
@@ -14050,7 +14075,7 @@
"11450*0.05", "11450*0.05",
"11469", "11469",
"20323*0.1", "20323*0.1",
"20567*0.02", "20567*0.01",
"11475*0.05", "11475*0.05",
"11476*0.05", "11476*0.05",
"11477*0.05", "11477*0.05",
@@ -14060,7 +14085,8 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"69": { "69": {
@@ -14264,7 +14290,8 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"70": { "70": {
@@ -14467,7 +14494,9 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1",
"11501*0.05"
] ]
}, },
"71": { "71": {
@@ -14665,7 +14694,9 @@
"11481*0.05", "11481*0.05",
"11482*0.05", "11482*0.05",
"11483*0.05", "11483*0.05",
"11496*0.1" "11496*0.1",
"11499*0.1",
"11501*0.05"
] ]
}, },
"72": { "72": {
@@ -14856,7 +14887,8 @@
"11469", "11469",
"20323*0.1", "20323*0.1",
"20770*0.1", "20770*0.1",
"11496*0.1" "11496*0.1",
"11499*0.1"
] ]
}, },
"73": { "73": {
@@ -15046,7 +15078,9 @@
"11450*0.05", "11450*0.05",
"11469", "11469",
"20770*0.1", "20770*0.1",
"11496*0.1" "11496*0.1",
"11499*0.1",
"11501*0.05"
] ]
}, },
"74": { "74": {
@@ -15192,7 +15226,7 @@
"11348*0.01", "11348*0.01",
"11349", "11349",
"20323*0.1", "20323*0.1",
"20567*0.02", "20567*0.01",
"11475*0.05", "11475*0.05",
"11476*0.05", "11476*0.05",
"11477*0.05", "11477*0.05",
@@ -15217,7 +15251,9 @@
"11495*0.05", "11495*0.05",
"11496*0.1", "11496*0.1",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1",
"11501*0.05"
] ]
}, },
"75": { "75": {
@@ -16266,7 +16302,9 @@
"11494*0.05", "11494*0.05",
"11495*0.05", "11495*0.05",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1",
"11501*0.05"
] ]
}, },
"81": { "81": {
@@ -16425,7 +16463,9 @@
"11495*0.05", "11495*0.05",
"11496*0.1", "11496*0.1",
"11497*0.05", "11497*0.05",
"11498*0.05" "11498*0.05",
"11499*0.1",
"11501*0.05"
] ]
}, },
"82": { "82": {

Binary file not shown.

View File

@@ -532,7 +532,7 @@
"id": 10056, "id": 10056,
"event": "你对植物和养生有所领悟。", "event": "你对植物和养生有所领悟。",
"effect": { "effect": {
"STR": 1 "STR": 2
}, },
"NoRandom": 1 "NoRandom": 1
}, },
@@ -784,7 +784,7 @@
"id": 10085, "id": 10085,
"event": "你患上了艾滋病。", "event": "你患上了艾滋病。",
"effect": { "effect": {
"STR": -3, "STR": -5,
"SPR": -2 "SPR": -2
}, },
"include": "EVT?[10084,10162,10219,20056]", "include": "EVT?[10084,10162,10219,20056]",
@@ -1890,7 +1890,7 @@
"effect": { "effect": {
"SPR": -1 "SPR": -1
}, },
"include": "EVT?[10217]", "include": "EVT?[10220]",
"exclude": "EVT?[10222]", "exclude": "EVT?[10222]",
"branch": [ "branch": [
"SPR<2:10062" "SPR<2:10062"
@@ -5237,31 +5237,31 @@
}, },
"10649": { "10649": {
"id": 10649, "id": 10649,
"event": "你的父亲去世。", "event": "父亲去世。",
"include": "EVT?[10011]", "include": "EVT?[10011]",
"exclude": "EVT?[10649,10651]" "exclude": "EVT?[10649,10651]"
}, },
"10650": { "10650": {
"id": 10650, "id": 10650,
"event": "你的母亲去世。", "event": "母亲去世。",
"include": "EVT?[10011]", "include": "EVT?[10011]",
"exclude": "EVT?[10650,10652]" "exclude": "EVT?[10650,10652]"
}, },
"10651": { "10651": {
"id": 10651, "id": 10651,
"event": "你的父亲因心脏病去世。", "event": "父亲因心脏病去世。",
"include": "EVT?[10011]", "include": "EVT?[10011]",
"exclude": "(EVT?[10651,10649])|(TLT?[1044])" "exclude": "(EVT?[10651,10649])|(TLT?[1044])"
}, },
"10652": { "10652": {
"id": 10652, "id": 10652,
"event": "你的母亲因心血管疾病去世。", "event": "母亲因心血管疾病去世。",
"include": "EVT?[10011]", "include": "EVT?[10011]",
"exclude": "(EVT?[10652,10650])|(TLT?[1044])" "exclude": "(EVT?[10652,10650])|(TLT?[1044])"
}, },
"10653": { "10653": {
"id": 10653, "id": 10653,
"event": "你的爱人因病去世。", "event": "爱人因病去世。",
"include": "EVT?[10610,10611,10612]", "include": "EVT?[10610,10611,10612]",
"exclude": "EVT?[10653]" "exclude": "EVT?[10653]"
}, },
@@ -6769,7 +6769,7 @@
}, },
"10876": { "10876": {
"id": 10876, "id": 10876,
"event": "你获得了区三好标。", "event": "你获得了区三好标。",
"include": "(INT>7)&(EVT?[10822,10823])", "include": "(INT>7)&(EVT?[10822,10823])",
"exclude": "EVT?[10876]" "exclude": "EVT?[10876]"
}, },
@@ -9411,11 +9411,10 @@
"11277": { "11277": {
"id": 11277, "id": 11277,
"event": "因为你颜值过高,有个嫉妒的人突然从天而降把你杀了。", "event": "因为你颜值过高,有个嫉妒的人突然从天而降把你杀了。",
"postEvent": "你死前不明白为什么那个人是从天上下来的。",
"include": "(CHR>9)&(EVT?[10010])", "include": "(CHR>9)&(EVT?[10010])",
"exclude": "EVT?[11277]", "exclude": "EVT?[11277]",
"branch": [ "branch": [
"STR<100:10000" "EVT?[10010]:10000"
] ]
}, },
"11278": { "11278": {
@@ -10478,7 +10477,7 @@
}, },
"11430": { "11430": {
"id": 11430, "id": 11430,
"event": "诺贝尔奖停办了。", "event": "诺贝尔奖暂停举办。",
"include": "EVT?[10010]", "include": "EVT?[10010]",
"exclude": "EVT?[11430]" "exclude": "EVT?[11430]"
}, },
@@ -10844,7 +10843,7 @@
}, },
"11486": { "11486": {
"id": 11486, "id": 11486,
"event": "股市大涨,大B股直冲一万点。", "event": "股市大涨,P股直冲一万点。",
"include": "EVT?[10010]", "include": "EVT?[10010]",
"exclude": "EVT?[11486]" "exclude": "EVT?[11486]"
}, },
@@ -10920,6 +10919,27 @@
"include": "EVT?[10009]", "include": "EVT?[10009]",
"exclude": "EVT?[11476,11498]" "exclude": "EVT?[11476,11498]"
}, },
"11499": {
"id": 11499,
"event": "考古队在蒙古一带发掘出一具东晋时期马的遗骨,专家指出马的主人正是晋元帝司马睿。",
"include": "EVT?[10010]",
"exclude": "EVT?[11499]"
},
"11500": {
"id": 11500,
"event": "路过空地,被打羽毛球的大妈一记旋风扣杀打晕了过去。",
"effect": {
"STR": -1
},
"include": "(EVT?[10010])&(STR<4)",
"exclude": "EVT?[11500]"
},
"11501": {
"id": 11501,
"event": "国家降低游戏版号限制,太爷爷生前在等的游戏终于发售了。",
"include": "(EVT?[10010])&(MNY>4)",
"exclude": "EVT?[11501]"
},
"20007": { "20007": {
"id": 20007, "id": 20007,
"event": "你喜欢看画面人设好看的动漫。", "event": "你喜欢看画面人设好看的动漫。",
@@ -11252,7 +11272,7 @@
"STR": 1000, "STR": 1000,
"SPR": 10 "SPR": 10
}, },
"include": "(EVT?[10365])&(TLT?[1048])&(TLT?[1033,1122])" "include": "(EVT?[10365])&(TLT?[1048])&((TLT?[1033,1122])|(EVT?[10715]))"
}, },
"20369": { "20369": {
"id": 20369, "id": 20369,

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -45,7 +45,8 @@
}, },
{ {
"group": 2, "group": 2,
"name": "狂啸" "name": "狂啸",
"color": "#23238E"
}, },
{ {
"group": 2, "group": 2,
@@ -547,7 +548,7 @@
}, },
{ {
"group": 2, "group": 2,
"name": "没人要的瓜娃子" "name": "青天癞蛤蟆"
}, },
{ {
"group": 2, "group": 2,
@@ -759,8 +760,9 @@
"name": "活着到达梦想" "name": "活着到达梦想"
}, },
{ {
"group": 2, "group": 1,
"name": "乌君" "name": "乌君",
"comment": "我们来玩一个游戏,规则是:不要看这条特别感谢 → 你输了。"
}, },
{ {
"group": 2, "group": 2,
@@ -998,6 +1000,77 @@
"group": 2, "group": 2,
"name": "老咸鱼" "name": "老咸鱼"
}, },
{
"group": 2,
"name": "B.X."
},
{
"group": 2,
"name": "七喜打倒雪碧"
},
{
"group": 2,
"name": "jev"
},
{
"group": 1,
"name": "吴老枸",
"comment": "优秀的创意和作品值得被大家认识!作者加油!"
},
{
"group": 2,
"name": "Maple"
},
{
"group": 2,
"name": "42Q"
},
{
"group": 2,
"name": "伊藤泉"
},
{
"group": 2,
"name": "追梦绿"
},
{
"group": 2,
"name": "dwdww"
},
{
"group": 2,
"name": "何黄黄"
},
{
"group": 2,
"name": "李狗蛋76"
},
{
"group": 1,
"name": "巴普斯定理",
"comment": "感谢你们的创意。"
},
{
"group": 2,
"name": "ZPEOVH"
},
{
"group": 2,
"name": "朦朧"
},
{
"group": 1,
"name": "柴来人",
"comment": "希望独立游戏势头越来越好"
},
{
"group": 2,
"name": "OQ"
},
{
"group": 2,
"name": "三点多睡的"
},
{ {
"group": 2, "group": 2,
"name": "有梦人天涯若比邻" "name": "有梦人天涯若比邻"
@@ -1146,5 +1219,40 @@
{ {
"group": 2, "group": 2,
"name": "佐克洛邦" "name": "佐克洛邦"
},
{
"group": 2,
"name": "墨鸿苍穹"
},
{
"group": 2,
"name": "佚名"
},
{
"group": 2,
"name": "zhongyang"
},
{
"group": 1,
"name": "狂啸",
"comment": "游戏很有创意,也感觉很有深度加油吧,看好你们",
"color": "#23238E"
},
{
"group": 2,
"name": "LoZo"
},
{
"group": 2,
"name": "七年"
},
{
"group": 2,
"name": "爱静静"
},
{
"group": 2,
"name": "一只海狗",
"color": "yellow"
} }
] ]

View File

@@ -42,7 +42,7 @@
}, },
"1006": { "1006": {
"id": "1006", "id": "1006",
"name": "乐天派", "name": "乐",
"description": "快乐+1", "description": "快乐+1",
"grade": 0, "grade": 0,
"effect": { "effect": {
@@ -818,7 +818,7 @@
"1091": { "1091": {
"id": "1091", "id": "1091",
"name": "活死人", "name": "活死人",
"description": "体质<-1时其他属性+2", "description": "体质<0时其他属性+2",
"condition": "STR<0", "condition": "STR<0",
"grade": 1, "grade": 1,
"effect": { "effect": {

View File

@@ -31,7 +31,7 @@ async function write(sheets) {
} }
} }
function format(rawSheet, isArray) { function format(rawSheet, isArray, xlsxPath, rawSheetName) {
const newSheet = isArray?[]:{}; const newSheet = isArray?[]:{};
rawSheet.shift(); rawSheet.shift();
for(const index in rawSheet) { for(const index in rawSheet) {
@@ -72,10 +72,10 @@ function format(rawSheet, isArray) {
continue; continue;
} }
if(mainKey===undefined) { if(mainKey===undefined) {
console.warn('[WARN][No Main Key]', filePath, sheetName, parseInt(index), rowData); console.warn(`[WARN][No Main Key] ${xlsxPath}:${rawSheetName}`, parseInt(index)+3, rowData);
continue; continue;
} }
if(newSheet[mainKey]) console.warn('[WARN][Duplicate Key]', mainKey, filePath, sheetName, parseInt(index), '\n\t', JSON.stringify(newSheet[mainKey]), '\n\t', JSON.stringify(rowData)); if(newSheet[mainKey]) console.warn(`[WARN][Duplicate Key] ${mainKey} ${xlsxPath}:${rawSheetName}`, parseInt(index), '\n\t', JSON.stringify(newSheet[mainKey]), '\n\t', JSON.stringify(rowData));
newSheet[mainKey] = rowData; newSheet[mainKey] = rowData;
} }
return newSheet; return newSheet;
@@ -87,7 +87,7 @@ function merge(original, rawData, isMerge, isArray, xlsxPath, rawSheetName) {
isMerge, isMerge,
isArray, isArray,
source: [[xlsxPath, rawSheetName]], source: [[xlsxPath, rawSheetName]],
data: format(rawData, isArray) data: format(rawData, isArray, xlsxPath, rawSheetName)
}; };
@@ -108,7 +108,7 @@ function merge(original, rawData, isMerge, isArray, xlsxPath, rawSheetName) {
return original; return original;
} }
const formatData = format(rawData, isArray); const formatData = format(rawData, isArray, xlsxPath, rawSheetName);
original.source.push([xlsxPath, rawSheetName]); original.source.push([xlsxPath, rawSheetName]);