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
baichixing
ygopro
Commits
da904359
Commit
da904359
authored
Mar 24, 2017
by
VanillaSalt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
97b1e996
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
9 deletions
+4
-9
gframe/client_field.cpp
gframe/client_field.cpp
+0
-4
gframe/client_field.h
gframe/client_field.h
+1
-2
gframe/event_handler.cpp
gframe/event_handler.cpp
+2
-2
strings.conf
strings.conf
+1
-1
No files found.
gframe/client_field.cpp
View file @
da904359
...
...
@@ -31,7 +31,6 @@ ClientField::ClientField() {
mzone
[
p
].
resize
(
7
,
0
);
szone
[
p
].
resize
(
8
,
0
);
}
usable_exmzone
=
0
;
}
void
ClientField
::
Clear
()
{
for
(
int
i
=
0
;
i
<
2
;
++
i
)
{
...
...
@@ -66,7 +65,6 @@ void ClientField::Clear() {
overlay_cards
.
clear
();
extra_p_count
[
0
]
=
0
;
extra_p_count
[
1
]
=
0
;
usable_exmzone
=
0
;
chains
.
clear
();
activatable_cards
.
clear
();
summonable_cards
.
clear
();
...
...
@@ -183,8 +181,6 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
}
case
LOCATION_MZONE
:
{
mzone
[
controler
][
sequence
]
=
pcard
;
if
(
!
usable_exmzone
&&
sequence
>=
5
)
usable_exmzone
=
sequence
;
break
;
}
case
LOCATION_SZONE
:
{
...
...
gframe/client_field.h
View file @
da904359
...
...
@@ -41,8 +41,7 @@ public:
std
::
vector
<
int
>
select_options
;
std
::
vector
<
ChainInfo
>
chains
;
int
extra_p_count
[
2
];
int
usable_exmzone
;
size_t
selected_option
;
ClientCard
*
attacker
;
ClientCard
*
attack_target
;
...
...
gframe/event_handler.cpp
View file @
da904359
...
...
@@ -2130,7 +2130,7 @@ void ClientField::GetHoverField(int x, int y) {
hovered_sequence
=
sequence
;
}
else
if
(
boardy
>=
matManager
.
vFieldMzone
[
0
][
5
][
0
].
Pos
.
Y
&&
boardy
<=
matManager
.
vFieldMzone
[
0
][
5
][
2
].
Pos
.
Y
)
{
if
(
sequence
==
1
)
{
if
(
usable_exmzone
!=
6
)
{
if
(
!
mzone
[
1
][
6
]
)
{
hovered_controler
=
0
;
hovered_location
=
LOCATION_MZONE
;
hovered_sequence
=
5
;
...
...
@@ -2140,7 +2140,7 @@ void ClientField::GetHoverField(int x, int y) {
hovered_sequence
=
6
;
}
}
else
if
(
sequence
==
3
)
{
if
(
usable_exmzone
!=
5
)
{
if
(
!
mzone
[
1
][
5
]
)
{
hovered_controler
=
0
;
hovered_location
=
LOCATION_MZONE
;
hovered_sequence
=
6
;
...
...
strings.conf
View file @
da904359
...
...
@@ -281,7 +281,7 @@
!
system
1260
大师规则
!
system
1261
大师规则2
!
system
1262
大师规则3
!
system
1263
大师规则4
!
system
1263
新大师规则
!
system
1270
卡片信息
!
system
1271
消息记录
!
system
1272
清除记录
...
...
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