Merge pull request #134 from wthee/beta-compose

3.9.0 release

Author: wthee

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### 3.X.X
 
+#### 3.9.0 - 2025.07
+
+- 优化：部分技能描述
+- 修复：已知 BUG
+
 #### 3.8.9 - 2025.03
 
 - 新增：[角色职能] 功能模块

DATATABLE.md

@@ -41,6 +41,11 @@
 | redeem_unit                   | 额外角色            | 花凛等            |
 | room_unit_comments            | 小屋交流文本          |                |
 | secret_dungeon_schedule       | 特殊地下城日程         |                |
+| seven_enemy_parameter         | 剧情活动怪物信息        | 七周年后的活动        |
+| seven_event_setting           | 剧情活动信息          |                |
+| seven_schedule                | 剧情活动日常信息        |                |
+| seven_special_battle_detail   | 剧情活动战斗信息        |                |
+| seven_wave_group_data         | 剧情活动副本信息        |                |
 | shiori_event_list             | 支线活动            |                |
 | skill_action                  | 技能动作            |                |
 | skill_data                    | 技能详情            |                |
@@ -50,7 +55,7 @@
 | talent_quest_data             | 深域关卡信息          |                |
 | talent_quest_enemy_parameter  | 深域关卡敌人数值        |                |
 | talent_quest_wave_group_data  | 深域关卡敌人信息        |                |
-| talent_weakness               | 天赋弱点信息          |                |
+| talents_weakness              | 天赋弱点信息          |                |
 | tdf_schedule                  | 次元断层日程          |                |
 | tower_schedule                | 露娜塔日程           |                |
 | travel_area_data              | ex 冒险区域         |                |

app/build.gradle.kts

@@ -12,8 +12,8 @@ hilt {
     enableAggregatingTask = true
 }
 
