Skip to content

Commit 1e67ed6

Browse files
LmeSzincLmeSzinc
authored
Merge pull request LmeSzinc#5587 from LmeSzinc/dev
Bug fix
2 parents 433059b + 032b2c1 commit 1e67ed6

8 files changed

Lines changed: 65 additions & 62 deletions

File tree

‎assets/cn/shop/SHOP_REFRESH_CHECK.png‎

3.98 KB
Loading

‎assets/en/shop/SHOP_REFRESH.png‎

-5.72 KB
Binary file not shown.

‎config/template.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@
125125
"Mode": "calculate",
126126
"Fleet1Value": 119,
127127
"Fleet1Record": "2020-01-01 00:00:00",
128-
"Fleet1Control": "prevent_yellow_face",
128+
"Fleet1Control": "prevent_green_face",
129129
"Fleet1Recover": "not_in_dormitory",
130130
"Fleet1Oath": false,
131131
"Fleet2Value": 119,
132132
"Fleet2Record": "2020-01-01 00:00:00",
133-
"Fleet2Control": "prevent_yellow_face",
133+
"Fleet2Control": "prevent_green_face",
134134
"Fleet2Recover": "not_in_dormitory",
135135
"Fleet2Oath": false
136136
},
@@ -199,12 +199,12 @@
199199
"Mode": "calculate",
200200
"Fleet1Value": 119,
201201
"Fleet1Record": "2020-01-01 00:00:00",
202-
"Fleet1Control": "prevent_yellow_face",
202+
"Fleet1Control": "prevent_green_face",
203203
"Fleet1Recover": "not_in_dormitory",
204204
"Fleet1Oath": false,
205205
"Fleet2Value": 119,
206206
"Fleet2Record": "2020-01-01 00:00:00",
207-
"Fleet2Control": "prevent_yellow_face",
207+
"Fleet2Control": "prevent_green_face",
208208
"Fleet2Recover": "not_in_dormitory",
209209
"Fleet2Oath": false
210210
},
@@ -273,12 +273,12 @@
273273
"Mode": "calculate",
274274
"Fleet1Value": 119,
275275
"Fleet1Record": "2020-01-01 00:00:00",
276-
"Fleet1Control": "prevent_yellow_face",
276+
"Fleet1Control": "prevent_green_face",
277277
"Fleet1Recover": "not_in_dormitory",
278278
"Fleet1Oath": false,
279279
"Fleet2Value": 119,
280280
"Fleet2Record": "2020-01-01 00:00:00",
281-
"Fleet2Control": "prevent_yellow_face",
281+
"Fleet2Control": "prevent_green_face",
282282
"Fleet2Recover": "not_in_dormitory",
283283
"Fleet2Oath": false
284284
},
@@ -409,12 +409,12 @@
409409
"Mode": "calculate",
410410
"Fleet1Value": 119,
411411
"Fleet1Record": "2020-01-01 00:00:00",
412-
"Fleet1Control": "prevent_yellow_face",
412+
"Fleet1Control": "prevent_green_face",
413413
"Fleet1Recover": "not_in_dormitory",
414414
"Fleet1Oath": false,
415415
"Fleet2Value": 119,
416416
"Fleet2Record": "2020-01-01 00:00:00",
417-
"Fleet2Control": "prevent_yellow_face",
417+
"Fleet2Control": "prevent_green_face",
418418
"Fleet2Recover": "not_in_dormitory",
419419
"Fleet2Oath": false
420420
},
@@ -483,12 +483,12 @@
483483
"Mode": "calculate",
484484
"Fleet1Value": 119,
485485
"Fleet1Record": "2020-01-01 00:00:00",
486-
"Fleet1Control": "prevent_yellow_face",
486+
"Fleet1Control": "prevent_green_face",
487487
"Fleet1Recover": "not_in_dormitory",
488488
"Fleet1Oath": false,
489489
"Fleet2Value": 119,
490490
"Fleet2Record": "2020-01-01 00:00:00",
491-
"Fleet2Control": "prevent_yellow_face",
491+
"Fleet2Control": "prevent_green_face",
492492
"Fleet2Recover": "not_in_dormitory",
493493
"Fleet2Oath": false
494494
},
@@ -544,7 +544,7 @@
544544
"Mode": "calculate",
545545
"Fleet1Value": 119,
546546
"Fleet1Record": "2020-01-01 00:00:00",
547-
"Fleet1Control": "prevent_yellow_face",
547+
"Fleet1Control": "prevent_green_face",
548548
"Fleet1Recover": "not_in_dormitory",
549549
"Fleet1Oath": false,
550550
"Fleet2Value": 119,
@@ -629,7 +629,7 @@
629629
"Mode": "calculate",
630630
"Fleet1Value": 119,
631631
"Fleet1Record": "2020-01-01 00:00:00",
632-
"Fleet1Control": "prevent_yellow_face",
632+
"Fleet1Control": "prevent_green_face",
633633
"Fleet1Recover": "not_in_dormitory",
634634
"Fleet1Oath": false,
635635
"Fleet2Value": 119,
@@ -706,12 +706,12 @@
706706
"Mode": "calculate",
707707
"Fleet1Value": 119,
708708
"Fleet1Record": "2020-01-01 00:00:00",
709-
"Fleet1Control": "prevent_yellow_face",
709+
"Fleet1Control": "prevent_green_face",
710710
"Fleet1Recover": "not_in_dormitory",
711711
"Fleet1Oath": false,
712712
"Fleet2Value": 119,
713713
"Fleet2Record": "2020-01-01 00:00:00",
714-
"Fleet2Control": "prevent_yellow_face",
714+
"Fleet2Control": "prevent_green_face",
715715
"Fleet2Recover": "not_in_dormitory",
716716
"Fleet2Oath": false
717717
},
@@ -784,12 +784,12 @@
784784
"Mode": "calculate",
785785
"Fleet1Value": 119,
786786
"Fleet1Record": "2020-01-01 00:00:00",
787-
"Fleet1Control": "prevent_yellow_face",
787+
"Fleet1Control": "prevent_green_face",
788788
"Fleet1Recover": "not_in_dormitory",
789789
"Fleet1Oath": false,
790790
"Fleet2Value": 119,
791791
"Fleet2Record": "2020-01-01 00:00:00",
792-
"Fleet2Control": "prevent_yellow_face",
792+
"Fleet2Control": "prevent_green_face",
793793
"Fleet2Recover": "not_in_dormitory",
794794
"Fleet2Oath": false
795795
},
@@ -862,12 +862,12 @@
862862
"Mode": "calculate",
863863
"Fleet1Value": 119,
864864
"Fleet1Record": "2020-01-01 00:00:00",
865-
"Fleet1Control": "prevent_yellow_face",
865+
"Fleet1Control": "prevent_green_face",
866866
"Fleet1Recover": "not_in_dormitory",
867867
"Fleet1Oath": false,
868868
"Fleet2Value": 119,
869869
"Fleet2Record": "2020-01-01 00:00:00",
870-
"Fleet2Control": "prevent_yellow_face",
870+
"Fleet2Control": "prevent_green_face",
871871
"Fleet2Recover": "not_in_dormitory",
872872
"Fleet2Oath": false
873873
},
@@ -940,12 +940,12 @@
940940
"Mode": "calculate",
941941
"Fleet1Value": 119,
942942
"Fleet1Record": "2020-01-01 00:00:00",
943-
"Fleet1Control": "prevent_yellow_face",
943+
"Fleet1Control": "prevent_green_face",
944944
"Fleet1Recover": "not_in_dormitory",
945945
"Fleet1Oath": false,
946946
"Fleet2Value": 119,
947947
"Fleet2Record": "2020-01-01 00:00:00",
948-
"Fleet2Control": "prevent_yellow_face",
948+
"Fleet2Control": "prevent_green_face",
949949
"Fleet2Recover": "not_in_dormitory",
950950
"Fleet2Oath": false
951951
},
@@ -1018,12 +1018,12 @@
10181018
"Mode": "calculate",
10191019
"Fleet1Value": 119,
10201020
"Fleet1Record": "2020-01-01 00:00:00",
1021-
"Fleet1Control": "prevent_yellow_face",
1021+
"Fleet1Control": "prevent_green_face",
10221022
"Fleet1Recover": "not_in_dormitory",
10231023
"Fleet1Oath": false,
10241024
"Fleet2Value": 119,
10251025
"Fleet2Record": "2020-01-01 00:00:00",
1026-
"Fleet2Control": "prevent_yellow_face",
1026+
"Fleet2Control": "prevent_green_face",
10271027
"Fleet2Recover": "not_in_dormitory",
10281028
"Fleet2Oath": false
10291029
},
@@ -1092,12 +1092,12 @@
10921092
"Mode": "calculate",
10931093
"Fleet1Value": 119,
10941094
"Fleet1Record": "2020-01-01 00:00:00",
1095-
"Fleet1Control": "prevent_yellow_face",
1095+
"Fleet1Control": "prevent_green_face",
10961096
"Fleet1Recover": "not_in_dormitory",
10971097
"Fleet1Oath": false,
10981098
"Fleet2Value": 119,
10991099
"Fleet2Record": "2020-01-01 00:00:00",
1100-
"Fleet2Control": "prevent_yellow_face",
1100+
"Fleet2Control": "prevent_green_face",
11011101
"Fleet2Recover": "not_in_dormitory",
11021102
"Fleet2Oath": false
11031103
},
@@ -1152,7 +1152,7 @@
11521152
"Mode": "calculate",
11531153
"Fleet1Value": 119,
11541154
"Fleet1Record": "2020-01-01 00:00:00",
1155-
"Fleet1Control": "prevent_yellow_face",
1155+
"Fleet1Control": "prevent_green_face",
11561156
"Fleet1Recover": "not_in_dormitory",
11571157
"Fleet1Oath": false,
11581158
"Fleet2Value": 119,
@@ -1200,7 +1200,7 @@
12001200
"Mode": "calculate",
12011201
"Fleet1Value": 119,
12021202
"Fleet1Record": "2020-01-01 00:00:00",
1203-
"Fleet1Control": "prevent_yellow_face",
1203+
"Fleet1Control": "prevent_green_face",
12041204
"Fleet1Recover": "not_in_dormitory",
12051205
"Fleet1Oath": false,
12061206
"Fleet2Value": 119,
@@ -1253,7 +1253,7 @@
12531253
},
12541254
"AddNewStudent": {
12551255
"Enable": false,
1256-
"Favorite": true,
1256+
"Favorite": false,
12571257
"MinLevel": 50
12581258
},
12591259
"Storage": {

0 commit comments

Comments
 (0)