Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro2
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
srvpro2
Commits
26f482d5
Commit
26f482d5
authored
Feb 23, 2026
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix reconnect refresh field
parent
74eade31
Pipeline
#43405
passed with stages
in 3 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
82 additions
and
18 deletions
+82
-18
src/feats/reconnect/refresh-field-service.ts
src/feats/reconnect/refresh-field-service.ts
+76
-16
src/room/room.ts
src/room/room.ts
+6
-2
No files found.
src/feats/reconnect/refresh-field-service.ts
View file @
26f482d5
import
{
NetPlayerType
,
OcgcoreCommonConstants
,
OcgcoreScriptConstants
,
YGOProMsgDeckTop
,
YGOProMsgHint
,
YGOProMsgNewPhase
,
YGOProMsgNewTurn
,
YGOProMsgReverseDeck
,
YGOProMsgWaiting
,
YGOProStocGameMsg
,
}
from
'
ygopro-msg-encode
'
;
import
{
Context
}
from
'
../../app
'
;
import
{
Client
}
from
'
../../client
'
;
import
{
DuelStage
,
Room
}
from
'
../../room
'
;
import
{
DuelStage
,
OnRoomDuelStart
,
Room
,
RoomManager
}
from
'
../../room
'
;
declare
module
'
../../room/
'
{
interface
Room
{
deckReversed
?:
boolean
;
}
}
export
class
RefreshFieldService
{
constructor
(
private
ctx
:
Context
)
{}
async
init
()
{
this
.
ctx
.
middleware
(
OnRoomDuelStart
,
async
(
event
,
client
,
next
)
=>
{
const
room
=
event
.
room
;
room
.
deckReversed
=
false
;
return
next
();
})
.
middleware
(
YGOProMsgReverseDeck
,
async
(
event
,
client
,
next
)
=>
{
const
room
=
this
.
ctx
.
get
(()
=>
RoomManager
)
.
findByName
(
client
.
roomName
);
if
(
room
)
{
room
.
deckReversed
=
!
room
.
deckReversed
;
}
return
next
();
});
}
async
sendReconnectDuelingMessages
(
client
:
Client
,
room
:
Room
)
{
this
.
assertRefreshAllowed
(
client
,
room
);
await
this
.
sendNewTurnMessages
(
client
,
room
);
...
...
@@ -36,9 +63,48 @@ export class RefreshFieldService {
await
client
.
send
(
await
this
.
requestField
(
room
));
await
this
.
sendRefreshMessages
(
client
,
room
);
const
needResendRequest
=
this
.
isReconnectingPlayerOperating
(
client
,
room
);
if
(
room
.
deckReversed
)
{
await
client
.
send
(
new
YGOProStocGameMsg
().
fromPartial
({
msg
:
new
YGOProMsgReverseDeck
(),
}),
);
}
for
(
let
igp
=
0
;
igp
<
2
;
++
igp
)
{
const
deckQuery
=
await
room
.
ocgcore
.
queryFieldCard
({
player
:
igp
,
location
:
OcgcoreScriptConstants
.
LOCATION_DECK
,
queryFlag
:
OcgcoreCommonConstants
.
QUERY_CODE
|
OcgcoreCommonConstants
.
QUERY_POSITION
,
useCache
:
0
,
});
const
lastCard
=
deckQuery
.
cards
[
deckQuery
.
cards
.
length
-
1
];
if
(
lastCard
)
{
let
code
=
lastCard
.
code
;
const
isFaceUp
=
(
lastCard
.
position
&
OcgcoreCommonConstants
.
POS_FACEUP
)
!==
0
;
if
(
isFaceUp
)
{
code
|=
0x80000000
;
}
if
(
room
.
deckReversed
||
isFaceUp
)
{
await
client
.
send
(
new
YGOProStocGameMsg
().
fromPartial
({
msg
:
new
YGOProMsgDeckTop
().
fromPartial
({
player
:
igp
,
sequence
:
0
,
code
,
}),
}),
);
}
}
}
await
room
.
sendTimeLimit
(
1
-
room
.
getDuelPos
(
client
),
client
);
if
(
needResendRequest
)
{
if
(
client
===
room
.
responsePlayer
)
{
const
lastHint
=
this
.
findLastHintForClient
(
client
,
room
);
if
(
lastHint
)
{
await
client
.
send
(
...
...
@@ -58,14 +124,14 @@ export class RefreshFieldService {
);
await
room
.
setResponseTimer
(
room
.
getDuelPos
(
client
));
}
return
;
}
else
{
await
client
.
send
(
new
YGOProStocGameMsg
().
fromPartial
({
msg
:
new
YGOProMsgWaiting
(),
}),
);
await
room
.
sendTimeLimit
(
room
.
getDuelPos
(
client
),
client
);
}
await
client
.
send
(
new
YGOProStocGameMsg
().
fromPartial
({
msg
:
new
YGOProMsgWaiting
(),
}),
);
}
private
assertRefreshAllowed
(
client
:
Client
,
room
:
Room
)
{
...
...
@@ -142,12 +208,6 @@ export class RefreshFieldService {
}
}
private
isReconnectingPlayerOperating
(
client
:
Client
,
room
:
Room
):
boolean
{
const
ingameDuelPos
=
room
.
getIngameDuelPos
(
client
);
const
operatingPlayer
=
room
.
getIngameOperatingPlayer
(
ingameDuelPos
);
return
operatingPlayer
===
client
;
}
private
findLastHintForClient
(
client
:
Client
,
room
:
Room
,
...
...
src/room/room.ts
View file @
26f482d5
...
...
@@ -1226,7 +1226,7 @@ export class Room {
this
.
timerState
.
backedMs
[
originalDuelPos
]
-=
1000
;
}
private
async
sendTimeLimit
(
originalDuelPos
:
number
)
{
async
sendTimeLimit
(
originalDuelPos
:
number
,
toSpecficClient
?:
Client
)
{
if
(
!
this
.
hasTimeLimit
||
!
[
0
,
1
].
includes
(
originalDuelPos
))
{
return
;
}
...
...
@@ -1236,7 +1236,11 @@ export class Room {
player
:
ingameDuelPos
,
left_time
:
Math
.
ceil
(
leftTime
/
1000
),
});
await
Promise
.
all
(
this
.
playingPlayers
.
map
((
p
)
=>
p
.
send
(
msg
)));
await
Promise
.
all
(
this
.
playingPlayers
.
filter
((
p
)
=>
!
toSpecficClient
||
p
===
toSpecficClient
)
.
map
((
p
)
=>
p
.
send
(
msg
)),
);
}
private
async
onResponseTimeout
(
originalDuelPos
:
number
)
{
...
...
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