-val appVersionCode = 389
-val appVersionName = "3.8.9"
+val appVersionCode = 390
+val appVersionName = "3.9.0"
 val appId = "cn.wthee.pcrtool"
 
 android {

app/src/main/java/cn/wthee/pcrtool/data/db/dao/EventDao.kt

@@ -74,27 +74,26 @@ interface EventDao {
         """
         SELECT
             s.event_id,
-            s.title,
+            setting.title,
             s.event_id AS original_event_id,
             ( s.event_id % 10000 + 5000 ) AS story_id,
             ss.start_time,
             ss.end_time,
             enemy.enemy_id AS boss_enemy_id,
             enemy.unit_id AS boss_unit_id,
-            "" AS unit_ids
+            '' AS unit_ids 
         FROM
-            seven_story_data AS s
-            LEFT JOIN seven_schedule AS ss ON s.event_id = ss.event_id -- 	LEFT JOIN ( SELECT d.story_group_id, GROUP_CONCAT( d.reward_id_2, '-' ) AS unit_ids FROM event_story_detail AS d GROUP BY d.story_group_id ) AS e ON c.story_group_id = e.story_group_id
+            seven_schedule AS s
+            LEFT JOIN seven_event_setting AS setting ON s.event_id = setting.event_id
+            LEFT JOIN seven_schedule AS ss ON s.event_id = ss.event_id
             LEFT JOIN seven_special_battle_detail AS battle ON battle.quest_id / 1000 = s.event_id 
             AND battle.mode = 1
             LEFT JOIN seven_wave_group_data AS wave ON wave.wave_group_id = battle.wave_group_id
             LEFT JOIN seven_enemy_parameter AS enemy ON wave.enemy_id_1 = enemy.enemy_id 
-        WHERE
-            s.story_type = 2 
         GROUP BY
             s.event_id 
         ORDER BY
-            start_time DESC
+            s.start_time DESC
         LIMIT 0,:limit
         """
     )

app/src/main/java/cn/wthee/pcrtool/data/db/repository/EnemyRepository.kt

@@ -50,10 +50,12 @@ class EnemyRepository @Inject constructor(private val enemyDao: EnemyDao) {
     suspend fun getEnemyAttr(enemyId: Int) = try {
         if (enemyId > minTalentEnemyId) {
             enemyDao.getTalentEnemyAttr(enemyId)
-        } else if (enemyId > minEventEnemyId) {
-            enemyDao.getNewEventEnemyAttr(enemyId)
         } else {
-            enemyDao.getEnemyAttr(enemyId)
+            try {
+                enemyDao.getEnemyAttr(enemyId)
+            } catch (_: Exception) {
+                enemyDao.getNewEventEnemyAttr(enemyId)
+            }
         }
     } catch (e: Exception) {
         LogReportUtil.upload(e, "getEnemyAttr#enemyId:$enemyId")

app/src/main/java/cn/wthee/pcrtool/data/db/view/AttackPattern.kt

@@ -34,18 +34,26 @@ data class AttackPattern(
     @ColumnInfo(name = "atk_pattern_20") val atkPattern20: Int
 ) {
 
+    /**
+     * 获取初始动作id
+     */
     fun getBefore(): MutableList<Int> {
         val list = getList()
         return list.subList(0, loopStart - 1)
     }
 
+    /**
+     * 获取循环动作id
+     */
     fun getLoop(): MutableList<Int> {
         val list = getList()
         return list.subList(loopStart - 1, loopEnd)
     }
 
-
-    private fun getList(): ArrayList<Int> {
+    /**
+     * 获取所有id
+     */
+    fun getList(): ArrayList<Int> {
         val list = arrayListOf<Int>()
         list.add(atkPattern1)
         list.add(atkPattern2)

app/src/main/java/cn/wthee/pcrtool/data/db/view/SkillActionDetail.kt

@@ -12,7 +12,9 @@ import cn.wthee.pcrtool.data.db.view.skilltype.aura
 import cn.wthee.pcrtool.data.db.view.skilltype.auraField
 import cn.wthee.pcrtool.data.db.view.skilltype.awe
 import cn.wthee.pcrtool.data.db.view.skilltype.barrier
+import cn.wthee.pcrtool.data.db.view.skilltype.buffDot
 import cn.wthee.pcrtool.data.db.view.skilltype.cannotSelected
+import cn.wthee.pcrtool.data.db.view.skilltype.changeDefMax
 import cn.wthee.pcrtool.data.db.view.skilltype.changeMode
 import cn.wthee.pcrtool.data.db.view.skilltype.changePattern
 import cn.wthee.pcrtool.data.db.view.skilltype.changePosition
@@ -29,6 +31,7 @@ import cn.wthee.pcrtool.data.db.view.skilltype.countDown
 import cn.wthee.pcrtool.data.db.view.skilltype.damage
 import cn.wthee.pcrtool.data.db.view.skilltype.damageReduce
 import cn.wthee.pcrtool.data.db.view.skilltype.damageTakenUp
+import cn.wthee.pcrtool.data.db.view.skilltype.damageToDot
 import cn.wthee.pcrtool.data.db.view.skilltype.dispel
 import cn.wthee.pcrtool.data.db.view.skilltype.dot
 import cn.wthee.pcrtool.data.db.view.skilltype.dotField
@@ -249,7 +252,7 @@ data class SkillActionDetail(
             SkillActionType.TAUNT -> taunt(ailmentName)
             // 21：回避
             SkillActionType.INVINCIBLE -> invincible()
-            // 22：改变模式
+            // 22：循环变更
             SkillActionType.CHANGE_PATTERN -> changePattern()
             // 23：判定对象状态
             SkillActionType.IF_STATUS -> ifStatus()
@@ -397,6 +400,12 @@ data class SkillActionDetail(
             SkillActionType.TRANSFER_DAMAGE -> transferDamage()
             // 125：无法选中
             SkillActionType.CANNOT_SELECTED -> cannotSelected()
+            // 128：持续伤害增强
+            SkillActionType.BUFF_DOT -> buffDot()
+            // 129：伤害转化
+            SkillActionType.DAMAGE_TO_DOT -> damageToDot()
+            // 130：调和
+            SkillActionType.CHANGE_DEF_MAX -> changeDefMax()
             else -> unknownType()
         }
     }

app/src/main/java/cn/wthee/pcrtool/data/db/view/skilltype/BuffDot.kt

@@ -0,0 +1,15 @@
+package cn.wthee.pcrtool.data.db.view.skilltype
+
+import cn.wthee.pcrtool.R
+import cn.wthee.pcrtool.data.db.view.SkillActionDetail
+import cn.wthee.pcrtool.utils.getString
+import cn.wthee.pcrtool.utils.getTarget
+import cn.wthee.pcrtool.utils.getTimeText
+
+// 128：持续伤害增强
+fun SkillActionDetail.buffDot() = getString(
+    R.string.skill_action_type_desc_128,
+    getTarget(),
+    (actionValue1 / 100).toInt(),
+    getTimeText(2, actionValue2)
+)

app/src/main/java/cn/wthee/pcrtool/data/db/view/skilltype/ChangeDefMax.kt

@@ -0,0 +1,12 @@
+package cn.wthee.pcrtool.data.db.view.skilltype
+
+import cn.wthee.pcrtool.R
+import cn.wthee.pcrtool.data.db.view.SkillActionDetail
+import cn.wthee.pcrtool.utils.getString
+import cn.wthee.pcrtool.utils.getTarget
+
+
+// 130：调和
+fun SkillActionDetail.changeDefMax(): String {
+    return getString(R.string.skill_action_type_desc_130, getTarget())
+}

app/src/main/java/cn/wthee/pcrtool/data/db/view/skilltype/ChangeMode.kt

@@ -8,11 +8,17 @@ import cn.wthee.pcrtool.utils.getTimeText
 
 // 14：行动模式变更
 fun SkillActionDetail.changeMode() = when (actionDetail1) {
-    1 -> getString(
-        R.string.skill_action_loop_change,
-        getTimeText(1, actionValue1)
-    )
-
+    1 -> {
+        val status = when (actionValue5.toInt()) {
+            1 -> getString(R.string.skill_action_change_to_flight_status)
+            else -> getString(R.string.none)
+        }
+        getString(
+            R.string.skill_action_change_mode,
+            status,
+            getTimeText(1, actionValue1)
+        )
+    }
     2 -> getString(R.string.skill_action_type_desc_14_2, actionValue1.toInt())
     3 -> getString(R.string.skill_action_type_desc_14_3)
     else -> UNKNOWN