From 4cb46879f7c7246f9a7cc4020d09551adb5fd16d Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:44:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

---
 Assets/Editor/SpritePacking/SpriteSettings.asset |   66 ++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index 1f00977..edd93cf 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -1465,6 +1465,28 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
+  - folderName: HeroDebutZhanLing
+    blockOffset: 1
+    enableRotation: 0
+    enableTightPacking: 0
+    padding: 4
+    readable: 0
+    generateMipMaps: 0
+    sRGB: 1
+    filterMode: 1
+    platformSettings:
+    - name: Standalone
+      maxTextureSize: 2048
+      textureCompression: 1
+      textureFormat: 4
+    - name: Android
+      maxTextureSize: 2048
+      textureCompression: 1
+      textureFormat: 50
+    - name: iPhone
+      maxTextureSize: 2048
+      textureCompression: 1
+      textureFormat: 50
   - folderName: HeroDebutHero_510016
     blockOffset: 1
     enableRotation: 0
@@ -1510,6 +1532,28 @@
       textureCompression: 1
       textureFormat: 50
   - folderName: HeroDebutHero_530016
+    blockOffset: 1
+    enableRotation: 0
+    enableTightPacking: 0
+    padding: 4
+    readable: 0
+    generateMipMaps: 0
+    sRGB: 1
+    filterMode: 1
+    platformSettings:
+    - name: Standalone
+      maxTextureSize: 2048
+      textureCompression: 1
+      textureFormat: 4
+    - name: Android
+      maxTextureSize: 2048
+      textureCompression: 1
+      textureFormat: 50
+    - name: iPhone
+      maxTextureSize: 2048
+      textureCompression: 1
+      textureFormat: 50
+  - folderName: HeroDebutHero_520016
     blockOffset: 1
     enableRotation: 0
     enableTightPacking: 0
@@ -1598,28 +1642,6 @@
       textureCompression: 1
       textureFormat: 50
   - folderName: OSRankHeroTrain
-    blockOffset: 1
-    enableRotation: 0
-    enableTightPacking: 0
-    padding: 4
-    readable: 0
-    generateMipMaps: 0
-    sRGB: 1
-    filterMode: 1
-    platformSettings:
-    - name: Standalone
-      maxTextureSize: 2048
-      textureCompression: 1
-      textureFormat: 4
-    - name: Android
-      maxTextureSize: 2048
-      textureCompression: 1
-      textureFormat: 50
-    - name: iPhone
-      maxTextureSize: 2048
-      textureCompression: 1
-      textureFormat: 50
-  - folderName: OSRankMingge
     blockOffset: 1
     enableRotation: 0
     enableTightPacking: 0

--
Gitblit v1.8.0