Merge branch 'develop' into feature/tier-list-builder

Wolfteam · Feb 5, 2021 · 9d84aea · 9d84aea
2 parents c89d4da + 274b9ed
commit 9d84aea
Show file tree

Hide file tree

Showing 36 changed files with 702 additions and 174 deletions.
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
diff --git a/assets/db/characters.json b/assets/db/characters.json
@@ -5331,7 +5331,7 @@
       "fullImage": "Ganyu.png",
       "secondFullImage": null,
       "isComingSoon": false,
-      "isNew": true,
+      "isNew": false,
       "isFemale": true,
       "region": "liyue",
       "role": "supportDps",
@@ -7435,8 +7435,8 @@
           "weaponImages": [
             "aquila_favonia.png",
             "the_black_sword.png",
-            "the_black_sword.png",
-            "lions_roar.png"
+            "lions_roar.png",
+            "the_flute.png"
           ],
           "artifacts": [
             {
@@ -7476,8 +7476,8 @@
           "weaponImages": [
             "aquila_favonia.png",
             "the_black_sword.png",
-            "the_black_sword.png",
-            "lions_roar.png"
+            "lions_roar.png",
+            "the_flute.png"
           ],
           "artifacts": [
             {
@@ -15387,11 +15387,11 @@
       "image": "Xiao.png",
       "fullImage": "Xiao.png",
       "secondFullImage": null,
-      "isComingSoon": true,
-      "isNew": false,
+      "isComingSoon": false,
+      "isNew": true,
       "isFemale": false,
       "region": "liyue",
-      "role": "na",
+      "role": "mainDps",
       "birthday": "04/17",
       "ascensionMaterials": [
         {
@@ -15783,7 +15783,50 @@
           ]
         }
       ],
-      "builds": [],
+      "builds": [
+        {
+          "isSupport": false,
+          "weaponImages": [
+            "primordial_jade_winged_spear.png",
+            "skyward_spine.png",
+            "lithic_spear.png",
+            "blackcliff_pole.png",
+            "crescent_pike.png"
+          ],
+          "artifacts": [
+            {
+              "multiples": [
+                {
+                  "quantity": 2,
+                  "image": "viridescent_venerer_4.png"
+                },
+                {
+                  "quantity": 2,
+                  "image": "gladiators_finale_4.png"
+                }
+              ],
+              "stats": [
+                "hp",
+                "atk",
+                "atkPercentage",
+                "anemoDmgBonusPercentage",
+                "critDmgPercentage"
+              ]
+            },
+            {
+              "one": "viridescent_venerer_4.png",
+              "multiples": [],
+              "stats": [
+                "hp",
+                "atk",
+                "atkPercentage",
+                "anemoDmgBonusPercentage",
+                "critDmgPercentage"
+              ]
+            }
+          ]
+        }
+      ],
       "skills": [
         {
           "key": "s1",
@@ -17347,9 +17390,9 @@
         {
           "isSupport": false,
           "weaponImages": [
-            "vortex_vanquisher.png",
-            "skyward_spine.png",
             "primordial_jade_winged_spear.png",
+            "vortex_vanquisher.png",
+            "lithic_spear.png",
             "crescent_pike.png"
           ],
           "artifacts": [
@@ -17360,7 +17403,7 @@
                 "hp",
                 "atk",
                 "atkPercentage",
-                "physDmgBonusPercentage",
+                "geoDmgBonusPercentage",
                 "critDmgPercentage"
               ]
             },
@@ -17371,7 +17414,7 @@
                 "hp",
                 "atk",
                 "atkPercentage",
-                "physDmgBonusPercentage",
+                "geoDmgBonusPercentage",
                 "critDmgPercentage"
               ]
             }
@@ -17380,8 +17423,9 @@
         {
           "isSupport": true,
           "weaponImages": [
-            "vortex_vanquisher.png",
+            "staff_of_homa.png",
             "skyward_spine.png",
+            "lithic_spear.png",
             "favonius_lance.png",
             "prototype_grudge.png"
           ],

diff --git a/assets/db/materials.json b/assets/db/materials.json
@@ -1187,6 +1187,16 @@
       "level": 0,
       "type": "elemental",
       "days": []
+    },
+    {
+      "key": "JuvenileJade",
+      "image": "juvenile_jade.png",
+      "isFromBoss": true,
+      "isForCharacters": true,
+      "isForWeapons": false,
+      "level": 0,
+      "type": "elemental",
+      "days": []
     }
   ],
   "jewels": [