Merge branch 'main' of git.chengdu.pundit.company:castbox/gitea_ap_art_assets

activity/level_psd/README.md

@@ -0,0 +1,3 @@
+存放活动的资源
+
+活动子关卡拼图psd_id编号从100000开始-149999（10万-14.9999万）

activity/main_psd/README.md

@@ -0,0 +1,3 @@
+存放活动的资源
+
+活动封面拼图psd_id编号从90000开始-99999(9万-9.9999万)

check_compress_psd.py

@@ -64,7 +64,7 @@ def parse_psd(path):
                 if has_base:
                     log.append("存在多个base图层")
                 has_base = True
-            elif not is_activity_main_psd and nArr[0] == 'finish':
+            elif nArr[0] == 'finish':
                 if has_finish:
                     log.append("存在多个finish图层")
                 has_finish = True
@@ -94,7 +94,7 @@ def parse_psd(path):
                 auto_stages[nArr[1]].append(nArr[2])
             elif nArr[0] == 'thumbnail' or nArr[0] == 'role' or nArr[0] == 'rptmp':
                 pass
-            elif is_activity_main_psd and nArr[0] == 'dot':
+            elif is_activity_main_psd and nArr[0] == 'entry':
                 if len(nArr) != 4:
                     log.append("活动子点位，命名错误：{}".format(item.name))
             elif is_activity_main_psd and nArr[0] == 'base':
@@ -118,7 +118,7 @@ def parse_psd(path):
     if not has_base:
         log.append("未检测到base图层\n")
 
-    if not is_activity_main_psd and not has_finish:
+    if not has_finish:
         log.append("未检测到finish图层\n")
 
     for stage in patch_stages: 

version.json

@@ -1572,6 +1572,7 @@
     "9": "8763b1aaa2f9e912fafc62d8ece7936e2b6715a6",
     "90": "2501bfb8d3b01598d3bb57a7dc54c518ca62e228",
     "900": "2539dfe26204667c84db16b49ba9cae98289e633",
+    "90000": "54748ac6f85bb442681fd3646540e21aca8d41db",
     "901": "d17f1c1954d16b9adfae896ffb79235601c14226",
     "902": "7db0cd70ad3bfda76b59bdfa3bfd89e0c5e84294",
     "903": "7c553c29367cdcce406ac2a7d563192ff7d6c529",