Merge branch 'fallenstardust:master' into master

Classes/gframe/game.cpp

@@ -21,7 +21,7 @@
 #include <COGLESDriver.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x1354;
+const unsigned short PRO_VERSION = 0x1360;
 
 namespace ygo {
 
@@ -207,6 +207,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
 	driver->setTextureCreationFlag(irr::video::ETCF_OPTIMIZED_FOR_QUALITY, true);
 
 	imageManager.SetDevice(device);
+	imageManager.ClearTexture();
 	if(!imageManager.Initial(workingDir))
 		return false;
 	// LoadExpansions only load zips, the other cdb databases are still loaded by getDBFiles
@@ -809,7 +810,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
 		chkAttribute[i] = env->addCheckBox(false, rect<s32>((50 + (i % 4) * 80) * xScale, (60 + (i / 4) * 55) * yScale, (130 + (i % 4) * 80) * xScale, (90 + (i / 4) * 55) * yScale),
 		                                   wANAttribute, CHECK_ATTRIBUTE, dataManager.FormatAttribute(filter));
 	//announce race
-	wANRace = env->addWindow(rect<s32>(500 * xScale, 50 * yScale, 800 * xScale, 550 * yScale), false, dataManager.GetSysString(563));
+	wANRace = env->addWindow(rect<s32>(500 * xScale, 40 * yScale, 800 * xScale, 560 * yScale), false, dataManager.GetSysString(563));
 	wANRace->getCloseButton()->setVisible(false);
 	wANRace->setVisible(false);
 	    ChangeToIGUIImageWindow(wANRace, &bgANRace, imageManager.tDialog_S);
@@ -1016,15 +1017,16 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
 		btnClearFilter = env->addButton(rect<s32>(205 * xScale, (80 + 125 / 6) * yScale, 255 * xScale, (100 + 125 / 6) * yScale), wFilter, BUTTON_CLEAR_FILTER, dataManager.GetSysString(1304));
 			ChangeToIGUIImageButton(btnClearFilter, imageManager.tButton_S, imageManager.tButton_S_pressed);
 	}
-	wCategories = env->addWindow(rect<s32>(630 * xScale, 60 * yScale, 1000 * xScale, 270 * yScale), false, L"");
+	wCategories = env->addWindow(rect<s32>(600 * xScale, 60 * yScale, 1000 * xScale, 440 * yScale), false, L"");
 	wCategories->getCloseButton()->setVisible(false);
 	wCategories->setDrawTitlebar(false);
 	wCategories->setDraggable(false);
 	wCategories->setVisible(false);
-	    ChangeToIGUIImageWindow(wCategories, &bgCategories, imageManager.tDialog_L);
-	btnCategoryOK = env->addButton(rect<s32>(135 * xScale, 175 * yScale, 235 * xScale, 200 * yScale), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
-	for(int i = 0; i < 32; ++i)
-		chkCategory[i] = env->addCheckBox(false, recti((10 + (i % 4) * 90)  * xScale, (10 + (i / 4) * 20) * yScale, (100 + (i % 4) * 90) * xScale, (40 + (i / 4) * 20) * yScale), wCategories, -1, dataManager.GetSysString(1100 + i));
+	    ChangeToIGUIImageWindow(wCategories, &bgCategories, imageManager.tWindow_V);
+	btnCategoryOK = env->addButton(rect<s32>(135 * xScale, 340 * yScale, 235 * xScale, 370 * yScale), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
+        ChangeToIGUIImageButton(btnCategoryOK, imageManager.tButton_L, imageManager.tButton_L_pressed);
+    for(int i = 0; i < 32; ++i)
+		chkCategory[i] = env->addCheckBox(false, recti((20 + (i % 4) * 90)  * xScale, (10 + (i / 4) * 40) * yScale, (120 + (i % 4) * 90) * xScale, (40 + (i / 4) * 40) * yScale), wCategories, -1, dataManager.GetSysString(1100 + i));
 	scrFilter = env->addScrollBar(false, recti(980 * xScale, 159 * yScale, 1020 * xScale, 629 * yScale), 0, SCROLL_FILTER);
 	scrFilter->setLargeStep(10);
 	scrFilter->setSmallStep(1);
@@ -1812,7 +1814,7 @@ void Game::SaveConfig() {
 	gameConf.chkDefaultShowChain = chkDefaultShowChain->isChecked() ? 1 : 0;
 	    android::saveIntSetting(appMain, "chkDefaultShowChain", gameConf.chkDefaultShowChain);
 	gameConf.hide_player_name  = chkHidePlayerName->isChecked() ? 1 : 0;
-		android::saveIntSetting(appMain, "chkHidePlayerName", gameConf.chkDefaultShowChain);
+		android::saveIntSetting(appMain, "chkHidePlayerName", gameConf.hide_player_name);
 //gameConf.control_mode = control_mode->isChecked()?1:0;
 //	  android::saveIntSetting(appMain, "control_mode", gameConf.control_mode);
 }
@@ -2091,4 +2093,4 @@ void Game::OnGameClose() {
 	android::onGameExit(appMain);
     this->device->closeDevice();
 }
-}
+}
\ No newline at end of file

