Skip to content

Y
ygopro
Commit 863316e2 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of github.com:Fluorohydride/ygopro

parents 8b6a63bb 111222aa
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
gframe/deck_con.cpp
View file @ 863316e2
...@@ -144,8 +144,8 @@ inline void ShowBigCard(int code, float zoom) { ...@@ -144,8 +144,8 @@ inline void ShowBigCard(int code, float zoom) {
inline void ZoomBigCard(s32 centerx = -1, s32 centery = -1) { inline void ZoomBigCard(s32 centerx = -1, s32 centery = -1) {
if(mainGame->deckBuilder.bigcard_zoom >= 4) if(mainGame->deckBuilder.bigcard_zoom >= 4)
mainGame->deckBuilder.bigcard_zoom = 4; mainGame->deckBuilder.bigcard_zoom = 4;
if(mainGame->deckBuilder.bigcard_zoom <= 0.2) if(mainGame->deckBuilder.bigcard_zoom <= 0.2f)
mainGame->deckBuilder.bigcard_zoom = 0.2; mainGame->deckBuilder.bigcard_zoom = 0.2f;
ITexture* img = imageManager.GetBigPicture(mainGame->deckBuilder.bigcard_code, mainGame->deckBuilder.bigcard_zoom); ITexture* img = imageManager.GetBigPicture(mainGame->deckBuilder.bigcard_code, mainGame->deckBuilder.bigcard_zoom);
mainGame->imgBigCard->setImage(img); mainGame->imgBigCard->setImage(img);
auto size = img->getSize(); auto size = img->getSize();
...@@ -810,12 +810,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -810,12 +810,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_BIG_CARD_ZOOM_IN: { case BUTTON_BIG_CARD_ZOOM_IN: {
bigcard_zoom += 0.2; bigcard_zoom += 0.2f;
ZoomBigCard(); ZoomBigCard();
break; break;
} }
case BUTTON_BIG_CARD_ZOOM_OUT: { case BUTTON_BIG_CARD_ZOOM_OUT: {
bigcard_zoom -= 0.2; bigcard_zoom -= 0.2f;
ZoomBigCard(); ZoomBigCard();
break; break;
} }
......
lflist.conf
View file @ 863316e2
#[2021.1][2020.12 TCG][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1] #[2021.1][2020.12 TCG][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
!2021.1 !2021.1
#forbidden #forbidden
62472614 0 --疫病(tmp)
91869203 0 --アマゾネスの射手 91869203 0 --アマゾネスの射手
20663556 0 --イレカエル 20663556 0 --イレカエル
44910027 0 --ヴィクトリー・ドラゴン 44910027 0 --ヴィクトリー・ドラゴン
......
strings.conf
View file @ 863316e2
...@@ -635,6 +635,7 @@ ...@@ -635,6 +635,7 @@
!counter 0x58 指示物（祢须三破鸣比） !counter 0x58 指示物（祢须三破鸣比）
!counter 0x59 落魂指示物 !counter 0x59 落魂指示物
!counter 0x5a 指示物（岩战之试炼） !counter 0x5a 指示物（岩战之试炼）
!counter 0x5b 指示物（北极天熊北斗星）
#setnames, using tab for comment #setnames, using tab for comment
!setname 0x1 正义盟军 A・O・J !setname 0x1 正义盟军 A・O・J
!setname 0x2 次世代 ジェネクス !setname 0x2 次世代 ジェネクス
...@@ -1095,3 +1096,6 @@ ...@@ -1095,3 +1096,6 @@
!setname 0x15e 降阶魔法 RDM !setname 0x15e 降阶魔法 RDM
!setname 0x15f 岩战 War Rock !setname 0x15f 岩战 War Rock
!setname 0x160 源质兽 Materiactor !setname 0x160 源质兽 Materiactor
!setname 0x161 溟界
!setname 0x162 七音服 ドレミコード
!setname 0x163 北极天熊 ベアルクティ
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment