Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
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
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
MyCard
ygopro
Commits
1251ab35
Commit
1251ab35
authored
Aug 15, 2025
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://github.com/Fluorohydride/ygopro
into server
parents
ce9cfe29
488e66c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
13 deletions
+31
-13
gframe/deck_manager.cpp
gframe/deck_manager.cpp
+1
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+8
-6
gframe/single_duel.cpp
gframe/single_duel.cpp
+9
-2
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+13
-4
No files found.
gframe/deck_manager.cpp
View file @
1251ab35
...
@@ -352,7 +352,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
...
@@ -352,7 +352,7 @@ bool DeckManager::SaveDeck(const Deck& deck, const wchar_t* file) {
return
false
;
return
false
;
std
::
stringstream
deckStream
;
std
::
stringstream
deckStream
;
SaveDeck
(
deck
,
deckStream
);
SaveDeck
(
deck
,
deckStream
);
std
::
f
write
(
deckStream
.
str
().
c_str
(),
1
,
deckStream
.
str
().
length
(),
fp
);
std
::
f
puts
(
deckStream
.
str
().
c_str
(),
fp
);
std
::
fclose
(
fp
);
std
::
fclose
(
fp
);
return
true
;
return
true
;
}
}
...
...
gframe/duelclient.cpp
View file @
1251ab35
...
@@ -2912,12 +2912,14 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
...
@@ -2912,12 +2912,14 @@ bool DuelClient::ClientAnalyze(unsigned char* msg, int len) {
else
else
soundManager
.
PlaySoundEffect
(
SOUND_SPECIAL_SUMMON
);
soundManager
.
PlaySoundEffect
(
SOUND_SPECIAL_SUMMON
);
myswprintf
(
event_string
,
dataManager
.
GetSysString
(
1605
),
dataManager
.
GetName
(
code
));
myswprintf
(
event_string
,
dataManager
.
GetSysString
(
1605
),
dataManager
.
GetName
(
code
));
mainGame
->
showcardcode
=
code
;
if
(
code
)
{
mainGame
->
showcarddif
=
1
;
mainGame
->
showcardcode
=
code
;
mainGame
->
showcard
=
5
;
mainGame
->
showcarddif
=
1
;
mainGame
->
WaitFrameSignal
(
30
);
mainGame
->
showcard
=
5
;
mainGame
->
showcard
=
0
;
mainGame
->
WaitFrameSignal
(
30
);
mainGame
->
WaitFrameSignal
(
11
);
mainGame
->
showcard
=
0
;
mainGame
->
WaitFrameSignal
(
11
);
}
}
}
return
true
;
return
true
;
}
}
...
...
gframe/single_duel.cpp
View file @
1251ab35
...
@@ -1302,9 +1302,16 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
...
@@ -1302,9 +1302,16 @@ int SingleDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
break
;
break
;
}
}
case
MSG_SPSUMMONING
:
{
case
MSG_SPSUMMONING
:
{
pbufw
=
pbuf
;
int
cc
=
pbuf
[
4
];
/*int cl = pbuf[5];*/
/*int cs = pbuf[6];*/
int
cp
=
pbuf
[
7
];
pbuf
+=
8
;
pbuf
+=
8
;
NetServer
::
SendBufferToPlayer
(
players
[
0
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
SendBufferToPlayer
(
players
[
cc
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
ReSendToPlayer
(
players
[
1
]);
if
(
cp
&
POS_FACEDOWN
)
BufferIO
::
Write
<
int32_t
>
(
pbufw
,
0
);
NetServer
::
SendBufferToPlayer
(
players
[
1
-
cc
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
for
(
auto
oit
=
observers
.
begin
();
oit
!=
observers
.
end
();
++
oit
)
for
(
auto
oit
=
observers
.
begin
();
oit
!=
observers
.
end
();
++
oit
)
NetServer
::
ReSendToPlayer
(
*
oit
);
NetServer
::
ReSendToPlayer
(
*
oit
);
#ifdef YGOPRO_SERVER_MODE
#ifdef YGOPRO_SERVER_MODE
...
...
gframe/tag_duel.cpp
View file @
1251ab35
...
@@ -1294,11 +1294,20 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
...
@@ -1294,11 +1294,20 @@ int TagDuel::Analyze(unsigned char* msgbuffer, unsigned int len) {
break
;
break
;
}
}
case
MSG_SPSUMMONING
:
{
case
MSG_SPSUMMONING
:
{
pbufw
=
pbuf
;
int
cc
=
pbuf
[
4
];
/*int cl = pbuf[5];*/
/*int cs = pbuf[6];*/
int
cp
=
pbuf
[
7
];
pbuf
+=
8
;
pbuf
+=
8
;
NetServer
::
SendBufferToPlayer
(
players
[
0
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
auto
pid
=
(
cc
==
0
)
?
0
:
2
;
NetServer
::
ReSendToPlayer
(
players
[
1
]);
NetServer
::
SendBufferToPlayer
(
players
[
pid
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
ReSendToPlayer
(
players
[
2
]);
NetServer
::
ReSendToPlayer
(
players
[
pid
+
1
]);
NetServer
::
ReSendToPlayer
(
players
[
3
]);
if
(
cp
&
POS_FACEDOWN
)
BufferIO
::
Write
<
int32_t
>
(
pbufw
,
0
);
pid
=
2
-
pid
;
NetServer
::
SendBufferToPlayer
(
players
[
pid
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
NetServer
::
ReSendToPlayer
(
players
[
pid
+
1
]);
for
(
auto
oit
=
observers
.
begin
();
oit
!=
observers
.
end
();
++
oit
)
for
(
auto
oit
=
observers
.
begin
();
oit
!=
observers
.
end
();
++
oit
)
NetServer
::
ReSendToPlayer
(
*
oit
);
NetServer
::
ReSendToPlayer
(
*
oit
);
#ifdef YGOPRO_SERVER_MODE
#ifdef YGOPRO_SERVER_MODE
...
...
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