From 20057cf412be22de40b0e25b884fb11cd0c7af1f Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 22 五月 2026 11:48:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client

---
 Assets/Editor/SpritePacking/SpriteSettings.asset |  292 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 289 insertions(+), 3 deletions(-)

diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index 9c82c9d..8e5bd97 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -1641,6 +1641,94 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
+  - folderName: HeroSkinFlashSaleSkin_5100111
+    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: HeroSkinFlashSaleSkin_5100121
+    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: HeroSkinFlashSaleSkin_5100131
+    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: HeroSkinFlashSaleSkin_5100141
+    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: HeroSkinFlashSaleSkin_5100161
     blockOffset: 1
     enableRotation: 0
@@ -1663,7 +1751,7 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
-  - folderName: HeroSkinFlashSaleSkin_5400161
+  - folderName: HeroSkinFlashSaleSkin_5100171
     blockOffset: 1
     enableRotation: 0
     enableTightPacking: 0
@@ -1685,7 +1773,51 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
-  - folderName: HeroSkinFlashSaleSkin_5300161
+  - folderName: HeroSkinFlashSaleSkin_5200111
+    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: HeroSkinFlashSaleSkin_5200121
+    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: HeroSkinFlashSaleSkin_5200141
     blockOffset: 1
     enableRotation: 0
     enableTightPacking: 0
@@ -1729,7 +1861,161 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
-  - folderName: HeroSkinFlashSaleSkin_5100171
+  - folderName: HeroSkinFlashSaleSkin_5300081
+    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: HeroSkinFlashSaleSkin_5300131
+    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: HeroSkinFlashSaleSkin_5300141
+    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: HeroSkinFlashSaleSkin_5300161
+    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: HeroSkinFlashSaleSkin_5400091
+    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: HeroSkinFlashSaleSkin_5400131
+    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: HeroSkinFlashSaleSkin_5400141
+    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: HeroSkinFlashSaleSkin_5400161
     blockOffset: 1
     enableRotation: 0
     enableTightPacking: 0

--
Gitblit v1.8.0