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
6c1fdb73
Commit
6c1fdb73
authored
Mar 26, 2024
by
nanahira
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into server
parents
6bddee6f
56b8daf7
Pipeline
#26057
passed with stages
in 4 minutes and 30 seconds
Changes
9
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
236 additions
and
33 deletions
+236
-33
cards.cdb
cards.cdb
+0
-0
gframe/data_manager.h
gframe/data_manager.h
+7
-7
gframe/duelclient.cpp
gframe/duelclient.cpp
+2
-2
gframe/game.cpp
gframe/game.cpp
+7
-7
gframe/netserver.cpp
gframe/netserver.cpp
+3
-3
lflist.conf
lflist.conf
+206
-11
ocgcore
ocgcore
+1
-1
script
script
+1
-1
strings.conf
strings.conf
+9
-1
No files found.
cards.cdb
View file @
6c1fdb73
No preview for this file type
gframe/data_manager.h
View file @
6c1fdb73
...
@@ -54,13 +54,13 @@ public:
...
@@ -54,13 +54,13 @@ public:
string_pointer
strings_begin
;
string_pointer
strings_begin
;
string_pointer
strings_end
;
string_pointer
strings_end
;
wchar_t
numStrings
[
301
][
4
];
wchar_t
numStrings
[
301
][
4
]
{}
;
wchar_t
numBuffer
[
6
];
wchar_t
numBuffer
[
6
]
{}
;
wchar_t
attBuffer
[
128
];
wchar_t
attBuffer
[
128
]
{}
;
wchar_t
racBuffer
[
128
];
wchar_t
racBuffer
[
128
]
{}
;
wchar_t
tpBuffer
[
128
];
wchar_t
tpBuffer
[
128
]
{}
;
wchar_t
scBuffer
[
128
];
wchar_t
scBuffer
[
128
]
{}
;
wchar_t
lmBuffer
[
32
];
wchar_t
lmBuffer
[
32
]
{}
;
static
byte
scriptBuffer
[
0x20000
];
static
byte
scriptBuffer
[
0x20000
];
static
const
wchar_t
*
unknown_string
;
static
const
wchar_t
*
unknown_string
;
...
...
gframe/duelclient.cpp
View file @
6c1fdb73
...
@@ -4300,8 +4300,8 @@ void DuelClient::BeginRefreshHost() {
...
@@ -4300,8 +4300,8 @@ void DuelClient::BeginRefreshHost() {
SOCKET
sSend
=
socket
(
AF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
SOCKET
sSend
=
socket
(
AF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
if
(
sSend
==
INVALID_SOCKET
)
if
(
sSend
==
INVALID_SOCKET
)
break
;
break
;
BOOL
opt
=
TRUE
;
int
opt
=
TRUE
;
setsockopt
(
sSend
,
SOL_SOCKET
,
SO_BROADCAST
,
(
const
char
*
)
&
opt
,
sizeof
(
BOOL
)
);
setsockopt
(
sSend
,
SOL_SOCKET
,
SO_BROADCAST
,
(
const
char
*
)
&
opt
,
sizeof
opt
);
if
(
bind
(
sSend
,
(
sockaddr
*
)
&
local
,
sizeof
(
sockaddr
))
==
SOCKET_ERROR
)
{
if
(
bind
(
sSend
,
(
sockaddr
*
)
&
local
,
sizeof
(
sockaddr
))
==
SOCKET_ERROR
)
{
closesocket
(
sSend
);
closesocket
(
sSend
);
break
;
break
;
...
...
gframe/game.cpp
View file @
6c1fdb73
...
@@ -274,7 +274,7 @@ bool Game::Initialize() {
...
@@ -274,7 +274,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 S
elenadia
"
,
PRO_VERSION
>>
12
,
(
PRO_VERSION
>>
4
)
&
0xff
,
PRO_VERSION
&
0xf
);
myswprintf
(
strbuf
,
L"KoishiPro %X.0%X.%X S
nowdream
"
,
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
));
...
@@ -900,7 +900,7 @@ bool Game::Initialize() {
...
@@ -900,7 +900,7 @@ bool Game::Initialize() {
btnCategoryOK
=
env
->
addButton
(
rect
<
s32
>
(
150
,
210
,
250
,
235
),
wCategories
,
BUTTON_CATEGORY_OK
,
dataManager
.
GetSysString
(
1211
));
btnCategoryOK
=
env
->
addButton
(
rect
<
s32
>
(
150
,
210
,
250
,
235
),
wCategories
,
BUTTON_CATEGORY_OK
,
dataManager
.
GetSysString
(
1211
));
int
catewidth
=
0
;
int
catewidth
=
0
;
for
(
int
i
=
0
;
i
<
32
;
++
i
)
{
for
(
int
i
=
0
;
i
<
32
;
++
i
)
{
irr
::
core
::
dimension2d
<
unsigned
int
>
dtxt
=
mainGame
->
guiFont
->
getDimension
(
dataManager
.
GetSysString
(
1100
+
i
));
irr
::
core
::
dimension2d
<
unsigned
int
>
dtxt
=
guiFont
->
getDimension
(
dataManager
.
GetSysString
(
1100
+
i
));
if
((
int
)
dtxt
.
Width
+
40
>
catewidth
)
if
((
int
)
dtxt
.
Width
+
40
>
catewidth
)
catewidth
=
dtxt
.
Width
+
40
;
catewidth
=
dtxt
.
Width
+
40
;
}
}
...
@@ -1883,7 +1883,7 @@ void Game::ShowCardInfo(int code, bool resize) {
...
@@ -1883,7 +1883,7 @@ void Game::ShowCardInfo(int code, bool resize) {
myswprintf
(
formatBuffer
,
L"[%ls] %ls/%ls"
,
dataManager
.
FormatType
(
cd
.
type
),
dataManager
.
FormatRace
(
cd
.
race
),
dataManager
.
FormatAttribute
(
cd
.
attribute
));
myswprintf
(
formatBuffer
,
L"[%ls] %ls/%ls"
,
dataManager
.
FormatType
(
cd
.
type
),
dataManager
.
FormatRace
(
cd
.
race
),
dataManager
.
FormatAttribute
(
cd
.
attribute
));
stInfo
->
setText
(
formatBuffer
);
stInfo
->
setText
(
formatBuffer
);
int
offset_info
=
0
;
int
offset_info
=
0
;
irr
::
core
::
dimension2d
<
unsigned
int
>
dtxt
=
mainGame
->
guiFont
->
getDimension
(
formatBuffer
);
irr
::
core
::
dimension2d
<
unsigned
int
>
dtxt
=
guiFont
->
getDimension
(
formatBuffer
);
if
(
dtxt
.
Width
>
(
300
*
xScale
-
13
)
-
15
)
if
(
dtxt
.
Width
>
(
300
*
xScale
-
13
)
-
15
)
offset_info
=
15
;
offset_info
=
15
;
if
(
!
(
cd
.
type
&
TYPE_LINK
))
{
if
(
!
(
cd
.
type
&
TYPE_LINK
))
{
...
@@ -1917,7 +1917,7 @@ void Game::ShowCardInfo(int code, bool resize) {
...
@@ -1917,7 +1917,7 @@ void Game::ShowCardInfo(int code, bool resize) {
}
}
stDataInfo
->
setText
(
formatBuffer
);
stDataInfo
->
setText
(
formatBuffer
);
int
offset_arrows
=
offset_info
;
int
offset_arrows
=
offset_info
;
dtxt
=
mainGame
->
guiFont
->
getDimension
(
formatBuffer
);
dtxt
=
guiFont
->
getDimension
(
formatBuffer
);
if
(
dtxt
.
Width
>
(
300
*
xScale
-
13
)
-
15
)
if
(
dtxt
.
Width
>
(
300
*
xScale
-
13
)
-
15
)
offset_arrows
+=
15
;
offset_arrows
+=
15
;
stInfo
->
setRelativePosition
(
rect
<
s32
>
(
15
,
37
,
300
*
xScale
-
13
,
(
60
+
offset_info
)));
stInfo
->
setRelativePosition
(
rect
<
s32
>
(
15
,
37
,
300
*
xScale
-
13
,
(
60
+
offset_info
)));
...
@@ -2309,8 +2309,8 @@ void Game::OnResize() {
...
@@ -2309,8 +2309,8 @@ void Game::OnResize() {
scrTabSystem
->
setVisible
(
false
);
scrTabSystem
->
setVisible
(
false
);
if
(
gameConf
.
resize_popup_menu
)
{
if
(
gameConf
.
resize_popup_menu
)
{
int
width
=
100
*
mainGame
->
xScale
;
int
width
=
100
*
xScale
;
int
height
=
(
mainGame
->
yScale
>=
0.666
)
?
21
*
mainGame
->
yScale
:
14
;
int
height
=
(
yScale
>=
0.666
)
?
21
*
yScale
:
14
;
wCmdMenu
->
setRelativePosition
(
recti
(
1
,
1
,
width
+
1
,
1
));
wCmdMenu
->
setRelativePosition
(
recti
(
1
,
1
,
width
+
1
,
1
));
btnActivate
->
setRelativePosition
(
recti
(
1
,
1
,
width
,
height
));
btnActivate
->
setRelativePosition
(
recti
(
1
,
1
,
width
,
height
));
btnSummon
->
setRelativePosition
(
recti
(
1
,
1
,
width
,
height
));
btnSummon
->
setRelativePosition
(
recti
(
1
,
1
,
width
,
height
));
...
@@ -2532,7 +2532,7 @@ const wchar_t* Game::GetLocaleDirWide(const char* dir) {
...
@@ -2532,7 +2532,7 @@ const wchar_t* Game::GetLocaleDirWide(const char* dir) {
return
locale_buf
;
return
locale_buf
;
}
}
void
Game
::
SetCursor
(
ECURSOR_ICON
icon
)
{
void
Game
::
SetCursor
(
ECURSOR_ICON
icon
)
{
ICursorControl
*
cursor
=
mainGame
->
device
->
getCursorControl
();
ICursorControl
*
cursor
=
device
->
getCursorControl
();
if
(
cursor
->
getActiveIcon
()
!=
icon
)
{
if
(
cursor
->
getActiveIcon
()
!=
icon
)
{
cursor
->
setActiveIcon
(
icon
);
cursor
->
setActiveIcon
(
icon
);
}
}
...
...
gframe/netserver.cpp
View file @
6c1fdb73
...
@@ -122,9 +122,9 @@ bool NetServer::StartBroadcast() {
...
@@ -122,9 +122,9 @@ bool NetServer::StartBroadcast() {
if
(
!
net_evbase
)
if
(
!
net_evbase
)
return
false
;
return
false
;
SOCKET
udp
=
socket
(
AF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
SOCKET
udp
=
socket
(
AF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
BOOL
opt
=
TRUE
;
int
opt
=
TRUE
;
setsockopt
(
udp
,
SOL_SOCKET
,
SO_BROADCAST
,
(
const
char
*
)
&
opt
,
sizeof
(
BOOL
)
);
setsockopt
(
udp
,
SOL_SOCKET
,
SO_BROADCAST
,
(
const
char
*
)
&
opt
,
sizeof
opt
);
setsockopt
(
udp
,
SOL_SOCKET
,
SO_REUSEADDR
,
(
const
char
*
)
&
opt
,
sizeof
(
BOOL
)
);
setsockopt
(
udp
,
SOL_SOCKET
,
SO_REUSEADDR
,
(
const
char
*
)
&
opt
,
sizeof
opt
);
sockaddr_in
addr
;
sockaddr_in
addr
;
memset
(
&
addr
,
0
,
sizeof
(
addr
));
memset
(
&
addr
,
0
,
sizeof
(
addr
));
addr
.
sin_family
=
AF_INET
;
addr
.
sin_family
=
AF_INET
;
...
...
lflist.conf
View file @
6c1fdb73
This diff is collapsed.
Click to expand it.
ocgcore
@
cd52e97d
Subproject commit
68f455dff826bb408cd81081ccfcefd4d6b296
4b
Subproject commit
cd52e97d861f8e52a710de42681db76e6fab6e
4b
script
@
88558cde
Subproject commit
0fd7a503218013b455c34bf6a714e388d0729df
0
Subproject commit
88558cde6f5fe24604ba496d128bbad58f4b8be
0
strings.conf
View file @
6c1fdb73
...
@@ -320,6 +320,9 @@
...
@@ -320,6 +320,9 @@
!
system
1262
大师规则3
!
system
1262
大师规则3
!
system
1263
新大师规则(
2017
)
!
system
1263
新大师规则(
2017
)
!
system
1264
大师规则(
2020
)
!
system
1264
大师规则(
2020
)
!
system
1267
语言(重启后生效)
!
system
1268
盖放怪兽前询问
!
system
1269
数字灵摆图片
!
system
1270
卡片信息
!
system
1270
卡片信息
!
system
1271
消息记录
!
system
1271
消息记录
!
system
1272
清除记录
!
system
1272
清除记录
...
@@ -340,7 +343,7 @@
...
@@ -340,7 +343,7 @@
!
system
1287
只有连锁
1
也显示连锁动画
!
system
1287
只有连锁
1
也显示连锁动画
!
system
1288
禁限卡表
!
system
1288
禁限卡表
!
system
1289
隐藏玩家昵称
!
system
1289
隐藏玩家昵称
!
system
1290
禁用聊天功能
!
system
1290
忽略对方发言
!
system
1291
忽略观战者发言
!
system
1291
忽略观战者发言
!
system
1292
忽略时点
!
system
1292
忽略时点
!
system
1293
显示时点
!
system
1293
显示时点
...
@@ -404,6 +407,7 @@
...
@@ -404,6 +407,7 @@
!
system
1352
主要信息:
!
system
1352
主要信息:
!
system
1353
播放起始于回合:
!
system
1353
播放起始于回合:
!
system
1354
开局默认显示所有时点
!
system
1354
开局默认显示所有时点
!
system
1355
是否确定盖放[%
ls
]?
!
system
1356
此操作将放弃对当前卡组的修改,是否继续?
!
system
1356
此操作将放弃对当前卡组的修改,是否继续?
!
system
1357
不提示保留对卡组的修改
!
system
1357
不提示保留对卡组的修改
!
system
1358
键入关键字后自动进行搜索
!
system
1358
键入关键字后自动进行搜索
...
@@ -429,6 +433,10 @@
...
@@ -429,6 +433,10 @@
!
system
1382
人机信息:
!
system
1382
人机信息:
!
system
1384
电脑锁定出剪刀
!
system
1384
电脑锁定出剪刀
!
system
1385
列表为空,可能未安装合适的人机
!
system
1385
列表为空,可能未安装合适的人机
!
system
1386
使用正则表达式搜索卡片
!
system
1387
卡组代码
!
system
1388
Ctrl
+
A
全选,
Ctrl
+
C
复制,
Ctrl
+
V
粘贴
!
system
1389
卡组代码无效。
!
system
1390
等待行动中...
!
system
1390
等待行动中...
!
system
1391
等待行动中....
!
system
1391
等待行动中....
!
system
1392
等待行动中.....
!
system
1392
等待行动中.....
...
...
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