mobile/assets/changelog.html

@@ -16,20 +16,22 @@
     特别感谢： 尸体233,废话多,大毛, zhuhongbo, JSY1728, 幻兽L 等的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.10.9</li>
+    <li style="color:#ffff00">3.11.0</li>
 </ul>
 <pre>
     更新：
     1.更新ygopro内核；
-    2.新卡T1112+MAZE+VX03+DBWS+VJ等；
-    3.2023.4OCG禁卡表；
-    4.放大文字和微调部分UI；
-    5.新增人机卡组：救祓少女；
-    6.新增残局；
+    2.新卡1201+T1112+VJ等；
+    3.内置卡图分辨率提高到200x290；
+    4.微调部分UI；
+    5.增加幻想魔族；
+    6.ygopro版本号1036.0
     变更：
-    1.修正没有卡组或者一些场景无法读取卡组时时打开卡组编辑错误退出的问题；
-    2.从ygopro退出后切换到卡组编辑将重新加载最后使用的卡组；
-    3.修正卡包展示中先行卡展示卡堆统计数量错误的问题；
+    1.修正启动ygopro后竖屏界面卡片详情图片不加载的问题；
+    2.加速动画单独增加按钮；
+    3.修正收藏夹被清空时异常问题；
+    4.为新安装用户添加2333约战服；
+    5.为新安装用户默认开启拓展卡包；
 </pre>
 <h3 style="color:#ff0000">注意</h3>
 <pre>

mobile/assets/data/conf/strings.conf

@@ -690,7 +690,7 @@
 !setname 0x16 机人	ロイド
 !setname 0x1016 交通机人	ビークロイド
 !setname 0x2016 疾行机人	スピードロイド
-#!setname 0x17 同调	シンクロ
+!setname 0x17 同调	シンクロ
 !setname 0x1017 同调士	シンクロン
 !setname 0x2017 同调龙	シンクロ・ドラゴン
 !setname 0x18 云魔物	雲魔物
@@ -703,7 +703,8 @@
 !setname 0x1e 茧状体	C（コクーン）
 !setname 0x1f 新空间侠	N（ネオスペーシアン）
 !setname 0x20 紫炎	紫炎
-!setname 0x21 地缚神	地縛神
+!setname 0x21 地缚	地縛
+!setname 0x1021 地缚神	地縛神
 !setname 0x22 朱罗纪	ジュラック
 !setname 0x23 罪	Sin
 !setname 0x24 废铁	スクラップ
@@ -823,6 +824,7 @@
 !setname 0x107a 圣骑士	聖騎士（せいきし）
 !setname 0x207a 圣剑	聖剣（せいけん）
 !setname 0x507a 焰圣骑士	焔聖騎士
+!setname 0x607a 焰圣剑	焔聖剣
 !setname 0x7b 银河	ギャラクシー
 !setname 0x107b 银河眼	ギャラクシーアイズ
 !setname 0x307b 银河眼时空龙	ギャラクシーアイズ・タキオン・ドラゴン
@@ -841,7 +843,9 @@
 !setname 0x82 怒怒怒	ドドド
 !setname 0x83 人偶	パペット
 !setname 0x1083 机关傀儡	ギミック・パペット
-!setname 0x84 燃烧拳击手	BK（バーニングナックラー）
+#setname 0x84 燃烧拳	バーニングナック
+!setname 0x1084 燃烧拳击手	BK（バーニングナックラー）
+!setname 0x2084 燃烧拳	バーニングナックル
 !setname 0x85 超级防卫机器人	SDロボ
 !setname 0x86 光天使
 !setname 0x87 阴影	アンブラル
@@ -1176,3 +1180,5 @@
 !setname 0x195 征服斗魂	VS（ヴァンキッシュ・ソウル）
 !setname 0x196 新式魔厨	ヌーベルズ
 !setname 0x197 食谱	レシピ
+!setname 0x198 维萨斯	ヴィサス
+!setname 0x199 反击	カウンター

