feat: support for skill action 8 ~ 10

MalitsPlus · Oct 10, 2023 · 3a6fce5 · 3a6fce5
1 parent da9acf8
commit 3a6fce5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.github.malitsplus.shizurunotes"
         minSdk 26
         targetSdk 30
-        versionCode 103
-        versionName "1.24.0"
+        versionCode 104
+        versionName "1.25.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {

diff --git a/app/src/main/java/com/github/malitsplus/shizurunotes/db/DBHelper.kt b/app/src/main/java/com/github/malitsplus/shizurunotes/db/DBHelper.kt
@@ -1598,6 +1598,18 @@ class DBHelper private constructor(
             return result?.toInt() ?: 0
         }
 
+    val hasAction10: Boolean
+        get() {
+            val result = getOne("""
+                SELECT COUNT(*)
+                FROM sqlite_master 
+                WHERE type='table'
+                AND name='skill_data'
+                AND sql like '%action_10%';"""
+            )
+            return result == "1"
+        }
+
     /***
      * 随机生成16位随机英数字符串
      * @return

diff --git a/app/src/main/java/com/github/malitsplus/shizurunotes/db/RawSkillData.java b/app/src/main/java/com/github/malitsplus/shizurunotes/db/RawSkillData.java
@@ -17,13 +17,19 @@ public class RawSkillData {
     public int action_5;
     public int action_6;
     public int action_7;
+    public int action_8;
+    public int action_9;
+    public int action_10;
     public int depend_action_1;
     public int depend_action_2;
     public int depend_action_3;
     public int depend_action_4;
     public int depend_action_5;
     public int depend_action_6;
     public int depend_action_7;
+    public int depend_action_8;
+    public int depend_action_9;
+    public int depend_action_10;
     public String description;
     public int icon_type;
 
@@ -37,7 +43,8 @@ public void setSkillData(Skill skill){
                 description,
                 icon_type
         );
-        for(int i = 1; i <= 7; i++){
+        int iteration = DBHelper.get().getHasAction10() ? 10 : 7;
+        for(int i = 1; i <= iteration; i++){
             int action = (int)Utils.getValueFromObject(this, "action_" + i);
             if(action != 0) {
                 skill.getActions().add(skill.new Action(action, (int) Utils.getValueFromObject(this, "depend_action_" + i)));

diff --git a/release_log.json b/release_log.json
@@ -1,4 +1,13 @@
 [
+  {
+    "versionCode": "104",
+    "versionName": "1.25.0",
+    "recommend": "false",
+    "messageJa": "- Skill Action 8 ~ 10 へのサポート",
+    "messageZh": "- 追加对 Skill Action 8 ~ 10 的支持",
+    "infoJa": "",
+    "infoZh": ""
+  },
   {
     "versionCode": "103",
     "versionName": "1.24.0",