Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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-2pick
Commits
5600f101
Commit
5600f101
authored
Dec 26, 2017
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fh' into sound
parents
7463ba6f
dfcb43a5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
9 deletions
+12
-9
gframe/game.cpp
gframe/game.cpp
+1
-1
gframe/menu_handler.cpp
gframe/menu_handler.cpp
+1
-1
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+4
-4
ocgcore
ocgcore
+1
-1
script
script
+1
-1
strings.conf
strings.conf
+1
-0
system.conf
system.conf
+3
-1
No files found.
gframe/game.cpp
View file @
5600f101
...
...
@@ -15,7 +15,7 @@
#include <dirent.h>
#endif
const
unsigned
short
PRO_VERSION
=
0x134
1
;
const
unsigned
short
PRO_VERSION
=
0x134
2
;
namespace
ygo
{
...
...
gframe/menu_handler.cpp
View file @
5600f101
...
...
@@ -257,7 +257,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
ZeroMemory
(
&
si
,
sizeof
(
si
));
si
.
cb
=
sizeof
(
si
);
ZeroMemory
(
&
pi
,
sizeof
(
pi
));
wchar_t
*
cmd
=
new
wchar_t
[
MAX_PATH
];
wchar_t
cmd
[
MAX_PATH
];
int
flag
=
0
;
flag
+=
(
mainGame
->
chkBotHand
->
isChecked
()
?
0x1
:
0
);
myswprintf
(
cmd
,
L"Bot.exe
\"
%ls
\"
%d %d"
,
mainGame
->
botInfo
[
sel
].
command
,
flag
,
mainGame
->
gameConf
.
serverport
);
...
...
gframe/tag_duel.cpp
View file @
5600f101
...
...
@@ -751,12 +751,12 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
case
MSG_SHUFFLE_EXTRA
:
{
player
=
BufferIO
::
ReadInt8
(
pbuf
);
count
=
BufferIO
::
ReadInt8
(
pbuf
);
NetServer
::
SendBufferToPlayer
(
players
[
player
],
STOC_GAME_MSG
,
offset
,
(
pbuf
-
offset
)
+
count
*
4
);
NetServer
::
ReSendToPlayer
(
players
[
player
*
2
+
1
]);
NetServer
::
SendBufferToPlayer
(
cur_player
[
player
],
STOC_GAME_MSG
,
offset
,
(
pbuf
-
offset
)
+
count
*
4
);
for
(
int
i
=
0
;
i
<
count
;
++
i
)
BufferIO
::
WriteInt32
(
pbuf
,
0
);
for
(
int
p
=
(
1
-
player
)
*
2
,
i
=
0
;
i
<
2
;
i
++
,
p
++
)
NetServer
::
SendBufferToPlayer
(
players
[
p
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
for
(
int
i
=
0
;
i
<
4
;
++
i
)
if
(
players
[
i
]
!=
cur_player
[
player
])
NetServer
::
SendBufferToPlayer
(
players
[
i
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
for
(
auto
oit
=
observers
.
begin
();
oit
!=
observers
.
end
();
++
oit
)
NetServer
::
ReSendToPlayer
(
*
oit
);
RefreshExtra
(
player
);
...
...
ocgcore
@
74247b0d
Subproject commit
5266b8a87f0ca017388c780ee642e0dd78354018
Subproject commit
74247b0dd884254a153062c2eada47264246cfbb
script
@
0abc46fd
Subproject commit
edc8387e017e8c366ef09a87b90e35f2db4e20e1
Subproject commit
0abc46fdd0ec78371d79ea352eab2eb4e556cb4a
strings.conf
View file @
5600f101
...
...
@@ -523,6 +523,7 @@
!
counter
0
x43
缺陷指示物
!
counter
0
x44
指示物(弹带城壁龙)
!
counter
0
x1045
鳞粉指示物
!
counter
0
x46
指示物(刚鬼死斗)
#setnames, using tab for comment
!
setname
0
x1
正义盟军
A
・
O
・
J
!
setname
0
x2
次世代 ジェネクス
...
...
system.conf
View file @
5600f101
#config file
#nickname & gamename should be less than 20 characters
use_d3d
=
0
use_image_scale
=
1
antialias
=
2
errorlog
=
1
nickname
=
Player
...
...
@@ -24,10 +25,11 @@ hide_hint_button = 1
control_mode
=
0
draw_field_spell
=
1
separate_clear_button
=
1
#auto_search_limit >= 0: Start search automatically when the user enters N chars
.
#auto_search_limit >= 0: Start search automatically when the user enters N chars
auto_search_limit
= -
1
ignore_deck_changes
=
0
default_ot
=
1
enable_bot_mode
=
0
enable_sound
=
1
enable_music
=
1
#Volume of sound and music, between 0 and 100
...
...
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