mobile/assets/en/data/conf/strings.conf

@@ -181,7 +181,7 @@
 !system 1042 Creator God
 !system 1043 Wyrm
 !system 1044 Cyberse
-!system 1045 Illusionist
+!system 1045 Illusion
 !system 1050 Monster
 !system 1051 Spell
 !system 1052 Trap
@@ -336,6 +336,7 @@
 !system 1283 Drawing field spell
 !system 1287 Show Chain 1
 !system 1288 Ban List
+!system 1289 Hide nickname
 !system 1290 Disable Chatting
 !system 1291 Mute spectators
 !system 1292 Ignore chain
@@ -699,7 +700,8 @@
 !setname 0x1e Chrysalis
 !setname 0x1f Neo-Spacian
 !setname 0x20 Shien
-!setname 0x21 Earthbound Immortal
+!setname 0x21 Earthbound
+!setname 0x1021 Earthbound Immortal
 !setname 0x22 Jurrac
 !setname 0x23 Malefic
 !setname 0x24 Scrap
@@ -814,10 +816,11 @@
 !setname 0x77 Atlantean
 !setname 0x78 Nimble
 !setname 0x79 Fire Fist
-!setname 0x7a Ignoble Knight
+#setname 0x7a Noble
 !setname 0x107a Noble Knight
 !setname 0x207a Noble Arms
 !setname 0x507a Infernoble Knight
+!setname 0x607a Infernoble Arms
 !setname 0x7b Galaxy
 !setname 0x107b Galaxy-Eyes
 !setname 0x307b Galaxy-Eyes Tachyon
@@ -836,7 +839,9 @@
 !setname 0x82 Dododo
 !setname 0x83 Puppet
 !setname 0x1083 Gimmick Puppet
-!setname 0x84 Battlin' Boxer
+#setname 0x84 Battlin' Box
+!setname 0x1084 Battlin' Boxer
+!setname 0x2084 Battlin' Boxing
 !setname 0x85 Super-Defense
 !setname 0x86 Star Seraph
 !setname 0x87 Umbrals
@@ -1167,4 +1172,6 @@
 !setname 0x194 Favorite
 !setname 0x195 Vanquish Soul
 !setname 0x196 Nouvellez
-!setname 0x197 Recipe
+!setname 0x197 Recipe
\ No newline at end of file
+!setname 0x198 Visas
+!setname 0x199 Counter
\ No newline at end of file

mobile/assets/kor/data/conf/strings.conf

@@ -336,6 +336,7 @@
 !system 1283 필드 마법 그리기
 !system 1287 체인 1만 애니메이션 표시
 !system 1288 금지/제한
+!system 1289 플레이어 닉네임 숨기기
 !system 1290 상대 메시지 무시
 !system 1291 관전자 메시지 무시
 !system 1292 체인: OFF
@@ -1120,6 +1121,7 @@
 !setname 0x160 머티리어크톨
 !setname 0x161 명세계
 !setname 0x162 도레미코드
+!setname 0x1162 그랜도레미코드
 !setname 0x163 베어루크티
 !setname 0x164 데스피아
 !setname 0x165 마건
@@ -1177,3 +1179,5 @@
 !setname 0x195 VS(뱅퀴시 소울)
 !setname 0x196 누밸즈
 !setname 0x197 요리법
+!setname 0x198 비서스
+!setname 0x199 카운터

mobile/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 311000946
+        versionCode 311000947
         versionName "3.11.0"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

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

@@ -53,6 +53,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
     long exitLasttime = 0;
 
     private HomeActivity activity;
+    protected CardLoader mCardLoader;
     protected DrawerLayout mDrawerlayout;
     protected CardSearcher mCardSelector;
     protected CardListAdapter mCardListAdapter;
@@ -90,15 +91,16 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         mListView.setAdapter(mCardListAdapter);
         Button btn_search = layoutView.findViewById(R.id.btn_search);
         btn_search.setOnClickListener((v) -> showSearch(true));
