3.12.5 LOG-O

重置资源时不再还原本地备份卡组

3.12.5 LOG-O
重置资源时不再还原本地备份卡组
1469d245 · fallenstardust · 7a349d9a · 1469d245 · 1469d245 · 1469d245
Commit 1469d245 authored Aug 06, 2025 by fallenstardust
4 changed files
--- a/mobile/assets/changelog.html
+++ b/mobile/assets/changelog.html
@@ -16,26 +16,25 @@
    特别感谢： 尸体233,废话多,大毛, zhuhongbo, JSY1728, 幻兽L 等的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.12.4</li>
+    <li style="color:#ffff00">3.12.5</li>
 </ul>
 <pre>
    更新：
    1.更新ygopro内核；
-    2.新卡TTP1+VJ；
-    3.2025.7 OCG禁卡表；
-    4.版本号升级为1.036.2；
+    2.新卡1302+T1301+VJ；
    变更：
-    1.新增卡组广场功能；
-    2.卡组广场可为分享的卡组点赞；
-    3.卡组广场可以按卡组名称、贡献者名称查询分享的卡组；
-    4.卡组广场可根据点赞数，共享时间进行排序；
-    5.卡组广场支持翻页、跳页功能；
-    6.卡组广场分享的卡组可加载到卡组编辑；
-    7.新增卡组云备份功能；
-    8.通过萌卡账号登录可以进行云备份管理；
-    9.登录萌卡专页时自动登录云备份；
-    10.可以将云备份的卡组公开到卡组广场或者隐藏；
-    11.登录账号后定期同步本地和云备份卡组；
+    1.搜索本地卡组结果增加关键词高亮；
+    2.上传在线备份时同时上传萌卡昵称；
+    3.不再显示用户萌卡数字id；
+    4.支持按卡组分类上传在线备份；
+    5.在线备份页按卡组分类排序；
+    6.在线备份搜索卡组结果增加关键词高亮在卡组名称和分类名称上；
+    7.优化卡组在线请求量降低同步、删除等延迟；
+    8.优化卡盒叠放布局方式解决部分机型显示错位；
+    9.兼容多客户端来源的卡组换行符，避免出现在线下载的卡组变成空的问题；
+    10.隐藏本地卡组最后修改时间；
+    11.重置资源时不再恢复本地备份的卡组以免和在线备份错乱；
+    12.优化多语言界面文字文本描述；

 </pre>
 <h3 style="color:#ff0000">注意</h3>

--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -9,8 +9,8 @@ android {
        minSdkVersion 25
        //noinspection ExpiredTargetSdkVersion
        targetSdkVersion 29
-        versionCode 312000006
-        versionName "3.12.4fix1"
+        versionCode 312000007
+        versionName "3.12.5"
        flavorDimensions "versionCode"
        vectorDrawables.useSupportLibrary = true
        ndkVersion "21.3.6528147"

--- a/mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java
+++ b/mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java
@@ -655,9 +655,9 @@ public class SettingFragment extends PreferenceFragmentPlus {
                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_SOUND_PATH),
                        mSettings.getSoundPath(), false);*/

-                //复制原目录文件
+                /*复制原目录文件
                if (new File(ORI_DECK).list() != null)
-                    FileUtils.copyDir(ORI_DECK, mSettings.getDeckDir(), false);
+                    FileUtils.copyDir(ORI_DECK, mSettings.getDeckDir(), false);*/
                if (new File(ORI_REPLAY).list() != null)
                    FileUtils.copyDir(ORI_REPLAY, mSettings.getResourcePath() + "/" + Constants.CORE_REPLAY_PATH, false);
                if (new File(ORI_PICS).list() != null)

