feat: v1.2.0 - add 3 EX Eidolon (ex_rank) mobile configuration & runtime support

2026-10-17 11:58:23 +07:00
1 parent 4194259a32
commit 96ec5e950e
@@ -4,7 +4,7 @@
 **ppSR & Escape Penacony** เป็นแอปพลิเคชัน Android แบบ All-in-One ที่รวมทั้ง **ตัวรันเซิร์ฟเวอร์จำลอง ppSR (Embedded Python 3.14)**, **ตัวอัปเดตเซิร์ฟเวอร์ตรงจากต้นทาง AFN**, **ระบบวาร์ปแผนที่ 86 ฉาก**, และ **เครื่องมือปรับแต่งเซิร์ฟเวอร์** ไว้ในแอปเดียวจบ **โดยไม่ต้องใช้สิทธิ์ Root, ไม่ต้องใช้ Shizuku และไม่ต้องติดตั้งแอป com.afn.ppSR แยกต่างหาก**

 - **Application ID / Package**: `com.catlas.escapepenacony`
- **เวอร์ชันล่าสุด (Current Version)**: `v1.1.4`
+- **เวอร์ชันล่าสุด (Current Version)**: `v1.2.0`
 - **สถาปัตยกรรม (Architecture)**: Native Android (Kotlin + Jetpack Compose + Material Design 3 + Embedded Chaquopy Python 3.14)
 - **Target ABI**: `arm64-v8a` (Android 8.0+ / API 26+)

@@ -24,6 +24,7 @@
 ### 2. 🛠️ เครื่องมือปรับแต่งและปุ่มต่างๆ ของเซิร์ฟเวอร์ (Server Tools)
 - **🔑 Set Password / Key:** มีหน้าต่างกำหนดรหัสผ่านเซิร์ฟเวอร์ (`key`) ใน `persistent.json`
 - **👤 Edit Trailblazer:** ปรับแต่งเพศตัวเอก (หญิง Stelle / ชาย Caelus) และ Path (ทำลายล้าง, อนุรักษ์, ประสาน, ลบล้าง, ปิติสุข) รวมถึง March 7th ได้ทันที
+- **⭐ EX Eidolon (3 EX Rank) Manager:** เปิด/ปิดการทำงานของระบบ 3 EX Eidolon ปลดล็อกสกิลพิเศษสำหรับตัวละครยอดฮิต (JingYuan [1204], DanHeng IL [1213], Acheron [1308]) ได้สะดวกจากหน้าจอมือถือ พร้อมปุ่ม Enable/Disable All
 - **⚡ Send Hotfix (Online / Offline Toggle):** สลับโหมด `send_hotfix` ในคลิกเดียว:
  - *เปิด (True):* สำหรับต่อเน็ตดึง Assets จาก Hoyoverse
  - *ปิด (False):* สำหรับเล่นแบบออฟไลน์ 100% (ช่วยแก้ปัญหาเปิดเกมแล้วจอดำ)
@@ -118,12 +119,21 @@ Escape-penacony-standalone/

 ไฟล์ APK ที่บิลด์เสร็จแล้วจะอยู่ที่:
 - `app/build/outputs/apk/release/app-release.apk`
- หรือตัวสำเนาที่ root โฟลเดอร์: `Escape-penacony-standalone-v1.1.4.apk`
+- หรือตัวสำเนาที่ root โฟลเดอร์: `Escape-penacony-standalone-v1.2.0.apk`

 ---

 ## 📜 บันทึกการเปลี่ยนแปลง (Changelog)

+### v1.2.0 (Build 8)
+- **New Feature - EX Eidolon (3 EX Rank) Manager:** เพิ่ม UI หน้าต่างปรับแต่งและเปิด/ปิดระบบ 3 EX Eidolon สำหรับตัวละครพิเศษ:
+  - JingYuan (จิ่งหยวน) [Avatar ID: 1204]
+  - DanHeng IL (จ้าวยลจันทรา) [Avatar ID: 1213]
+  - Acheron (อาเคอรอน) [Avatar ID: 1308]
+- **SafeDict & Auto-Heal Protection:** อัปเดตโครงสร้าง Default Persistent และ SafeDict ใน Python Runtime รองรับคีย์ `ex_rank` ครบถ้วน หมดกังวลเรื่อง KeyError
+- **UI Quick Tools Refactor:** ปรับปรุงแผงควบคุม Server Tools เป็นรูปแบบ 2x2 Grid (Password, Trailblazer, EX Eidolon, Misc Files)
+- **Smart Update Persistence:** ปรับระบบผสานข้อมูลตอนอัปเดตเซิร์ฟเวอร์ ให้คงการตั้งค่า `ex_rank` ของผู้ใช้ไว้อย่างปลอดภัย
+
 ### v1.1.4 (Build 7)
 - **Critical Fix:** แก้ปัญหา Error 1001_1 และ 1001_3 (`KeyError: 'avatar'`) ใน `GetBasicInfoCsReq` ที่ทำให้ Thread `read_loop` เซิร์ฟเวอร์ปิดตัวลง
 - **SafeDict Runtime:** ห่อหุ้ม `Manager.persistent` ด้วย `SafeDict` คืนค่า Fallback Schema อัตโนมัติ ป้องกัน `KeyError` สำหรับทุกคีย์ข้อมูลตัวละคร
@@ -12,8 +12,8 @@ android {
        applicationId = "com.catlas.escapepenacony"
        minSdk = 26
        targetSdk = 35
-        versionCode = 7
-        versionName = "v1.1.4"
+        versionCode = 8
+        versionName = "v1.2.0"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

@@ -9,7 +9,7 @@
        "bootstrap-native/arm64-v8a/_bz2.cpython-314-aarch64-linux-android.so": "b48b9abf1f87d587a5f5beb4b38bb17acf29c4d3",
        "bootstrap-native/arm64-v8a/_ctypes.cpython-314-aarch64-linux-android.so": "50a6a36dab6a9ebe4fca5797872e8d2c3538db56",
        "bootstrap-native/arm64-v8a/mmap.cpython-314-aarch64-linux-android.so": "b571492fdceac1279bedc8163e27ac205e104b14",
-        "app.imy": "40315c3e71d331e1c300e25e24d7084182ac150b",
+        "app.imy": "8e998f6e20dc7152ab075f8edf0644d411cd7f76",
        "stdlib-common.imy": "8715635411fe145000fbf3b7ce4c3a085646d300",
        "bootstrap-native/arm64-v8a/_random.cpython-314-aarch64-linux-android.so": "1c6c12f9f43546da0e108031f824b7fd6e79a36a",
        "bootstrap-native/arm64-v8a/_lzma.cpython-314-aarch64-linux-android.so": "6f3f86f607b4d775452c128858fa26d19c7da56a",
@@ -14,6 +14,12 @@ data class TrailblazerConfig(
    val marchPath: String    // "Preservation", "Hunt"
 )

+data class ExRankConfig(
+    val name: String,
+    val avatarId: Int,
+    val active: Boolean
+)
+
 data class SceneTeleportPayload(
    val planeId: Int,
    val x: Int,
@@ -96,6 +102,23 @@ class PersistentRepository(private val context: Context) {
                "active": true
              }
            ],
+            "ex_rank": [
+              {
+                "name": "JingYuan",
+                "avatar_id": 1204,
+                "active": true
+              },
+              {
+                "name": "DanHeng IL",
+                "avatar_id": 1213,
+                "active": true
+              },
+              {
+                "name": "Acheron",
+                "avatar_id": 1308,
+                "active": true
+              }
+            ],
            "buff": [
              1000121
            ],
@@ -104,6 +127,12 @@ class PersistentRepository(private val context: Context) {
          "key": ""
        }
        """.trimIndent()
+
+        val DEFAULT_EX_RANK_CONFIGS = listOf(
+            ExRankConfig("JingYuan", 1204, true),
+            ExRankConfig("DanHeng IL", 1213, true),
+            ExRankConfig("Acheron", 1308, true)
+        )
    }

    fun createDefaultPersistentJson(): JSONObject {
@@ -140,7 +169,7 @@ class PersistentRepository(private val context: Context) {
                modified = true
            } else {
                val defaultAvatar = defaultTemplate.getJSONObject("avatar")
-                val keys = listOf("tb_gender", "tb_path", "march_path", "skin", "lineup", "global_passive", "buff", "leader")
+                val keys = listOf("tb_gender", "tb_path", "march_path", "skin", "lineup", "global_passive", "ex_rank", "buff", "leader")
                for (k in keys) {
                    if (!avatar.has(k) || avatar.isNull(k)) {
                        avatar.put(k, defaultAvatar.get(k))
@@ -185,7 +214,7 @@ class PersistentRepository(private val context: Context) {
                json.put("avatar", defaultTemplate.getJSONObject("avatar"))
            } else {
                val defaultAvatar = defaultTemplate.getJSONObject("avatar")
-                val keys = listOf("tb_gender", "tb_path", "march_path", "skin", "lineup", "global_passive", "buff", "leader")
+                val keys = listOf("tb_gender", "tb_path", "march_path", "skin", "lineup", "global_passive", "ex_rank", "buff", "leader")
                for (k in keys) {
                    if (!avatar.has(k) || avatar.isNull(k)) {
                        avatar.put(k, defaultAvatar.get(k))
@@ -253,6 +282,41 @@ class PersistentRepository(private val context: Context) {
        return writePersistentJson(json)
    }

+    suspend fun getExRankConfigs(): List<ExRankConfig> {
+        val json = readPersistentJson().getOrNull() ?: ensureValidPersistentJsonSync()
+        val list = mutableListOf<ExRankConfig>()
+        val avatar = json.optJSONObject("avatar")
+        val array = avatar?.optJSONArray("ex_rank") ?: json.optJSONArray("ex_rank")
+        if (array != null) {
+            for (i in 0 until array.length()) {
+                val item = array.optJSONObject(i) ?: continue
+                list.add(
+                    ExRankConfig(
+                        name = item.optString("name", "Unknown"),
+                        avatarId = item.optInt("avatar_id", 0),
+                        active = item.optBoolean("active", true)
+                    )
+                )
+            }
+        }
+        return if (list.isNotEmpty()) list else DEFAULT_EX_RANK_CONFIGS
+    }
+
+    suspend fun setExRankConfigs(configs: List<ExRankConfig>): Result<Unit> {
+        val json = readPersistentJson().getOrElse { createDefaultPersistentJson() }
+        val avatar = json.optJSONObject("avatar") ?: JSONObject().also { json.put("avatar", it) }
+        val array = org.json.JSONArray()
+        for (cfg in configs) {
+            val item = JSONObject()
+            item.put("name", cfg.name)
+            item.put("avatar_id", cfg.avatarId)
+            item.put("active", cfg.active)
+            array.put(item)
+        }
+        avatar.put("ex_rank", array)
+        return writePersistentJson(json)
+    }
+
    suspend fun applySceneTeleport(payload: SceneTeleportPayload): Result<Unit> {
        val json = readPersistentJson().getOrElse { createDefaultPersistentJson() }
        val scene = json.optJSONObject("scene") ?: JSONObject().also { json.put("scene", it) }
@@ -85,11 +85,13 @@ fun MainScreen() {
    var sendHotfix by remember { mutableStateOf(true) }
    var serverKey by remember { mutableStateOf("") }
    var trailblazerConfig by remember { mutableStateOf(TrailblazerConfig("Female", "Destruction", "Preservation")) }
+    var exRankConfigs by remember { mutableStateOf(PersistentRepository.DEFAULT_EX_RANK_CONFIGS) }
    var currentSceneConfig by remember { mutableStateOf<SceneConfig?>(null) }

    // Dialog states
    var showPasswordDialog by remember { mutableStateOf(false) }
    var showTrailblazerDialog by remember { mutableStateOf(false) }
+    var showExRankDialog by remember { mutableStateOf(false) }
    var showMiscExplorerDialog by remember { mutableStateOf(false) }
    var showCustomCoordsDialog by remember { mutableStateOf(false) }
    var showVersionSelectorDialog by remember { mutableStateOf(false) }
@@ -133,6 +135,7 @@ fun MainScreen() {
            sendHotfix = persistentRepo.getSendHotfix()
            serverKey = persistentRepo.getServerKey()
            trailblazerConfig = persistentRepo.getTrailblazerConfig()
+            exRankConfigs = persistentRepo.getExRankConfigs()
            val pJson = persistentRepo.readPersistentJson().getOrNull()
            pJson?.optJSONObject("scene")?.let {
                currentSceneConfig = SceneConfig.fromJsonObject(it)
@@ -268,6 +271,7 @@ fun MainScreen() {
                        },
                        onOpenSetPassword = { showPasswordDialog = true },
                        onOpenEditTrailblazer = { showTrailblazerDialog = true },
+                        onOpenExRank = { showExRankDialog = true },
                        onOpenMiscExplorer = {
                            scope.launch {
                                miscFiles = persistentRepo.listMiscFiles()
@@ -589,6 +593,140 @@ fun MainScreen() {
        )
    }

+    // EX Eidolon (3 Ex Rank) Dialog
+    if (showExRankDialog) {
+        var currentConfigs by remember { mutableStateOf(exRankConfigs) }
+
+        AlertDialog(
+            onDismissRequest = { showExRankDialog = false },
+            title = {
+                Row(verticalAlignment = Alignment.CenterVertically) {
+                    Icon(
+                        Icons.Default.Star,
+                        contentDescription = null,
+                        tint = ExploreAmber,
+                        modifier = Modifier.size(22.dp)
+                    )
+                    Spacer(modifier = Modifier.width(8.dp))
+                    Text(
+                        tr(
+                            currentLanguage,
+                            "EX Eidolon (3 EX Rank)",
+                            "ปรับแต่ง EX Eidolon (3 EX Rank)",
+                            "EX星魂强化设置 (3 EX Rank)"
+                        ),
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 17.sp
+                    )
+                }
+            },
+            text = {
+                Column(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalArrangement = Arrangement.spacedBy(10.dp)
+                ) {
+                    Text(
+                        tr(
+                            currentLanguage,
+                            "Toggle 3 EX Eidolon skill upgrades for special characters in ppSR:",
+                            "เปิด/ปิดระบบ 3 EX Eidolon ปลดล็อกสกิลพิเศษสำหรับตัวละครใน ppSR:",
+                            "为ppSR特殊角色开启/关闭3个EX星魂技能强化："
+                        ),
+                        fontSize = 12.sp,
+                        color = Color.LightGray
+                    )
+
+                    currentConfigs.forEachIndexed { index, cfg ->
+                        Card(
+                            colors = CardDefaults.cardColors(containerColor = BgCard),
+                            shape = RoundedCornerShape(10.dp),
+                            modifier = Modifier.fillMaxWidth()
+                        ) {
+                            Row(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 12.dp, vertical = 8.dp),
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                                verticalAlignment = Alignment.CenterVertically
+                            ) {
+                                Column(modifier = Modifier.weight(1f)) {
+                                    val displayName = when (cfg.avatarId) {
+                                        1204 -> tr(currentLanguage, "JingYuan (General)", "JingYuan (จิ่งหยวน)", "景元")
+                                        1213 -> tr(currentLanguage, "DanHeng IL (Imbibitor Lunae)", "DanHeng IL (จ้าวยลจันทรา)", "丹恒·饮月")
+                                        1308 -> tr(currentLanguage, "Acheron (Galaxy Ranger)", "Acheron (อาเคอรอน)", "黄泉")
+                                        else -> cfg.name
+                                    }
+                                    Text(displayName, fontWeight = FontWeight.SemiBold, fontSize = 14.sp)
+                                    Text(
+                                        "Avatar ID: ${cfg.avatarId} • ${if (cfg.active) tr(currentLanguage, "Active", "เปิดใช้งาน", "已启用") else tr(currentLanguage, "Disabled", "ปิดใช้งาน", "已禁用")}",
+                                        fontSize = 11.sp,
+                                        color = if (cfg.active) CombatGreen else Color.Gray
+                                    )
+                                }
+                                Switch(
+                                    checked = cfg.active,
+                                    onCheckedChange = { isActive ->
+                                        currentConfigs = currentConfigs.toMutableList().also {
+                                            it[index] = it[index].copy(active = isActive)
+                                        }
+                                    }
+                                )
+                            }
+                        }
+                    }
+
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.spacedBy(8.dp)
+                    ) {
+                        OutlinedButton(
+                            onClick = {
+                                currentConfigs = currentConfigs.map { it.copy(active = true) }
+                            },
+                            modifier = Modifier.weight(1f),
+                            contentPadding = PaddingValues(vertical = 4.dp)
+                        ) {
+                            Text(tr(currentLanguage, "Enable All", "เปิดทั้งหมด", "全部开启"), fontSize = 11.sp)
+                        }
+                        OutlinedButton(
+                            onClick = {
+                                currentConfigs = currentConfigs.map { it.copy(active = false) }
+                            },
+                            modifier = Modifier.weight(1f),
+                            contentPadding = PaddingValues(vertical = 4.dp)
+                        ) {
+                            Text(tr(currentLanguage, "Disable All", "ปิดทั้งหมด", "全部关闭"), fontSize = 11.sp)
+                        }
+                    }
+                }
+            },
+            confirmButton = {
+                Button(onClick = {
+                    scope.launch {
+                        persistentRepo.setExRankConfigs(currentConfigs)
+                        exRankConfigs = currentConfigs
+                        showExRankDialog = false
+                        snackbarHostState.showSnackbar(
+                            tr(
+                                currentLanguage,
+                                "EX Eidolon configurations saved",
+                                "บันทึกการตั้งค่า EX Eidolon สำเร็จ",
+                                "EX星魂配置已保存"
+                            )
+                        )
+                    }
+                }) {
+                    Text(tr(currentLanguage, "Save", "บันทึก", "保存"))
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showExRankDialog = false }) {
+                    Text(tr(currentLanguage, "Cancel", "ยกเลิก", "取消"))
+                }
+            }
+        )
+    }
+
    // Misc Explorer & Editor Dialog
    if (showMiscExplorerDialog) {
        AlertDialog(
@@ -981,6 +1119,7 @@ fun ServerControlTab(
    onToggleHotfix: (Boolean) -> Unit,
    onOpenSetPassword: () -> Unit,
    onOpenEditTrailblazer: () -> Unit,
+    onOpenExRank: () -> Unit,
    onOpenMiscExplorer: () -> Unit,
    onClearLogs: () -> Unit,
    onCopyLogs: () -> Unit
@@ -1088,6 +1227,7 @@ fun ServerControlTab(
                )
                Spacer(modifier = Modifier.height(10.dp))

+                // Tools Grid Row 1: Password & Trailblazer
                Row(
                    modifier = Modifier.fillMaxWidth(),
                    horizontalArrangement = Arrangement.spacedBy(8.dp)
@@ -1116,6 +1256,24 @@ fun ServerControlTab(
                        Spacer(modifier = Modifier.width(4.dp))
                        Text(tr(currentLanguage, "Trailblazer", "ตัวละคร", "主角"), fontSize = 12.sp, maxLines = 1)
                    }
+                }
+
+                Spacer(modifier = Modifier.height(6.dp))
+
+                // Tools Grid Row 2: EX Eidolon & Misc Files
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp)
+                ) {
+                    OutlinedButton(
+                        onClick = onOpenExRank,
+                        modifier = Modifier.weight(1f),
+                        contentPadding = PaddingValues(horizontal = 4.dp, vertical = 6.dp)
+                    ) {
+                        Icon(Icons.Default.Star, contentDescription = null, tint = ExploreAmber, modifier = Modifier.size(16.dp))
+                        Spacer(modifier = Modifier.width(4.dp))
+                        Text(tr(currentLanguage, "EX Eidolon", "EX Eidolon", "EX星魂"), fontSize = 12.sp, maxLines = 1)
+                    }

                    OutlinedButton(
                        onClick = onOpenMiscExplorer,
@@ -187,6 +187,23 @@ DEFAULT_PERSISTENT = {
                "active": True
            }
        ],
+        "ex_rank": [
+            {
+                "name": "JingYuan",
+                "avatar_id": 1204,
+                "active": True
+            },
+            {
+                "name": "DanHeng IL",
+                "avatar_id": 1213,
+                "active": True
+            },
+            {
+                "name": "Acheron",
+                "avatar_id": 1308,
+                "active": True
+            }
+        ],
        "buff": [
            1000121
        ],
@@ -223,6 +240,9 @@ class SafeDict(dict):
            elif key == 'global_passive':
                self['global_passive'] = copy.deepcopy(DEFAULT_PERSISTENT['avatar']['global_passive'])
                return self['global_passive']
+            elif key == 'ex_rank':
+                self['ex_rank'] = copy.deepcopy(DEFAULT_PERSISTENT['avatar']['ex_rank'])
+                return self['ex_rank']
            elif key == 'tb_gender':
                return 'Female'
            elif key == 'tb_path':
@@ -157,4 +157,38 @@ class UpdateAndSceneTest {
        assertEquals("Elation", avatar.getString("tb_path"))
        assertEquals("Preservation", avatar.getString("march_path"))
    }
+
+    @Test
+    fun testExRankConfigUpdate() {
+        val root = JSONObject("""{"avatar": {}}""")
+        val avatar = root.getJSONObject("avatar")
+
+        val list = listOf(
+            com.catlas.escapepenacony.data.ExRankConfig("JingYuan", 1204, true),
+            com.catlas.escapepenacony.data.ExRankConfig("DanHeng IL", 1213, false),
+            com.catlas.escapepenacony.data.ExRankConfig("Acheron", 1308, true)
+        )
+
+        val array = org.json.JSONArray()
+        for (cfg in list) {
+            val item = JSONObject()
+            item.put("name", cfg.name)
+            item.put("avatar_id", cfg.avatarId)
+            item.put("active", cfg.active)
+            array.put(item)
+        }
+        avatar.put("ex_rank", array)
+
+        val savedArray = avatar.getJSONArray("ex_rank")
+        assertEquals(3, savedArray.length())
+        assertEquals("JingYuan", savedArray.getJSONObject(0).getString("name"))
+        assertEquals(1204, savedArray.getJSONObject(0).getInt("avatar_id"))
+        assertTrue(savedArray.getJSONObject(0).getBoolean("active"))
+
+        assertEquals("DanHeng IL", savedArray.getJSONObject(1).getString("name"))
+        assertFalse(savedArray.getJSONObject(1).getBoolean("active"))
+
+        assertEquals("Acheron", savedArray.getJSONObject(2).getString("name"))
+        assertTrue(savedArray.getJSONObject(2).getBoolean("active"))
+    }
 }