-        activity.getCardLoader().setCallBack(this);
-        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), activity.getCardLoader());
+        mCardLoader = new CardLoader(getContext());
+        mCardLoader.setCallBack(this);
+        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
         mCardSelector.setCallBack(this);
         setListeners();
         DialogPlus dlg = DialogPlus.show(getContext(), null, getString(R.string.loading));
         VUiKit.defer().when(() -> {
             DataManager.get().load(true);
             if (activity.getmLimitManager().getCount() > 0) {
-                activity.getCardLoader().setLimitList(activity.getmLimitManager().getTopLimit());
+                mCardLoader.setLimitList(activity.getmLimitManager().getTopLimit());
             }
         }).fail((e) -> {
             Toast.makeText(getContext(), R.string.tip_load_cdb_error, Toast.LENGTH_SHORT).show();
@@ -106,7 +108,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         }).done((rs) -> {
             dlg.dismiss();
             isLoad = true;
-            activity.getCardLoader().loadData();
+            mCardLoader.loadData();
             mCardSelector.initItems();
             //数据库初始化完毕后搜索被传入的关键字
             intentSearch(intentSearchMessage);

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

@@ -111,6 +111,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     private static final String TAG = "DeckManagerFragment";
     protected DrawerLayout mDrawerLayout;
     protected RecyclerView mListView;
+    protected CardLoader mCardLoader;
     protected CardSearcher mCardSelector;
     protected CardListAdapter mCardListAdapter;
     protected boolean isLoad = false;
@@ -163,8 +164,9 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         mListView.setAdapter(mCardListAdapter);
         setListeners();
 
-        activity.getCardLoader().setCallBack(this);
-        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), activity.getCardLoader());
+        mCardLoader = new CardLoader(getContext());
+        mCardLoader.setCallBack(this);
+        mCardSelector = new CardSearcher(layoutView.findViewById(R.id.nav_view_list), mCardLoader);
         mCardSelector.setCallBack(this);
 
         tv_deck = layoutView.findViewById(R.id.tv_deck);
@@ -360,14 +362,14 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 
     //region load deck
     private void loadDeckFromFile(File file) {
-        if (!activity.getCardLoader().isOpen() || file == null || !file.exists()) {
+        if (!mCardLoader.isOpen() || file == null || !file.exists()) {
             setCurDeck(new DeckInfo(), false);
             return;
         }
         DialogPlus dlg = DialogPlus.show(getContext(), null, getString(R.string.loading));
         VUiKit.defer().when(() -> {
-            if (activity.getCardLoader().isOpen() && file.exists()) {
-                return mDeckAdapater.read(activity.getCardLoader(), file, activity.getCardLoader().getLimitList());
+            if (mCardLoader.isOpen() && file.exists()) {
+                return mDeckAdapater.read(mCardLoader, file, mCardLoader.getLimitList());
             } else {
                 return new DeckInfo();
             }
@@ -384,7 +386,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             DataManager.get().load(true);
             //默认第一个卡表
             if (activity.getmLimitManager().getCount() > 0) {
-                activity.getCardLoader().setLimitList(activity.getmLimitManager().getTopLimit());
+                mCardLoader.setLimitList(activity.getmLimitManager().getTopLimit());
             }
             File file = ydk;
             if (file == null || !file.exists()) {
@@ -399,8 +401,8 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                 return new DeckInfo();
             }
             Log.i(TAG, "load ydk " + file);
-            if (activity.getCardLoader().isOpen() && file.exists()) {
-                return mDeckAdapater.read(activity.getCardLoader(), file, activity.getCardLoader().getLimitList());
+            if (mCardLoader.isOpen() && file.exists()) {
+                return mDeckAdapater.read(mCardLoader, file, mCardLoader.getLimitList());
             } else {
                 return new DeckInfo();
             }
@@ -408,7 +410,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             isLoad = true;
             dlg.dismiss();
             mCardSelector.initItems();
-            initLimitListSpinners(mLimitSpinner, activity.getCardLoader().getLimitList());
+            initLimitListSpinners(mLimitSpinner, mCardLoader.getLimitList());
             //设置当前卡组
             if (rs.source != null) {
                 setCurDeck(rs, rs.source.getParent().equals(mSettings.getPackDeckDir()));

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java

@@ -218,9 +218,17 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
         });
         tv_banner_loading = view.findViewById(R.id.tv_banner_loading);
         tv_banner_loading.setOnClickListener(this);
-        xb_banner.setOnItemClickListener((banner, model, v, position) ->
-                WebActivity.open(getContext(), getString(R.string.McNews), mcNewsList.get(position).getNews_url())
-        );
+        xb_banner.setOnItemClickListener((banner, model, v, position) -> {
+            String newsUrl = mcNewsList.get(position).getNews_url();
+            if (newsUrl.startsWith(MyCard.MYCARD_POST_URL)) {
+                WebActivity.open(getContext(), getString(R.string.McNews), newsUrl);
+            } else {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse(newsUrl));
+                startActivity(intent);
+            }
+
+        });
         xb_banner.loadImage((banner, model, v, position) -> {
             TextView tv_time, tv_title, tv_type;
             ImageView iv_image;