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
c7614ada
Commit
c7614ada
authored
Jan 11, 2020
by
DailyShana
Committed by
GitHub
Jan 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add HINT_ZONE (#2263)
parent
293618b1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
5 deletions
+54
-5
gframe/client_field.cpp
gframe/client_field.cpp
+2
-0
gframe/drawing.cpp
gframe/drawing.cpp
+1
-1
gframe/duelclient.cpp
gframe/duelclient.cpp
+43
-1
gframe/single_duel.cpp
gframe/single_duel.cpp
+2
-1
gframe/tag_duel.cpp
gframe/tag_duel.cpp
+2
-1
ocgcore
ocgcore
+1
-1
strings.conf
strings.conf
+3
-0
No files found.
gframe/client_field.cpp
View file @
c7614ada
...
...
@@ -18,6 +18,8 @@ ClientField::ClientField() {
hovered_controler
=
0
;
hovered_location
=
0
;
hovered_sequence
=
0
;
selectable_field
=
0
;
selected_field
=
0
;
deck_act
=
false
;
grave_act
=
false
;
remove_act
=
false
;
...
...
gframe/drawing.cpp
View file @
c7614ada
...
...
@@ -126,7 +126,7 @@ void Game::DrawBackGround() {
driver
->
drawVertexPrimitiveList
(
matManager
.
vField
,
4
,
matManager
.
iRectangle
,
2
);
driver
->
setMaterial
(
matManager
.
mBackLine
);
//select field
if
(
dInfo
.
curMsg
==
MSG_SELECT_PLACE
||
dInfo
.
curMsg
==
MSG_SELECT_DISFIELD
)
{
if
(
dInfo
.
curMsg
==
MSG_SELECT_PLACE
||
dInfo
.
curMsg
==
MSG_SELECT_DISFIELD
||
dInfo
.
curMsg
==
MSG_HINT
)
{
float
cv
[
4
]
=
{
0.0
f
,
0.0
f
,
1.0
f
,
1.0
f
};
unsigned
int
filter
=
0x1
;
for
(
int
i
=
0
;
i
<
7
;
++
i
,
filter
<<=
1
)
{
...
...
gframe/duelclient.cpp
View file @
c7614ada
...
...
@@ -982,7 +982,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
}
case
MSG_HINT
:
{
int
type
=
BufferIO
::
ReadInt8
(
pbuf
);
/*int player = */
BufferIO
::
ReadInt8
(
pbuf
);
int
player
=
BufferIO
::
ReadInt8
(
pbuf
);
int
data
=
BufferIO
::
ReadInt32
(
pbuf
);
if
(
mainGame
->
dInfo
.
isReplay
&&
mainGame
->
dInfo
.
isReplaySkiping
)
return
true
;
...
...
@@ -1069,6 +1069,48 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
mainGame
->
WaitFrameSignal
(
30
);
break
;
}
case
HINT_ZONE
:
{
if
(
mainGame
->
LocalPlayer
(
player
)
==
1
)
data
=
(
data
>>
16
)
|
(
data
<<
16
);
for
(
unsigned
filter
=
0x1
;
filter
!=
0
;
filter
<<=
1
)
{
std
::
wstring
str
;
if
(
unsigned
s
=
filter
&
data
)
{
if
(
s
&
0x60
)
{
str
+=
dataManager
.
GetSysString
(
1081
);
data
&=
~
0x600000
;
}
else
if
(
s
&
0xffff
)
str
+=
dataManager
.
GetSysString
(
102
);
else
if
(
s
&
0xffff0000
)
{
str
+=
dataManager
.
GetSysString
(
103
);
s
>>=
16
;
}
if
(
s
&
0x1f
)
str
+=
dataManager
.
GetSysString
(
1002
);
else
if
(
s
&
0xff00
)
{
s
>>=
8
;
if
(
s
&
0x1f
)
str
+=
dataManager
.
GetSysString
(
1003
);
else
if
(
s
&
0x20
)
str
+=
dataManager
.
GetSysString
(
1008
);
else
if
(
s
&
0xc0
)
str
+=
dataManager
.
GetSysString
(
1009
);
}
int
seq
=
1
;
for
(
int
i
=
0x1
;
i
<
0x100
;
i
<<=
1
)
{
if
(
s
&
i
)
break
;
++
seq
;
}
str
+=
L"("
+
std
::
to_wstring
(
seq
)
+
L")"
;
myswprintf
(
textBuffer
,
dataManager
.
GetSysString
(
1510
),
str
.
c_str
());
mainGame
->
AddLog
(
textBuffer
);
}
}
mainGame
->
dField
.
selectable_field
=
data
;
mainGame
->
WaitFrameSignal
(
40
);
mainGame
->
dField
.
selectable_field
=
0
;
break
;
}
}
break
;
}
...
...
gframe/single_duel.cpp
View file @
c7614ada
...
...
@@ -589,7 +589,8 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
case
6
:
case
7
:
case
8
:
case
9
:
{
case
9
:
case
11
:
{
NetServer
::
SendBufferToPlayer
(
players
[
1
-
player
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
for
(
auto
oit
=
observers
.
begin
();
oit
!=
observers
.
end
();
++
oit
)
NetServer
::
ReSendToPlayer
(
*
oit
);
...
...
gframe/tag_duel.cpp
View file @
c7614ada
...
...
@@ -536,7 +536,8 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
case
6
:
case
7
:
case
8
:
case
9
:
{
case
9
:
case
11
:
{
for
(
int
i
=
0
;
i
<
4
;
++
i
)
if
(
players
[
i
]
!=
cur_player
[
player
])
NetServer
::
SendBufferToPlayer
(
players
[
i
],
STOC_GAME_MSG
,
offset
,
pbuf
-
offset
);
...
...
ocgcore
@
5dea59cb
Subproject commit 5
11f2f9f74d31878cb5e6fce62f7f969f6b0cec2
Subproject commit 5
dea59cb15665357949795bcc34a028e187c6024
strings.conf
View file @
c7614ada
...
...
@@ -53,6 +53,8 @@
!
system
98
是否要解放对方怪兽?
!
system
100
先攻
!
system
101
后攻
!
system
102
我方
!
system
103
对方
!
system
200
是否在[%
ls
]发动[%
ls
]的效果?
!
system
201
此时没有可以发动的效果
!
system
202
是否要确认场上的情况?
...
...
@@ -204,6 +206,7 @@
!
system
1075
特殊召唤
!
system
1076
连接
!
system
1080
(
N
/
A
)
!
system
1081
额外怪兽区
#GUI
!
system
1100
魔陷破坏
!
system
1101
怪兽破坏
...
...
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