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
f5718611
Commit
f5718611
authored
Sep 11, 2016
by
DailyShana
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
we should guide users to use right click
parent
c8eb0b1b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
5 deletions
+24
-5
gframe/event_handler.cpp
gframe/event_handler.cpp
+17
-1
gframe/game.cpp
gframe/game.cpp
+5
-4
strings.conf
strings.conf
+2
-0
No files found.
gframe/event_handler.cpp
View file @
f5718611
...
@@ -1468,6 +1468,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -1468,6 +1468,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case
irr
:
:
EMIE_RMOUSE_LEFT_UP
:
{
case
irr
:
:
EMIE_RMOUSE_LEFT_UP
:
{
if
(
mainGame
->
dInfo
.
isReplay
)
if
(
mainGame
->
dInfo
.
isReplay
)
break
;
break
;
s32
x
=
event
.
MouseInput
.
X
;
s32
y
=
event
.
MouseInput
.
Y
;
irr
::
core
::
position2di
pos
(
x
,
y
);
irr
::
gui
::
IGUIElement
*
root
=
mainGame
->
env
->
getRootGUIElement
();
if
(
root
->
getElementFromPoint
(
pos
)
==
mainGame
->
btnCancelOrFinish
)
mainGame
->
chkHideHintButton
->
setChecked
(
true
);
if
(
mainGame
->
gameConf
.
control_mode
==
1
&&
event
.
MouseInput
.
X
>
300
)
{
if
(
mainGame
->
gameConf
.
control_mode
==
1
&&
event
.
MouseInput
.
X
>
300
)
{
mainGame
->
ignore_chain
=
event
.
MouseInput
.
isRightPressed
();
mainGame
->
ignore_chain
=
event
.
MouseInput
.
isRightPressed
();
mainGame
->
always_chain
=
false
;
mainGame
->
always_chain
=
false
;
...
@@ -1611,8 +1617,18 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -1611,8 +1617,18 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break
;
break
;
s32
x
=
event
.
MouseInput
.
X
;
s32
x
=
event
.
MouseInput
.
X
;
s32
y
=
event
.
MouseInput
.
Y
;
s32
y
=
event
.
MouseInput
.
Y
;
hovered_location
=
0
;
irr
::
core
::
position2di
pos
(
x
,
y
);
irr
::
core
::
position2di
pos
(
x
,
y
);
irr
::
gui
::
IGUIElement
*
root
=
mainGame
->
env
->
getRootGUIElement
();
if
(
root
->
getElementFromPoint
(
pos
)
==
mainGame
->
btnCancelOrFinish
)
{
mainGame
->
stTip
->
setVisible
(
true
);
wchar_t
formatBuffer
[
2048
];
myswprintf
(
formatBuffer
,
dataManager
.
GetSysString
(
1700
),
mainGame
->
btnCancelOrFinish
->
getText
());
irr
::
core
::
dimension2d
<
unsigned
int
>
dtip
=
mainGame
->
textFont
->
getDimension
(
formatBuffer
)
+
irr
::
core
::
dimension2d
<
unsigned
int
>
(
10
,
10
);
mainGame
->
stTip
->
setRelativePosition
(
recti
(
x
-
10
-
dtip
.
Width
,
y
-
10
-
dtip
.
Height
,
x
-
10
,
y
-
10
));
mainGame
->
stTip
->
setText
(
formatBuffer
);
}
else
mainGame
->
stTip
->
setVisible
(
false
);
hovered_location
=
0
;
if
(
x
<
300
)
if
(
x
<
300
)
break
;
break
;
ClientCard
*
mcard
=
0
;
ClientCard
*
mcard
=
0
;
...
...
gframe/game.cpp
View file @
f5718611
...
@@ -367,10 +367,6 @@ bool Game::Initialize() {
...
@@ -367,10 +367,6 @@ bool Game::Initialize() {
stHintMsg
->
setBackgroundColor
(
0xc0ffffff
);
stHintMsg
->
setBackgroundColor
(
0xc0ffffff
);
stHintMsg
->
setTextAlignment
(
irr
::
gui
::
EGUIA_CENTER
,
irr
::
gui
::
EGUIA_CENTER
);
stHintMsg
->
setTextAlignment
(
irr
::
gui
::
EGUIA_CENTER
,
irr
::
gui
::
EGUIA_CENTER
);
stHintMsg
->
setVisible
(
false
);
stHintMsg
->
setVisible
(
false
);
stTip
=
env
->
addStaticText
(
L""
,
rect
<
s32
>
(
0
,
0
,
150
,
150
),
false
,
true
,
0
,
-
1
,
true
);
stTip
->
setBackgroundColor
(
0xc0ffffff
);
stTip
->
setTextAlignment
(
irr
::
gui
::
EGUIA_CENTER
,
irr
::
gui
::
EGUIA_CENTER
);
stTip
->
setVisible
(
false
);
//cmd menu
//cmd menu
wCmdMenu
=
env
->
addWindow
(
rect
<
s32
>
(
10
,
10
,
110
,
179
),
false
,
L""
);
wCmdMenu
=
env
->
addWindow
(
rect
<
s32
>
(
10
,
10
,
110
,
179
),
false
,
L""
);
wCmdMenu
->
setDrawTitlebar
(
false
);
wCmdMenu
->
setDrawTitlebar
(
false
);
...
@@ -547,6 +543,11 @@ bool Game::Initialize() {
...
@@ -547,6 +543,11 @@ bool Game::Initialize() {
//leave/surrender/exit
//leave/surrender/exit
btnLeaveGame
=
env
->
addButton
(
rect
<
s32
>
(
205
,
5
,
295
,
80
),
0
,
BUTTON_LEAVE_GAME
,
L""
);
btnLeaveGame
=
env
->
addButton
(
rect
<
s32
>
(
205
,
5
,
295
,
80
),
0
,
BUTTON_LEAVE_GAME
,
L""
);
btnLeaveGame
->
setVisible
(
false
);
btnLeaveGame
->
setVisible
(
false
);
//tip
stTip
=
env
->
addStaticText
(
L""
,
rect
<
s32
>
(
0
,
0
,
150
,
150
),
false
,
true
,
0
,
-
1
,
true
);
stTip
->
setBackgroundColor
(
0xc0ffffff
);
stTip
->
setTextAlignment
(
irr
::
gui
::
EGUIA_CENTER
,
irr
::
gui
::
EGUIA_CENTER
);
stTip
->
setVisible
(
false
);
device
->
setEventReceiver
(
&
menuHandler
);
device
->
setEventReceiver
(
&
menuHandler
);
LoadConfig
();
LoadConfig
();
env
->
getSkin
()
->
setFont
(
guiFont
);
env
->
getSkin
()
->
setFont
(
guiFont
);
...
...
strings.conf
View file @
f5718611
...
@@ -392,6 +392,8 @@
...
@@ -392,6 +392,8 @@
!
system
1622
[%
ls
]错过时点
!
system
1622
[%
ls
]错过时点
!
system
1623
投掷硬币结果:
!
system
1623
投掷硬币结果:
!
system
1624
投掷骰子结果:
!
system
1624
投掷骰子结果:
#tips
!
system
1700
可以用鼠标右键%
ls
#victory reason
#victory reason
!
victory
0
x0
投降
!
victory
0
x0
投降
!
victory
0
x1
LP
变成
0
!
victory
0
x1
LP
变成
0
...
...
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