Merge branch 'master' into dev

JX3BOX · Jan 7, 2025 · c279b6e · c279b6e
2 parents bc989c7 + e2276c4
commit c279b6e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/src/assets/css/adventure/landscape.less b/src/assets/css/adventure/landscape.less
@@ -513,6 +513,17 @@
                     left: 6px;
                 }
             }
+            &.gsyj {
+                top: 319px;
+                left: 273px;
+                .u-item__img {
+                    width: 180px;
+                }
+                .m-item__text {
+                    top: 0px;
+                    left: 70px;
+                }
+            }
         }
     }
     .m-title {

diff --git a/src/assets/css/adventure/portrait.less b/src/assets/css/adventure/portrait.less
@@ -389,6 +389,17 @@
                     left: 6px;
                 }
             }
+            &.gsyj {
+                top: 319px;
+                left: 273px;
+                .u-item__img {
+                    width: 180px;
+                }
+                .m-item__text {
+                    top: 0px;
+                    left: 70px;
+                }
+            }
         }
     }
     .m-qy-box {

diff --git a/src/assets/img/treasure/pt/143.png b/src/assets/img/treasure/pt/143.png
diff --git a/src/assets/img/treasure/world/142.png b/src/assets/img/treasure/world/142.png
diff --git a/src/assets/img/treasure/world/142_act.png b/src/assets/img/treasure/world/142_act.png
diff --git a/src/assets/js/treasure.js b/src/assets/js/treasure.js
@@ -3,20 +3,21 @@ import { getRoleGameAchievements, getAdventures, getAchievements } from "@/servi
 const perfectAchievement = {
     111: { hasClass: "zhg", zIndex: 9 },
     3: { hasClass: "yylj", zIndex: 10 },
-    88: { hasClass: "xxjt", zIndex: 14 },
-    83: { hasClass: "zzwg", zIndex: 16 },
-    104: { hasClass: "wldg", zIndex: 20 },
-    78: { hasClass: "tjh", zIndex: 17 },
+    88: { hasClass: "xxjt", zIndex: 15 },
+    83: { hasClass: "zzwg", zIndex: 18 },
+    104: { hasClass: "wldg", zIndex: 22 },
+    78: { hasClass: "tjh", zIndex: 19 },
     1: { hasClass: "sssh", zIndex: 7 },
-    2: { hasClass: "scqf", zIndex: 18 },
+    2: { hasClass: "scqf", zIndex: 20 },
     126: { hasClass: "swxf", zIndex: 12 },
     21: { hasClass: "swbj", zIndex: 11 },
-    121: { hasClass: "rjg", zIndex: 19 },
+    121: { hasClass: "rjg", zIndex: 21 },
     106: { hasClass: "qqj", zIndex: 13 },
     90: { hasClass: "lnrh", zIndex: 8 },
-    66: { hasClass: "jcs", zIndex: 15 },
-    136: { hasClass: "kwyh", zIndex: 15 },
+    66: { hasClass: "jcs", zIndex: 17 },
+    136: { hasClass: "kwyh", zIndex: 17 },
     135: { hasClass: "fgzm", zIndex: 13 },
+    142: { hasClass: "gsyj", zIndex: 16 },
 };
 
 let formatDateTime = (dateTimeString) => {