[fix]Key name changes due to animeGameDatav4.6.0

Rollphes · Apr 22, 2024 · c55dbab · c55dbab
1 parent d641cb9
commit c55dbab
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 39 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "genshin-manager",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "homepage": "https://rollphes.github.io/genshin-manager/",
   "bugs": "https://github.com/Rollphes/genshin-manager/issues",
   "main": "dist/index.js",
@@ -59,20 +59,20 @@
     "@types/cheerio": "^0.22.35",
     "@types/cli-progress": "^3.11.5",
     "@types/html-escaper": "^3.0.2",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.2",
     "@types/node-cron": "^3.0.11",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jsdoc": "^48.2.1",
+    "eslint-plugin-jsdoc": "^48.2.2",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-simple-import-sort": "^12.0.0",
     "prettier": "^3.2.5",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",
     "tsconfig-paths": "^4.2.0",
     "typedoc": "^0.25.12",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.3"
   }
 }
diff --git a/src/models/Artifact.ts b/src/models/Artifact.ts
@@ -129,7 +129,7 @@ export class Artifact {
         'ReliquarySetExcelConfigData',
         this.setId,
       )
-      const equipAffixId = (setJson.EquipAffixId as number) * 10 + 0
+      const equipAffixId = (setJson.equipAffixId as number) * 10 + 0
       const equipAffixJson = Client._getJsonFromCachedExcelBinOutput(
         'EquipAffixExcelConfigData',
         equipAffixId,

diff --git a/src/models/ProfilePicture.ts b/src/models/ProfilePicture.ts
@@ -31,6 +31,11 @@ export class ProfilePicture {
    * @description Exists only if type is `PROFILE_PICTURE_UNLOCK_BY_ITEM`
    */
   public readonly materialId?: number
+  /**
+   * Quest ID
+   * @description Exists only if type is `PROFILE_PICTURE_UNLOCK_BY_PARENT_QUEST`
+   */
+  public readonly questId?: number
   /**
    * Profile picture icon
    */
@@ -47,30 +52,23 @@ export class ProfilePicture {
       this.id,
     )
 
-    const infoId = profilePictureJson.infoId as number
-    const cachedAvatar = Client._getCachedExcelBinOutputByName(
-      'AvatarExcelConfigData',
-    )
-    const cachedCostume = Client._getCachedExcelBinOutputByName(
-      'AvatarCostumeExcelConfigData',
-    )
-    const cachedMaterial = Client._getCachedExcelBinOutputByName(
-      'MaterialExcelConfigData',
-    )
-    if (String(infoId) in cachedAvatar) {
-      this.characterId = infoId
-      const characterInfo = new CharacterInfo(infoId)
-      this.costumeId = characterInfo.defaultCostumeId
-    } else if (String(infoId) in cachedCostume) {
-      this.costumeId = infoId
-      const costume = new CharacterCostume(infoId)
-      this.characterId = costume.characterId
-    } else if (String(infoId) in cachedMaterial) {
-      this.materialId = infoId
-    } else {
-      throw new Error(
-        `ProfilePictureId ${this.id} has invalid infoId ${infoId}`,
-      )
+    const unlockParam = profilePictureJson.unlockParam as number
+
+    switch (profilePictureJson.type) {
+      case 'PROFILE_PICTURE_UNLOCK_BY_AVATAR':
+        this.characterId = unlockParam
+        this.costumeId = new CharacterInfo(unlockParam).defaultCostumeId
+        break
+      case 'PROFILE_PICTURE_UNLOCK_BY_COSTUME':
+        this.costumeId = unlockParam
+        this.characterId = new CharacterCostume(unlockParam).characterId
+        break
+      case 'PROFILE_PICTURE_UNLOCK_BY_ITEM':
+        this.materialId = unlockParam
+        break
+      case 'PROFILE_PICTURE_UNLOCK_BY_PARENT_QUEST':
+        this.questId = unlockParam
+        break
     }
 
     this.icon = new ImageAssets(profilePictureJson.iconPath as string)

diff --git a/src/utils/ObjectKeyDecoder.ts b/src/utils/ObjectKeyDecoder.ts
@@ -52,14 +52,6 @@ export class ObjectKeyDecoder {
         (data) => data.id === 99999,
       ) as JsonObject
 
-      this.replaceDatas.push(
-        new ReplaceData(
-          Object.entries(dummyProfilePicture).find(
-            ([, v]) => v === 320001,
-          )?.[0] as string,
-          'infoId',
-        ),
-      )
       this.replaceDatas.push(
         new ReplaceData(
           Object.entries(dummyProfilePicture).find(