--- a/mobile/src/main/java/cn/garymb/ygomobile/utils/ComparisonTableUtil.java
+++ b/mobile/src/main/java/cn/garymb/ygomobile/utils/ComparisonTableUtil.java
@@ -734,7 +734,107 @@ public interface ComparisonTableUtil {
            100242057,
            100242058,
            100242059,
-            100200273
+            100200273,
+            100200277,
+            100238201,
+            100243001,
+            101301081,
+            101301082,
+            101301083,
+            101301084,
+            101301085,
+            101301086,
+            101301186,
+            101301087,
+            101301088,
+            101301089,
+            101301090,
+            101301091,
+            101301092,
+            101301093,
+            101301094,
+            101301095,
+            101301096,
+            101302201,
+            101302202,
+            101302203,
+            101302004,
+            101302005,
+            101302006,
+            101302007,
+            101302008,
+            101302009,
+            101302010,
+            101302011,
+            101302012,
+            101302013,
+            101302014,
+            101302015,
+            101302016,
+            101302017,
+            101302018,
+            101302019,
+            101302020,
+            101302021,
+            101302022,
+            101302023,
+            101302024,
+            101302025,
+            101302026,
+            101302027,
+            101302028,
+            101302029,
+            101302030,
+            101302031,
+            101302032,
+            101302033,
+            101302034,
+            101302204,
+            101302036,
+            101302037,
+            101302205,
+            101302039,
+            101302040,
+            101302041,
+            101302042,
+            101302206,
+            101302044,
+            101302045,
+            101302046,
+            101302047,
+            101302048,
+            101302207,
+            101302050,
+            101302051,
+            101302052,
+            101302053,
+            101302208,
+            101302055,
+            101302056,
+            101302057,
+            101302058,
+            101302059,
+            101302060,
+            101302061,
+            101302062,
+            101302063,
+            101302064,
+            101302065,
+            101302066,
+            101302067,
+            101302068,
+            101302069,
+            101302070,
+            101302071,
+            101302072,
+            101302209,
+            101302074,
+            101302075,
+            101302076,
+            101302077,
+            101302078,
+            101302079,
+            101302080
    };

    int[] newIDsArray = {
@@ -1467,6 +1567,106 @@ public interface ComparisonTableUtil {
            11161666,
            57566760,
            84550369,
-            71440209
+            71440209,
+            40725446,
+            32872239,
+            20240828,
+            19000848,
+            45409943,
+            71593652,
+            18988396,
+            44376395,
+            71771004,
+            71771005,
+            7166709,
+            43150717,
+            70659412,
+            6043161,
+            33438265,
+            79436874,
+            6821579,
+            32216688,
+            78710386,
+            5109321,
+            67322708,
+            93317313,
+            20715411,
+            66100116,
+            92595825,
+            29099860,
+            55088578,
+            92472273,
+            28877382,
+            54265980,
+            81650695,
+            27755794,
+            54143349,
+            80538047,
+            16922142,
+            53927851,
+            85315450,
+            12800564,
+            58205203,
+            84693918,
+            11688916,
+            47082621,
+            84477320,
+            10966439,
+            47960073,
+            73355772,
+            19743887,
+            46148485,
+            72632190,
+            9627299,
+            45016904,
+            71410542,
+            8805651,
+            44293356,
+            71398055,
+            7782069,
+            33171768,
+            70576413,
+            6560411,
+            33955120,
+            69453825,
+            5848934,
+            32232538,
+            68231287,
+            95626382,
+            31010081,
+            67515699,
+            94503794,
+            30998403,
+            7382007,
+            33781156,
+            69176851,
+            6260560,
+            32665564,
+            69053263,
+            95448372,
+            32442017,
+            68831625,
+            94326720,
+            21720439,
+            67115133,
+            94103142,
+            20508881,
+            66092596,
+            93481594,
+            29876299,
+            56870908,
+            92269002,
+            28653611,
+            55158350,
+            81143465,
+            28531163,
+            54936778,
+            80320877,
+            17719582,
+            53813120,
+            80208225,
+            16693934,
+            42091632,
+            89086647
    };
 }
\ No newline at end of file