Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
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
fallenstardust
YGOMobile
Commits
1fd50f7c
Commit
1fd50f7c
authored
Jul 22, 2019
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补音效&微调
parent
79225849
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
5 deletions
+25
-5
Classes/gframe/deck_con.cpp
Classes/gframe/deck_con.cpp
+25
-5
No files found.
Classes/gframe/deck_con.cpp
View file @
1fd50f7c
...
@@ -96,7 +96,7 @@ inline void changeCategory(int catesel) {
...
@@ -96,7 +96,7 @@ inline void changeCategory(int catesel) {
refreshReadonly
(
catesel
);
refreshReadonly
(
catesel
);
mainGame
->
RefreshDeck
(
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
mainGame
->
RefreshDeck
(
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
mainGame
->
cbDBDecks
->
setSelected
(
0
);
mainGame
->
cbDBDecks
->
setSelected
(
0
);
deckManager
.
LoadDeck
(
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
deckManager
.
LoadDeck
(
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
//fixme
mainGame
->
deckBuilder
.
is_modified
=
false
;
mainGame
->
deckBuilder
.
is_modified
=
false
;
mainGame
->
deckBuilder
.
prev_category
=
catesel
;
mainGame
->
deckBuilder
.
prev_category
=
catesel
;
mainGame
->
deckBuilder
.
prev_deck
=
0
;
mainGame
->
deckBuilder
.
prev_deck
=
0
;
...
@@ -118,8 +118,8 @@ inline void showDeckManage() {
...
@@ -118,8 +118,8 @@ inline void showDeckManage() {
}
}
});
});
lstCategories
->
setSelected
(
mainGame
->
deckBuilder
.
prev_category
);
lstCategories
->
setSelected
(
mainGame
->
deckBuilder
.
prev_category
);
refreshReadonly
(
mainGame
->
deckBuilder
.
prev_category
);
refreshDeckList
();
refreshDeckList
();
refreshReadonly
(
mainGame
->
deckBuilder
.
prev_category
);
mainGame
->
lstDecks
->
setSelected
(
mainGame
->
deckBuilder
.
prev_deck
);
mainGame
->
lstDecks
->
setSelected
(
mainGame
->
deckBuilder
.
prev_deck
);
mainGame
->
PopupElement
(
mainGame
->
wDeckManage
);
mainGame
->
PopupElement
(
mainGame
->
wDeckManage
);
}
}
...
@@ -345,6 +345,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -345,6 +345,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_MANAGE_DECK
:
{
case
BUTTON_MANAGE_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
if
(
is_modified
&&
!
readonly
&&
!
mainGame
->
chkIgnoreDeckChanges
->
isChecked
())
{
if
(
is_modified
&&
!
readonly
&&
!
mainGame
->
chkIgnoreDeckChanges
->
isChecked
())
{
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
SetStaticText
(
mainGame
->
stQMessage
,
370
*
mainGame
->
xScale
,
mainGame
->
guiFont
,
dataManager
.
GetSysString
(
1356
));
mainGame
->
SetStaticText
(
mainGame
->
stQMessage
,
370
*
mainGame
->
xScale
,
mainGame
->
guiFont
,
dataManager
.
GetSysString
(
1356
));
...
@@ -357,6 +358,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -357,6 +358,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_NEW_CATEGORY
:
{
case
BUTTON_NEW_CATEGORY
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1469
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1469
));
mainGame
->
ebDMName
->
setVisible
(
true
);
mainGame
->
ebDMName
->
setVisible
(
true
);
...
@@ -367,6 +369,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -367,6 +369,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_RENAME_CATEGORY
:
{
case
BUTTON_RENAME_CATEGORY
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
if
(
mainGame
->
lstCategories
->
getSelected
()
<
4
)
if
(
mainGame
->
lstCategories
->
getSelected
()
<
4
)
break
;
break
;
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
...
@@ -379,6 +382,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -379,6 +382,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_DELETE_CATEGORY
:
{
case
BUTTON_DELETE_CATEGORY
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1470
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1470
));
mainGame
->
stDMMessage2
->
setVisible
(
true
);
mainGame
->
stDMMessage2
->
setVisible
(
true
);
...
@@ -389,6 +393,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -389,6 +393,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_NEW_DECK
:
{
case
BUTTON_NEW_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1471
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1471
));
mainGame
->
ebDMName
->
setVisible
(
true
);
mainGame
->
ebDMName
->
setVisible
(
true
);
...
@@ -399,6 +404,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -399,6 +404,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_RENAME_DECK
:
{
case
BUTTON_RENAME_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1471
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1471
));
mainGame
->
ebDMName
->
setVisible
(
true
);
mainGame
->
ebDMName
->
setVisible
(
true
);
...
@@ -409,6 +415,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -409,6 +415,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_DELETE_DECK_DM
:
{
case
BUTTON_DELETE_DECK_DM
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1337
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1337
));
mainGame
->
stDMMessage2
->
setVisible
(
true
);
mainGame
->
stDMMessage2
->
setVisible
(
true
);
...
@@ -419,6 +426,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -419,6 +426,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_MOVE_DECK
:
{
case
BUTTON_MOVE_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1472
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1472
));
mainGame
->
cbDMCategory
->
setVisible
(
true
);
mainGame
->
cbDMCategory
->
setVisible
(
true
);
...
@@ -436,6 +444,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -436,6 +444,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_COPY_DECK
:
{
case
BUTTON_COPY_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
gMutex
.
lock
();
mainGame
->
gMutex
.
lock
();
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1473
));
mainGame
->
stDMMessage
->
setText
(
dataManager
.
GetSysString
(
1473
));
mainGame
->
cbDMCategory
->
setVisible
(
true
);
mainGame
->
cbDMCategory
->
setVisible
(
true
);
...
@@ -453,6 +462,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -453,6 +462,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_DM_OK
:
{
case
BUTTON_DM_OK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
switch
(
prev_operation
)
{
switch
(
prev_operation
)
{
case
BUTTON_NEW_CATEGORY
:
{
case
BUTTON_NEW_CATEGORY
:
{
int
catesel
=
0
;
int
catesel
=
0
;
...
@@ -472,19 +482,20 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -472,19 +482,20 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
}
}
}
}
}
}
if
(
mainGame
->
cbCategorySelect
->
getSelected
()
==
-
1
||
mainGame
->
cbDeckSelect
->
getSelected
()
==
-
1
)
//
if(mainGame->cbCategorySelect->getSelected() == -1 || mainGame->cbDeckSelect->getSelected() == -1)
break
;
//
break;
if
(
catesel
>
0
)
{
if
(
catesel
>
0
)
{
mainGame
->
lstCategories
->
setSelected
(
catesel
);
mainGame
->
lstCategories
->
setSelected
(
catesel
);
refreshDeckList
();
refreshDeckList
();
mainGame
->
lstDecks
->
setSelected
(
0
);
mainGame
->
lstDecks
->
setSelected
(
0
);
mainGame
->
cbDBCategory
->
setSelected
(
catesel
);
mainGame
->
cbDBCategory
->
setSelected
(
catesel
);
changeCategory
(
catesel
);
changeCategory
(
catesel
);
//fixme
}
}
break
;
break
;
}
}
case
BUTTON_RENAME_CATEGORY
:
{
case
BUTTON_RENAME_CATEGORY
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
int
catesel
=
mainGame
->
lstCategories
->
getSelected
();
int
catesel
=
mainGame
->
lstCategories
->
getSelected
();
const
wchar_t
*
oldcatename
=
mainGame
->
lstCategories
->
getListItem
(
catesel
);
const
wchar_t
*
oldcatename
=
mainGame
->
lstCategories
->
getListItem
(
catesel
);
const
wchar_t
*
newcatename
=
mainGame
->
ebDMName
->
getText
();
const
wchar_t
*
newcatename
=
mainGame
->
ebDMName
->
getText
();
...
@@ -515,6 +526,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -515,6 +526,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_DELETE_CATEGORY
:
{
case
BUTTON_DELETE_CATEGORY
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
int
catesel
=
mainGame
->
lstCategories
->
getSelected
();
int
catesel
=
mainGame
->
lstCategories
->
getSelected
();
const
wchar_t
*
catename
=
mainGame
->
lstCategories
->
getListItem
(
catesel
);
const
wchar_t
*
catename
=
mainGame
->
lstCategories
->
getListItem
(
catesel
);
if
(
deckManager
.
DeleteCategory
(
catename
))
{
if
(
deckManager
.
DeleteCategory
(
catename
))
{
...
@@ -533,6 +545,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -533,6 +545,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_NEW_DECK
:
{
case
BUTTON_NEW_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
const
wchar_t
*
deckname
=
mainGame
->
ebDMName
->
getText
();
const
wchar_t
*
deckname
=
mainGame
->
ebDMName
->
getText
();
wchar_t
catepath
[
256
];
wchar_t
catepath
[
256
];
deckManager
.
GetCategoryPath
(
catepath
,
mainGame
->
cbDBCategory
->
getSelected
(),
mainGame
->
cbDBCategory
->
getText
());
deckManager
.
GetCategoryPath
(
catepath
,
mainGame
->
cbDBCategory
->
getSelected
(),
mainGame
->
cbDBCategory
->
getText
());
...
@@ -563,6 +576,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -563,6 +576,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_RENAME_DECK
:
{
case
BUTTON_RENAME_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
int
catesel
=
mainGame
->
lstCategories
->
getSelected
();
int
catesel
=
mainGame
->
lstCategories
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
const
wchar_t
*
catename
=
mainGame
->
lstCategories
->
getListItem
(
catesel
);
const
wchar_t
*
catename
=
mainGame
->
lstCategories
->
getListItem
(
catesel
);
...
@@ -597,6 +611,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -597,6 +611,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_DELETE_DECK_DM
:
{
case
BUTTON_DELETE_DECK_DM
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
wchar_t
filepath
[
256
];
wchar_t
filepath
[
256
];
deckManager
.
GetDeckFile
(
filepath
,
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
deckManager
.
GetDeckFile
(
filepath
,
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
...
@@ -612,6 +627,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -612,6 +627,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame
->
cbDBDecks
->
setSelected
(
decksel
);
mainGame
->
cbDBDecks
->
setSelected
(
decksel
);
deckManager
.
LoadDeck
(
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
deckManager
.
LoadDeck
(
mainGame
->
cbDBCategory
,
mainGame
->
cbDBDecks
);
}
}
refreshReadonly
(
prev_category
);
prev_deck
=
decksel
;
prev_deck
=
decksel
;
}
else
{
}
else
{
mainGame
->
stACMessage
->
setText
(
dataManager
.
GetSysString
(
1476
));
mainGame
->
stACMessage
->
setText
(
dataManager
.
GetSysString
(
1476
));
...
@@ -620,6 +636,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -620,6 +636,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_MOVE_DECK
:
{
case
BUTTON_MOVE_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
int
oldcatesel
=
mainGame
->
lstCategories
->
getSelected
();
int
oldcatesel
=
mainGame
->
lstCategories
->
getSelected
();
int
newcatesel
=
mainGame
->
cbDMCategory
->
getSelected
();
int
newcatesel
=
mainGame
->
cbDMCategory
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
...
@@ -660,6 +677,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -660,6 +677,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_COPY_DECK
:
{
case
BUTTON_COPY_DECK
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
int
oldcatesel
=
mainGame
->
lstCategories
->
getSelected
();
int
oldcatesel
=
mainGame
->
lstCategories
->
getSelected
();
int
newcatesel
=
mainGame
->
cbDMCategory
->
getSelected
();
int
newcatesel
=
mainGame
->
cbDMCategory
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
int
decksel
=
mainGame
->
lstDecks
->
getSelected
();
...
@@ -708,6 +726,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -708,6 +726,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_DM_CANCEL
:
{
case
BUTTON_DM_CANCEL
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
HideElement
(
mainGame
->
wDMQuery
);
mainGame
->
HideElement
(
mainGame
->
wDMQuery
);
mainGame
->
stDMMessage2
->
setVisible
(
false
);
mainGame
->
stDMMessage2
->
setVisible
(
false
);
mainGame
->
ebDMName
->
setVisible
(
false
);
mainGame
->
ebDMName
->
setVisible
(
false
);
...
@@ -715,6 +734,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -715,6 +734,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break
;
break
;
}
}
case
BUTTON_CLOSE_DECKMANAGER
:
{
case
BUTTON_CLOSE_DECKMANAGER
:
{
mainGame
->
soundEffectPlayer
->
doPressButton
();
mainGame
->
HideElement
(
mainGame
->
wDeckManage
);
mainGame
->
HideElement
(
mainGame
->
wDeckManage
);
break
;
break
;
}
}
...
...
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