fx

weihuoya · Jan 13, 2022 · 718c091 · 718c091
1 parent c23734e
commit 718c091
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/src/android/app/src/main/assets/3dstdb-zh_CN.txt b/src/android/app/src/main/assets/3dstdb-zh_CN.txt
@@ -26,10 +26,14 @@
 000400000007C800 = 马里奥网球公开赛
 0004000000064D00 = 马里奥网球公开赛
 00040000000B9100 = 马里奥网球公开赛
+000400000013BB00 = 马里奥医生 消灭细菌
 00040000000DCD00 = 马里奥高尔夫 世界巡回赛
 00040000000A5300 = 马里奥高尔夫 世界巡回赛
 00040000000DCE00 = 马里奥高尔夫 世界巡回赛
 000400000017E200 = 马里奥&索尼克 里约2016奥运会
+000400000019BE00 = 马里奥聚会 群星冲刺
+00040000000F8200 = 马里奥聚会 空岛之旅
+00040000001D1C00 = 瓦力欧制造
 000400000F700100 = 异度之刃
 000400000F700200 = 异度之刃
 000400000F700000 = 异度之刃
@@ -181,6 +185,7 @@
 0004001000021700 = Mii Maker
 0004000000047B00 = 纳米突击
 000400000018EB00 = 热血物语 SP
+000400000012B600 = 热血魔法物语
 0004000000190E00 = 太鼓达人 神秘大冒险
 0004000000090F00 = 太鼓达人 小龙与神秘宝珠
 0004000000102F00 = 太鼓达人 咚咔的时空大冒险
@@ -207,6 +212,7 @@
 000400000014FC00 = 交叉领域计划 2
 0004000000160C00 = 交叉领域计划 2
 0004000000162000 = 交叉领域计划 2
+00040000000BA900 = 宝可梦不可思议迷宫
 000400000011C500 = 精灵宝可梦 始源蓝宝石
 000400000011C400 = 精灵宝可梦 终极红宝石
 00040000001B5000 = 精灵宝可梦 究极之日
@@ -310,6 +316,9 @@
 00040000000EC200 = 塞尔达传说 众神的三角力量2
 00040000000EC300 = 塞尔达传说 众神的三角力量2
 00040000000EC400 = 塞尔达传说 众神的三角力量2
+0004000000177000 = 塞尔达传说 三角力量英雄
+0004000000176E00 = 塞尔达传说 三角力量英雄
+0004000000176F00 = 塞尔达传说 三角力量英雄
 0004000000140800 = 魔女与勇者 2
 0004000000172000 = Xeodrifter
 000400000F707F00 = 超越光速 EX

diff --git a/src/android/app/src/main/java/org/citra/emu/ui/EditorActivity.java b/src/android/app/src/main/java/org/citra/emu/ui/EditorActivity.java
@@ -305,24 +305,26 @@ private void deleteAppSdmc() {
             String subid = mGameId.substring(8).toLowerCase();
             if (pid.equals("00040010") || pid.equals("00040030")) {
                 String system = CitraDirectory.getSystemTitleDirectory();
-                String path = system + "/" + pid + "/" + subid;
+                String path = String.format("%s/%s/%s", system, pid, subid);
                 deleteContents(new File(path));
             } else if (pid.equals("00040000")) {
+                // App
                 String root = CitraDirectory.getApplicationDirectory();
-                String path = root + "/" + pid + "/" + subid;
+                String path = String.format("%s/%s/%s/content", root, pid, subid);
                 deleteContents(new File(path));
-
-                // DLC
-                path = root + "/0004000e/" + subid;
+                // Updates
+                path = String.format("%s/0004000e/%s/content", root, subid);
                 deleteContents(new File(path));
-
-                // DLC
-                path = root + "/0004008c/" + subid;
+                // DLCs
+                path = String.format("%s/0004008c/%s/content", root, subid);
                 deleteContents(new File(path));
-            } else if (pid.equals("0004000e")) {
-                // DLC
+            } else if (pid.equals("0004000e") || pid.equals("0004008c")) {
+                // Updates
                 String root = CitraDirectory.getApplicationDirectory();
-                String path = root + "/" + pid + "/" + subid;
+                String path = String.format("%s/0004000e/%s/content", root, subid);
+                deleteContents(new File(path));
+                // DLCs
+                path = String.format("%s/0004008c/%s/content", root, subid);
                 deleteContents(new File(path));
             }
             Toast.makeText(this, "Delete Success!", Toast.LENGTH_LONG).show();

diff --git a/src/android/app/src/main/java/org/citra/emu/ui/MainActivity.java b/src/android/app/src/main/java/org/citra/emu/ui/MainActivity.java
@@ -152,7 +152,7 @@ protected void refreshDirectoryLegacy(List<File> dirs) {
                             if (isInstalled) {
                                 if (game.isInstalledDLC()) {
                                     contents.add(game);
-                                } else {
+                                } else if (NativeLibrary.IsAppExecutable(path)) {
                                     installs.add(game);
                                 }
                             } else {
@@ -431,7 +431,9 @@ protected void onCreate(Bundle savedInstanceState) {
         mViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
             public void onPageScrollStateChanged(int state) {
-                mSwipeRefresh.setEnabled(state == ViewPager2.SCROLL_STATE_IDLE);
+                if (!mSwipeRefresh.isRefreshing()) {
+                    mSwipeRefresh.setEnabled(state == ViewPager2.SCROLL_STATE_IDLE);
+                }
             }
 
             @Override

diff --git a/src/android/app/src/main/res/values-zh/strings.xml b/src/android/app/src/main/res/values-zh/strings.xml
@@ -243,9 +243,9 @@
     <string name="playtime_desc">游戏时长：%1$s</string>
     <string name="playtime_minutes">%1$s 分钟</string>
     <string name="playtime_hours">%1$s 小时</string>
-    <string name="delete_app_sdmc">删除存档目录</string>
+    <string name="delete_app_sdmc">删除安装目录</string>
     <string name="delete_shader_cache">删除着色器缓存</string>
-    <string name="delete_confirm_notice">确定删除游戏存档目录？</string>
+    <string name="delete_confirm_notice">确定删除游戏安装目录？</string>
 
     <string name="controller_stick">主摇杆</string>
     <string name="c_controller_stick">C 摇杆</string>

diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
@@ -243,9 +243,9 @@
     <string name="playtime_desc">Play Time: %1$s</string>
     <string name="playtime_minutes">%1$s minutes</string>
     <string name="playtime_hours">%1$s hours</string>
-    <string name="delete_app_sdmc">Delete Archive Directory</string>
+    <string name="delete_app_sdmc">Delete Install Directory</string>
     <string name="delete_shader_cache">Delete Shader Cache</string>
-    <string name="delete_confirm_notice">Are you sure to delete the game archive directory?</string>
+    <string name="delete_confirm_notice">Are you sure to delete the game install directory?</string>
 
     <string name="controller_stick">Main Stick</string>
     <string name="c_controller_stick">C Stick</string>