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
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
ygopro
Commits
f961f53d
Commit
f961f53d
authored
Jan 29, 2022
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into server
parents
9dd17cbd
cf8fc618
Pipeline
#9095
passed with stages
in 2 minutes
Changes
16
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
420 additions
and
219 deletions
+420
-219
cards.cdb
cards.cdb
+0
-0
gframe/event_handler.cpp
gframe/event_handler.cpp
+1
-1
gframe/game.cpp
gframe/game.cpp
+1
-1
gframe/network.h
gframe/network.h
+1
-1
gframe/replay_mode.cpp
gframe/replay_mode.cpp
+4
-2
gframe/replay_mode.h
gframe/replay_mode.h
+2
-2
gframe/single_duel.cpp
gframe/single_duel.cpp
+1
-1
gframe/single_duel.h
gframe/single_duel.h
+1
-1
gframe/single_mode.cpp
gframe/single_mode.cpp
+2
-2
gframe/single_mode.h
gframe/single_mode.h
+2
-2
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+1
-1
gframe/tag_duel.h
gframe/tag_duel.h
+1
-1
lflist.conf
lflist.conf
+397
-202
ocgcore
ocgcore
+1
-1
script
script
+1
-1
strings.conf
strings.conf
+4
-0
No files found.
cards.cdb
View file @
f961f53d
No preview for this file type
gframe/event_handler.cpp
View file @
f961f53d
...
@@ -1621,7 +1621,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -1621,7 +1621,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
myswprintf
(
formatBuffer
,
L"
\n
(%ls)"
,
dataManager
.
GetName
(
mcard
->
alias
));
myswprintf
(
formatBuffer
,
L"
\n
(%ls)"
,
dataManager
.
GetName
(
mcard
->
alias
));
str
.
append
(
formatBuffer
);
str
.
append
(
formatBuffer
);
}
}
if
(
mcard
->
location
==
LOCATION_SZONE
&&
mcard
->
lscale
)
{
if
(
mcard
->
location
==
LOCATION_SZONE
&&
(
mcard
->
type
&
TYPE_PENDULUM
)
)
{
myswprintf
(
formatBuffer
,
L"
\n
%d/%d"
,
mcard
->
lscale
,
mcard
->
rscale
);
myswprintf
(
formatBuffer
,
L"
\n
%d/%d"
,
mcard
->
lscale
,
mcard
->
rscale
);
str
.
append
(
formatBuffer
);
str
.
append
(
formatBuffer
);
}
}
...
...
gframe/game.cpp
View file @
f961f53d
...
@@ -211,7 +211,7 @@ bool Game::Initialize() {
...
@@ -211,7 +211,7 @@ bool Game::Initialize() {
SetWindowsIcon
();
SetWindowsIcon
();
//main menu
//main menu
wchar_t
strbuf
[
256
];
wchar_t
strbuf
[
256
];
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X
Yurika
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X
PONPONPON
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
=
env
->
addWindow
(
rect
<
s32
>
(
370
,
200
,
650
,
415
),
false
,
strbuf
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
wMainMenu
->
getCloseButton
()
->
setVisible
(
false
);
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
btnLanMode
=
env
->
addButton
(
rect
<
s32
>
(
10
,
30
,
270
,
60
),
wMainMenu
,
BUTTON_LAN_MODE
,
dataManager
.
GetSysString
(
1200
));
...
...
gframe/network.h
View file @
f961f53d
...
@@ -147,7 +147,7 @@ public:
...
@@ -147,7 +147,7 @@ public:
DuelPlayer
*
host_player
;
DuelPlayer
*
host_player
;
HostInfo
host_info
;
HostInfo
host_info
;
int
duel_stage
;
int
duel_stage
;
unsigned
long
pduel
;
intptr_t
pduel
;
wchar_t
name
[
20
];
wchar_t
name
[
20
];
wchar_t
pass
[
20
];
wchar_t
pass
[
20
];
};
};
...
...
gframe/replay_mode.cpp
View file @
f961f53d
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
namespace
ygo
{
namespace
ygo
{
long
ReplayMode
::
pduel
=
0
;
intptr_t
ReplayMode
::
pduel
=
0
;
Replay
ReplayMode
::
cur_replay
;
Replay
ReplayMode
::
cur_replay
;
bool
ReplayMode
::
is_continuing
=
true
;
bool
ReplayMode
::
is_continuing
=
true
;
bool
ReplayMode
::
is_closing
=
false
;
bool
ReplayMode
::
is_closing
=
false
;
...
@@ -565,6 +565,8 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
...
@@ -565,6 +565,8 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
DuelClient
::
ClientAnalyze
(
offset
,
pbuf
-
offset
);
DuelClient
::
ClientAnalyze
(
offset
,
pbuf
-
offset
);
if
(
cl
&&
!
(
cl
&
0x80
)
&&
(
pl
!=
cl
||
pc
!=
cc
))
if
(
cl
&&
!
(
cl
&
0x80
)
&&
(
pl
!=
cl
||
pc
!=
cc
))
ReplayRefreshSingle
(
cc
,
cl
,
cs
);
ReplayRefreshSingle
(
cc
,
cl
,
cs
);
else
if
(
pl
==
cl
&&
cl
==
LOCATION_DECK
)
ReplayRefreshDeck
(
cc
);
break
;
break
;
}
}
case
MSG_POS_CHANGE
:
{
case
MSG_POS_CHANGE
:
{
...
@@ -961,7 +963,7 @@ void ReplayMode::ReplayReload() {
...
@@ -961,7 +963,7 @@ void ReplayMode::ReplayReload() {
/*len = */
query_field_card
(
pduel
,
1
,
LOCATION_REMOVED
,
flag
,
queryBuffer
,
0
);
/*len = */
query_field_card
(
pduel
,
1
,
LOCATION_REMOVED
,
flag
,
queryBuffer
,
0
);
mainGame
->
dField
.
UpdateFieldCard
(
mainGame
->
LocalPlayer
(
1
),
LOCATION_REMOVED
,
(
char
*
)
queryBuffer
);
mainGame
->
dField
.
UpdateFieldCard
(
mainGame
->
LocalPlayer
(
1
),
LOCATION_REMOVED
,
(
char
*
)
queryBuffer
);
}
}
int
ReplayMode
::
MessageHandler
(
long
fduel
,
int
type
)
{
int
ReplayMode
::
MessageHandler
(
intptr_t
fduel
,
int
type
)
{
if
(
!
enable_log
)
if
(
!
enable_log
)
return
0
;
return
0
;
char
msgbuf
[
1024
];
char
msgbuf
[
1024
];
...
...
gframe/replay_mode.h
View file @
f961f53d
...
@@ -11,7 +11,7 @@ namespace ygo {
...
@@ -11,7 +11,7 @@ namespace ygo {
class
ReplayMode
{
class
ReplayMode
{
private:
private:
static
long
pduel
;
static
intptr_t
pduel
;
static
bool
is_continuing
;
static
bool
is_continuing
;
static
bool
is_closing
;
static
bool
is_closing
;
static
bool
is_pausing
;
static
bool
is_pausing
;
...
@@ -47,7 +47,7 @@ public:
...
@@ -47,7 +47,7 @@ public:
static
void
ReplayRefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
static
void
ReplayRefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
static
void
ReplayReload
();
static
void
ReplayReload
();
static
int
MessageHandler
(
long
fduel
,
int
type
);
static
int
MessageHandler
(
intptr_t
fduel
,
int
type
);
};
};
}
}
...
...
gframe/single_duel.cpp
View file @
f961f53d
...
@@ -2184,7 +2184,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
...
@@ -2184,7 +2184,7 @@ void SingleDuel::RefreshSingle(int player, int location, int sequence, int flag)
#endif
#endif
}
}
}
}
int
SingleDuel
::
MessageHandler
(
long
fduel
,
int
type
)
{
int
SingleDuel
::
MessageHandler
(
intptr_t
fduel
,
int
type
)
{
if
(
!
enable_log
)
if
(
!
enable_log
)
return
0
;
return
0
;
char
msgbuf
[
1024
];
char
msgbuf
[
1024
];
...
...
gframe/single_duel.h
View file @
f961f53d
...
@@ -53,7 +53,7 @@ public:
...
@@ -53,7 +53,7 @@ public:
#endif
#endif
void
RefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
void
RefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
static
int
MessageHandler
(
long
fduel
,
int
type
);
static
int
MessageHandler
(
intptr_t
fduel
,
int
type
);
static
void
SingleTimer
(
evutil_socket_t
fd
,
short
events
,
void
*
arg
);
static
void
SingleTimer
(
evutil_socket_t
fd
,
short
events
,
void
*
arg
);
protected:
protected:
...
...
gframe/single_mode.cpp
View file @
f961f53d
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
namespace
ygo
{
namespace
ygo
{
long
SingleMode
::
pduel
=
0
;
intptr_t
SingleMode
::
pduel
=
0
;
bool
SingleMode
::
is_closing
=
false
;
bool
SingleMode
::
is_closing
=
false
;
bool
SingleMode
::
is_continuing
=
false
;
bool
SingleMode
::
is_continuing
=
false
;
Replay
SingleMode
::
last_replay
;
Replay
SingleMode
::
last_replay
;
...
@@ -852,7 +852,7 @@ void SingleMode::SinglePlayReload() {
...
@@ -852,7 +852,7 @@ void SingleMode::SinglePlayReload() {
/*len = */
query_field_card
(
pduel
,
1
,
LOCATION_REMOVED
,
flag
,
queryBuffer
,
0
);
/*len = */
query_field_card
(
pduel
,
1
,
LOCATION_REMOVED
,
flag
,
queryBuffer
,
0
);
mainGame
->
dField
.
UpdateFieldCard
(
mainGame
->
LocalPlayer
(
1
),
LOCATION_REMOVED
,
(
char
*
)
queryBuffer
);
mainGame
->
dField
.
UpdateFieldCard
(
mainGame
->
LocalPlayer
(
1
),
LOCATION_REMOVED
,
(
char
*
)
queryBuffer
);
}
}
int
SingleMode
::
MessageHandler
(
long
fduel
,
int
type
)
{
int
SingleMode
::
MessageHandler
(
intptr_t
fduel
,
int
type
)
{
if
(
!
enable_log
)
if
(
!
enable_log
)
return
0
;
return
0
;
char
msgbuf
[
1024
];
char
msgbuf
[
1024
];
...
...
gframe/single_mode.h
View file @
f961f53d
...
@@ -7,7 +7,7 @@ namespace ygo {
...
@@ -7,7 +7,7 @@ namespace ygo {
class
SingleMode
{
class
SingleMode
{
private:
private:
static
long
pduel
;
static
intptr_t
pduel
;
static
bool
is_closing
;
static
bool
is_closing
;
static
bool
is_continuing
;
static
bool
is_continuing
;
...
@@ -26,7 +26,7 @@ public:
...
@@ -26,7 +26,7 @@ public:
static
void
SinglePlayRefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
static
void
SinglePlayRefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
static
void
SinglePlayReload
();
static
void
SinglePlayReload
();
static
int
MessageHandler
(
long
fduel
,
int
type
);
static
int
MessageHandler
(
intptr_t
fduel
,
int
type
);
protected:
protected:
static
Replay
last_replay
;
static
Replay
last_replay
;
...
...
gframe/tag_duel.cpp
View file @
f961f53d
...
@@ -2335,7 +2335,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
...
@@ -2335,7 +2335,7 @@ void TagDuel::RefreshSingle(int player, int location, int sequence, int flag) {
}
}
}
}
}
}
int
TagDuel
::
MessageHandler
(
long
fduel
,
int
type
)
{
int
TagDuel
::
MessageHandler
(
intptr_t
fduel
,
int
type
)
{
if
(
!
enable_log
)
if
(
!
enable_log
)
return
0
;
return
0
;
char
msgbuf
[
1024
];
char
msgbuf
[
1024
];
...
...
gframe/tag_duel.h
View file @
f961f53d
...
@@ -50,7 +50,7 @@ public:
...
@@ -50,7 +50,7 @@ public:
#endif
#endif
void
RefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
void
RefreshSingle
(
int
player
,
int
location
,
int
sequence
,
int
flag
=
0xf81fff
);
static
int
MessageHandler
(
long
fduel
,
int
type
);
static
int
MessageHandler
(
intptr_t
fduel
,
int
type
);
static
void
TagTimer
(
evutil_socket_t
fd
,
short
events
,
void
*
arg
);
static
void
TagTimer
(
evutil_socket_t
fd
,
short
events
,
void
*
arg
);
protected:
protected:
...
...
lflist.conf
View file @
f961f53d
This diff is collapsed.
Click to expand it.
ocgcore
@
9b3458c7
Subproject commit
301511f52a793f9a940dc352495b62d66454314d
Subproject commit
9b3458c7db51dbe52fdb7961cea504d4b705b908
script
@
d31bd272
Subproject commit
3c92734b2fd41ea2641c94e1447f32d7ae96c1e5
Subproject commit
d31bd272604f0c3e2cfb206207ab868cb6b010ba
strings.conf
View file @
f961f53d
...
@@ -557,6 +557,7 @@
...
@@ -557,6 +557,7 @@
!
victory
0
x1f
「守护神 艾克佐迪亚」特殊胜利
!
victory
0
x1f
「守护神 艾克佐迪亚」特殊胜利
!
victory
0
x20
「真艾克佐迪亚」特殊胜利
!
victory
0
x20
「真艾克佐迪亚」特殊胜利
!
victory
0
x21
「混沌虚数
No
.
1000
梦幻虚光神 原数天灵·原数天地」特殊胜利
!
victory
0
x21
「混沌虚数
No
.
1000
梦幻虚光神 原数天灵·原数天地」特殊胜利
!
victory
0
x22
「席取-六双丸」特殊胜利
!
victory
0
xffff
由于「%
ls
」获得比赛胜利
!
victory
0
xffff
由于「%
ls
」获得比赛胜利
#counters
#counters
!
counter
0
x1
魔力指示物
!
counter
0
x1
魔力指示物
...
@@ -1136,3 +1137,6 @@
...
@@ -1136,3 +1137,6 @@
!
setname
0
x176
异晶人的 バリアンズ
!
setname
0
x176
异晶人的 バリアンズ
!
setname
0
x177
海龙神 リバイアサン
!
setname
0
x177
海龙神 リバイアサン
!
setname
0
x178
潜海 シー・ステルス
!
setname
0
x178
潜海 シー・ステルス
!
setname
0
x179
兽带斗神 セリオンズ
!
setname
0
x17a
肆世坏 スケアクロー
!
setname
0
x17b
野蛮人 バーバリアン
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