Commit b30b41d2 authored by nanahira's avatar nanahira

Merge branch 'master' of github.com:moecube/srvpro into mc

parents 105d8d00 7bf14c0e
...@@ -64,6 +64,10 @@ ...@@ -64,6 +64,10 @@
"random_duel": { "random_duel": {
"enabled": false, "enabled": false,
"no_rematch_check": false, "no_rematch_check": false,
"record_match_scores": false,
"post_match_scores": false,
"post_match_accesskey": "123456",
"blank_pass_match": true,
"ready_time": 20, "ready_time": 20,
"hang_timeout": 90 "hang_timeout": 90
}, },
...@@ -154,7 +158,8 @@ ...@@ -154,7 +158,8 @@
"test_mode": { "test_mode": {
"watch_public_hand": false, "watch_public_hand": false,
"no_connect_count_limit": false, "no_connect_count_limit": false,
"no_ban_player": false "no_ban_player": false,
"surrender_anytime": false
}, },
"pre_util": { "pre_util": {
"enabled": false, "enabled": false,
......
...@@ -59,6 +59,14 @@ ...@@ -59,6 +59,14 @@
"exp_value_part2": " exp", "exp_value_part2": " exp",
"exp_value_part3": ", your score is ", "exp_value_part3": ", your score is ",
"exp_value_part4": ". These points may be reset after the stable release of MyCard.", "exp_value_part4": ". These points may be reset after the stable release of MyCard.",
"random_score_part1": "Today's record of ",
"random_score_part2": ": ",
"random_score_part3": "% WIN, ",
"random_score_part4_combo": "% RAGE QUIT, WIN COMBO ",
"random_score_part5_combo": " !",
"random_score_part4": "%",
"random_score_blank": " didn't have enough duel record today.",
"random_score_not_enough": " didn't have enough duel record today.",
"lp_low_opponent": "もはやお前のライフは風前の灯!", "lp_low_opponent": "もはやお前のライフは風前の灯!",
"lp_low_self": "*Low LP Alert*", "lp_low_self": "*Low LP Alert*",
"kicked_by_player": "was evicted from the game.", "kicked_by_player": "was evicted from the game.",
...@@ -351,6 +359,14 @@ ...@@ -351,6 +359,14 @@
"exp_value_part2": "点经验", "exp_value_part2": "点经验",
"exp_value_part3": ",你的战斗力是", "exp_value_part3": ",你的战斗力是",
"exp_value_part4": "。竞技场部分积分按赛季重置。", "exp_value_part4": "。竞技场部分积分按赛季重置。",
"random_score_part1": "",
"random_score_part2": "的今日战绩:胜率",
"random_score_part3": "%,逃跑率",
"random_score_part4_combo": "%,",
"random_score_part5_combo": "连胜中!",
"random_score_part4": "%",
"random_score_blank": "的今日战绩:正在统计中",
"random_score_not_enough": "的今日战绩:正在统计中",
"lp_low_opponent": "你的生命已经如风中残烛了!", "lp_low_opponent": "你的生命已经如风中残烛了!",
"lp_low_self": "背水一战!", "lp_low_self": "背水一战!",
"kicked_by_player": "被请出了房间", "kicked_by_player": "被请出了房间",
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment