合并贴图&优化禁卡表下拉选择

Classes/gframe/drawing.cpp

@@ -1175,13 +1175,13 @@ void Game::DrawDeckBd() {
 	driver->draw2DRectangle(recti(638 * mainGame->xScale, 137 * mainGame->yScale, 797 * mainGame->xScale, 157 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
 	driver->draw2DRectangleOutline(recti(637 * mainGame->xScale, 136 * mainGame->yScale, 797 * mainGame->xScale, 157 * mainGame->yScale));
 	//monster count
-	driver->draw2DImage(imageManager.tMonster, recti(645 * mainGame->xScale, 136 * mainGame->yScale, 665 * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(645 * mainGame->xScale, 136 * mainGame->yScale, (645+14+3/8) * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 23, 32), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_MONSTER)], recti(670 * mainGame->xScale, 137 * mainGame->yScale, 690 * mainGame->xScale, 157 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	//spell count
-	driver->draw2DImage(imageManager.tSpell, recti(695 * mainGame->xScale, 136 * mainGame->yScale, 715 * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(695 * mainGame->xScale, 136 * mainGame->yScale, (695+14+3/8) * mainGame->xScale, 156 * mainGame->yScale), recti(23, 0, 46, 32), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_SPELL)], recti(720 * mainGame->xScale, 138 * mainGame->yScale, 740 * mainGame->xScale, 158 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
     //trap count
-	driver->draw2DImage(imageManager.tTrap, recti(745 * mainGame->xScale, 136 * mainGame->yScale, 765 * mainGame->xScale, 156 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(745 * mainGame->xScale, 136 * mainGame->yScale, (745+14+3/8) * mainGame->xScale, 156 * mainGame->yScale), recti(46, 0, 69, 32), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.main, TYPE_TRAP)], recti(770 * mainGame->xScale, 137 * mainGame->yScale, 790 * mainGame->xScale, 157 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
     int lx;
 	float dx;
@@ -1210,16 +1210,16 @@ void Game::DrawDeckBd() {
 	driver->draw2DRectangle(recti(582 * mainGame->xScale, 440 * mainGame->yScale, 797 * mainGame->xScale, 460 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
 	driver->draw2DRectangleOutline(recti(581 * mainGame->xScale, 439 * mainGame->yScale, 797 * mainGame->xScale, 460 * mainGame->yScale));
 	//fusion count
-	driver->draw2DImage(imageManager.tFusion, recti(595 * mainGame->xScale, 440 * mainGame->yScale, 615 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(595 * mainGame->xScale, 440 * mainGame->yScale, (595+14+3/8) * mainGame->xScale, 460 * mainGame->yScale), recti(0, 32, 23, 64), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_FUSION)], recti(620 * mainGame->xScale, 440 * mainGame->yScale, 640 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	//synchro count
-	driver->draw2DImage(imageManager.tSynchro, recti(645 * mainGame->xScale, 440 * mainGame->yScale, 665 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(645 * mainGame->xScale, 440 * mainGame->yScale, (645+14+3/8) * mainGame->xScale, 460 * mainGame->yScale), recti(23, 32, 46, 64), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_SYNCHRO)], recti(670 * mainGame->xScale, 440 * mainGame->yScale, 690 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	//XYZ count
-	driver->draw2DImage(imageManager.tXyz, recti(695 * mainGame->xScale, 440 * mainGame->yScale, 715 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(695 * mainGame->xScale, 440 * mainGame->yScale, (695+14+3/8) * mainGame->xScale, 460 * mainGame->yScale), recti(46, 32, 69, 64), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_XYZ)], recti(720 * mainGame->xScale, 440 * mainGame->yScale, 740 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	//link count
-	driver->draw2DImage(imageManager.tLink, recti(745 * mainGame->xScale, 440 * mainGame->yScale, 765 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(745 * mainGame->xScale, 440 * mainGame->yScale, (745+14+3/8) * mainGame->xScale, 460 * mainGame->yScale), recti(0, 64, 23, 96), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.extra, TYPE_LINK)], recti(770 * mainGame->xScale, 440 * mainGame->yScale, 790 * mainGame->xScale, 460 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	if(deckManager.current_deck.extra.size() <= 10)
 		dx = 436.0f / 9;
@@ -1242,13 +1242,13 @@ void Game::DrawDeckBd() {
 	driver->draw2DRectangle(recti(638 * mainGame->xScale, 537 * mainGame->yScale, 797 * mainGame->xScale, 557 * mainGame->yScale), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
 	driver->draw2DRectangleOutline(recti(637 * mainGame->xScale, 536 * mainGame->yScale, 797 * mainGame->xScale, 557 * mainGame->yScale));
 	//monster count
-	driver->draw2DImage(imageManager.tMonster, recti(645 * mainGame->xScale, 537 * mainGame->yScale, 665 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(645 * mainGame->xScale, 537 * mainGame->yScale, (645+14+3/8) * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 23, 32), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.side, TYPE_MONSTER)], recti(670 * mainGame->xScale, 537 * mainGame->yScale, 690 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	//spell count
-	driver->draw2DImage(imageManager.tSpell, recti(695 * mainGame->xScale, 537 * mainGame->yScale, 715 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(695 * mainGame->xScale, 537 * mainGame->yScale, (695+14+3/8) * mainGame->xScale, 557 * mainGame->yScale), recti(23, 0, 46, 32), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.side, TYPE_SPELL)], recti(720 * mainGame->xScale, 537 * mainGame->yScale, 740 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
     //trap count
-	driver->draw2DImage(imageManager.tTrap, recti(745 * mainGame->xScale, 537 * mainGame->yScale, 765 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 0, 34, 34), 0, 0, true);
+	driver->draw2DImage(imageManager.tCardType, recti(745 * mainGame->xScale, 537 * mainGame->yScale, (745+14+3/8) * mainGame->xScale, 557 * mainGame->yScale), recti(46, 0, 69, 32), 0, 0, true);
 	DrawShadowText(numFont, dataManager.numStrings[deckManager.TypeCount(deckManager.current_deck.side, TYPE_TRAP)], recti(770 * mainGame->xScale, 537 * mainGame->yScale, 790 * mainGame->xScale, 557 * mainGame->yScale), recti(0, 1 * mainGame->yScale, 2 * mainGame->xScale, 0), 0xffffffff, 0xff000000, true, false);
 	if(deckManager.current_deck.side.size() <= 10)
 		dx = 436.0f / 9;

Classes/gframe/image_manager.cpp

@@ -29,13 +29,7 @@ bool ImageManager::Initial(const path dir) {
 	tHand[2] = driver->getTexture((dir + path("/textures/f3.jpg")).c_str());
 	tBackGround = driver->getTexture((dir + path("/textures/bg.jpg")).c_str());
 	tBackGround_menu = driver->getTexture((dir + path("/textures/bg_menu.jpg")).c_str());
-	tMonster = driver->getTexture((dir + path("/textures/card/monster.png")).c_str());
-	tSpell = driver->getTexture((dir + path("/textures/card/spell.png")).c_str());
-	tTrap = driver->getTexture((dir + path("/textures/card/trap.png")).c_str());
-	tFusion = driver->getTexture((dir + path("/textures/card/fusion.png")).c_str());
-	tSynchro = driver->getTexture((dir + path("/textures/card/synchro.png")).c_str());
-	tXyz = driver->getTexture((dir + path("/textures/card/xyz.png")).c_str());
-	tLink = driver->getTexture((dir + path("/textures/card/link.png")).c_str());
+	tCardType = driver->getTexture((dir + path("/textures/cardtype.png")).c_str());
 	if(!tBackGround_menu)
 		tBackGround_menu = tBackGround;
 	tBackGround_deck = driver->getTexture((dir + path("/textures/bg_deck.jpg")).c_str());

Classes/gframe/image_manager.h

@@ -50,13 +50,7 @@ public:
 	irr::video::ITexture* tRScale[14];
 	irr::video::ITexture* tLScale[14];
 	irr::video::ITexture* tClock;
-	irr::video::ITexture* tMonster;
-	irr::video::ITexture* tSpell;
-	irr::video::ITexture* tTrap;
-	irr::video::ITexture* tFusion;
-	irr::video::ITexture* tSynchro;
-	irr::video::ITexture* tXyz;
-	irr::video::ITexture* tLink;
+	irr::video::ITexture* tCardType;
 	std::list<std::string> support_types;
 };
 

mobile/assets/changelog.html

@@ -24,16 +24,18 @@
     1.更新ygo内核；
     2.完善卡组编辑数量统计；
     优化：
-    1.启动ygo时增加tips；
+    1.启动ygo时增加小贴士
+     （对不看教程的玩家绝望了！）；
     2.完善版本号显示；
     3.修改功能按钮位置；
     4.微调UI；
-    5.默认开启额外卡库-可用PC先行补丁；
+    5.默认开启额外卡库-通用PC先行补丁；
     修复：
     1.完善全面屏机型适配策略；
     2.部分机型无法萌卡匹配的问题；
     3.一些机型总是误清除数据库的问题；
     4.回合时间图标错误；
+    5.禁卡表下拉菜单多方显示；
 </pre>
 <ul>
     <li style="color:#ffffff">3.3.1</li>

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 33020625
+        versionCode 33020626
         versionName "3.3.2"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java

@@ -87,6 +87,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
         mDeckSpinner = $(R.id.toolbar_list);
         mDeckSpinner.setPopupBackgroundResource(R.color.colorNavy);
         mLimitSpinner = $(R.id.sp_limit_list);
+        mLimitSpinner.setPopupBackgroundResource(R.color.colorNavy);
         mRecyclerView = $(R.id.grid_cards);
         mRecyclerView.setPadding(mRecyclerView.getPaddingLeft(), 0, mRecyclerView.getPaddingRight(), mRecyclerView.getPaddingBottom());
         mRecyclerView.setAdapter((mDeckAdapater = new DeckAdapater(this, mRecyclerView, getImageLoader())));

mobile/src/main/res/layout/activity_deck_cards.xml

@@ -118,9 +118,7 @@
                 <android.support.v7.widget.AppCompatSpinner
                     android:id="@+id/sp_limit_list"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/item_height"
-                    app:popupTheme="@style/AppTheme.PopupOverlay.Bule"
-                    />
+                    android:layout_height="@dimen/item_height" />
             </LinearLayout>
 
             <com.tubb.smrv.SwipeMenuRecyclerView