Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
srvpro
Commits
216d38da
Commit
216d38da
authored
Apr 16, 2024
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into koishi
parents
e0f1c79e
7e25dd90
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
4 deletions
+12
-4
data/constants.json
data/constants.json
+2
-1
data/i18n.json
data/i18n.json
+2
-0
ygopro-pre.js
ygopro-pre.js
+1
-0
ygopro-server.coffee
ygopro-server.coffee
+3
-1
ygopro-server.js
ygopro-server.js
+4
-2
No files found.
data/constants.json
View file @
216d38da
...
...
@@ -248,7 +248,8 @@
"RACE_DEVINE"
:
2097152
,
"RACE_CREATORGOD"
:
4194304
,
"RACE_WYRM"
:
8388608
,
"RACE_CYBERS"
:
16777216
"RACE_CYBERS"
:
16777216
,
"RACE_ILLUSION"
:
33554432
},
"ATTRIBUTES"
:
{
"ATTRIBUTE_EARTH"
:
1
,
...
...
data/i18n.json
View file @
216d38da
...
...
@@ -203,6 +203,7 @@
"auto_death_part1"
:
"This room is an auto-extra-duel room. The Extra Duel will begin after "
,
"auto_death_part2"
:
" minutes."
,
"athletic_arena_tip"
:
"During an athletic match, a game quit behavior is regarded as a surrender."
,
"entertain_arena_tip"
:
"Welcome! This mode bans the top 20 most frequent deck used in athletic mode for past 7 days."
,
"windbot_disable_random_room"
:
"By adding the AI, this random game won't get any new player unless they enter the room name:"
,
"refresh_success"
:
"Refresh field succeeded."
,
"refresh_failed"
:
"Refresh field failed."
,
...
...
@@ -560,6 +561,7 @@
"auto_death_part1"
:
"本房间为自动加时赛房间。比赛开始"
,
"auto_death_part2"
:
"分钟后,将自动进入加时赛。"
,
"athletic_arena_tip"
:
"在竞技匹配中,比赛开始前退出游戏也会视为投降。"
,
"entertain_arena_tip"
:
"欢迎来到娱乐匹配。系统会禁止锁定竞技匹配过去一周使用数 TOP 20 的卡组。"
,
"windbot_disable_random_room"
:
"因为添加了AI,本随机对战房间将只能通过房间名加入:"
,
"refresh_success"
:
"刷新场面成功。"
,
"refresh_fail"
:
"刷新场面失败。"
,
...
...
ygopro-pre.js
View file @
216d38da
...
...
@@ -124,6 +124,7 @@ var loadDb = function(db_file, callback) {
if
(
result
.
race
&
constants
.
RACES
.
RACE_CREATORGOD
)
{
cardRace
=
"
创造神
"
;}
if
(
result
.
race
&
constants
.
RACES
.
RACE_WYRM
)
{
cardRace
=
"
幻龙
"
;}
if
(
result
.
race
&
constants
.
RACES
.
RACE_CYBERS
)
{
cardRace
=
"
电子界
"
;}
if
(
result
.
race
&
constants
.
RACES
.
RACE_ILLUSION
)
{
cardRace
=
"
幻想魔
"
;}
cardText
+=
"
"
+
cardRace
;
var
cardAttr
=
""
;
...
...
ygopro-server.coffee
View file @
216d38da
...
...
@@ -2430,6 +2430,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
room
.
max_player
=
2
if
room
.
arena
==
"athletic"
room
.
welcome
=
"${athletic_arena_tip}"
else
room
.
welcome
=
"${entertain_arena_tip}"
when
5
title
=
info
.
pass
.
slice
(
8
).
replace
(
String
.
fromCharCode
(
0xFEFF
),
' '
)
room
=
ROOM_find_by_title
(
title
)
...
...
@@ -3911,7 +3913,7 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
dataManager
.
saveDuelLog
(
room
.
name
,
room
.
process_pid
,
room
.
cloud_replay_id
,
replay_filename
,
room
.
hostinfo
.
mode
,
room
.
duel_count
,
playerInfos
)
# no synchronize here because too slow
if
settings
.
modules
.
mysql
.
enabled
&&
settings
.
modules
.
cloud_replay
.
enabled
and
settings
.
modules
.
tournament_mode
.
enabled
ygopro
.
stoc_send_chat
(
client
,
"${cloud_replay_delay_part1}R#
#{
room
.
cloud_replay_id
}
${cloud_replay_delay_part2}"
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
)
await
return
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
block_replay_to_player
or
settings
.
modules
.
replay_delay
and
room
.
hostinfo
.
mode
==
1
await
return
settings
.
modules
.
tournament_mode
.
enabled
and
settings
.
modules
.
tournament_mode
.
block_replay_to_player
or
settings
.
modules
.
replay_delay
and
room
and
room
.
hostinfo
.
mode
==
1
# spawn windbot
windbot_looplimit
=
0
...
...
ygopro-server.js
View file @
216d38da
// Generated by CoffeeScript 2.
6.1
// Generated by CoffeeScript 2.
7.0
(
function
()
{
// 标准库
var
CLIENT_check_vip
,
CLIENT_get_absolute_pos
,
CLIENT_get_authorize_key
,
CLIENT_get_kick_reconnect_target
,
CLIENT_get_partner
,
CLIENT_get_save_data
,
CLIENT_heartbeat_register
,
CLIENT_heartbeat_unregister
,
CLIENT_import_data
,
CLIENT_is_able_to_kick_reconnect
,
CLIENT_is_able_to_reconnect
,
CLIENT_is_banned_by_mc
,
CLIENT_is_player
,
CLIENT_kick
,
CLIENT_kick_reconnect
,
CLIENT_pre_reconnect
,
CLIENT_reconnect
,
CLIENT_reconnect_register
,
CLIENT_reconnect_unregister
,
CLIENT_send_pre_reconnect_info
,
CLIENT_send_reconnect_info
,
CLIENT_send_replays
,
CLIENT_send_replays_and_kick
,
CLIENT_send_vip_status
,
CLIENT_use_cdkey
,
Q
,
ROOM_all
,
ROOM_bad_ip
,
ROOM_ban_player
,
ROOM_clear_disconnect
,
ROOM_connected_ip
,
ROOM_find_by_name
,
ROOM_find_by_pid
,
ROOM_find_by_port
,
ROOM_find_by_title
,
ROOM_find_or_create_ai
,
ROOM_find_or_create_by_name
,
ROOM_find_or_create_random
,
ROOM_kick
,
ROOM_player_flee
,
ROOM_player_get_score
,
ROOM_player_lose
,
ROOM_player_win
,
ROOM_players_oppentlist
,
ROOM_unwelcome
,
ROOM_validate
,
ReplayParser
,
ResolveData
,
Room
,
SERVER_clear_disconnect
,
SERVER_kick
,
SOCKET_flush_data
,
VIP_generate_cdkeys
,
_
,
_async
,
addCallback
,
athleticChecker
,
auth
,
axios
,
badwordR
,
badwords
,
ban_user
,
bunyan
,
challonge
,
checkFileExists
,
concat_name
,
createDirectoryIfNotExists
,
crypto
,
dataManager
,
deck_name_match
,
dialogues
,
disconnect_list
,
exec
,
execFile
,
fs
,
geoip
,
getDuelLogQueryFromQs
,
getSeedTimet
,
get_memory_usage
,
http
,
httpRequestListener
,
importOldConfig
,
import_datas
,
init
,
ip6addr
,
lflists
,
loadJSON
,
loadJSONAsync
,
loadLFList
,
loadRemoteData
,
load_dialogues
,
load_dialogues_custom
,
load_tips
,
load_tips_zh
,
load_words
,
log
,
long_resolve_cards
,
memory_usage
,
merge
,
moment
,
moment_long_ago_string
,
moment_now
,
moment_now_string
,
neosRequestListener
,
net
,
netRequestHandler
,
os
,
osu
,
path
,
qs
,
real_windbot_server_ip
,
release_disconnect
,
report_to_big_brother
,
request
,
roomlist
,
rooms_count
,
setting_change
,
setting_get
,
setting_save
,
settings
,
spawn
,
spawnSync
,
spawn_windbot
,
tips
,
url
,
users_cache
,
util
,
wait_room_start
,
wait_room_start_arena
,
windbot_looplimit
,
windbot_process
,
windbots
,
words
,
ygopro
,
zlib
;
...
...
@@ -3202,6 +3202,8 @@
room
.
max_player
=
2
;
if
(
room
.
arena
===
"
athletic
"
)
{
room
.
welcome
=
"
${athletic_arena_tip}
"
;
}
else
{
room
.
welcome
=
"
${entertain_arena_tip}
"
;
}
}
break
;
...
...
@@ -5263,7 +5265,7 @@
ygopro
.
stoc_send_chat
(
client
,
`\${cloud_replay_delay_part1}R#
${
room
.
cloud_replay_id
}
\${cloud_replay_delay_part2}`
,
ygopro
.
constants
.
COLORS
.
BABYBLUE
);
}
}
return
settings
.
modules
.
tournament_mode
.
enabled
&&
settings
.
modules
.
tournament_mode
.
block_replay_to_player
||
settings
.
modules
.
replay_delay
&&
room
.
hostinfo
.
mode
===
1
;
return
settings
.
modules
.
tournament_mode
.
enabled
&&
settings
.
modules
.
tournament_mode
.
block_replay_to_player
||
settings
.
modules
.
replay_delay
&&
room
&&
room
.
hostinfo
.
mode
===
1
;
});
// spawn windbot
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment