From 537957ea5d7c57dddbb45589a77739d4304cb46d Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 16 七月 2026 11:50:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_client

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

diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index 1d880ca..4650a87 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -1905,6 +1905,28 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
+  - folderName: HeroSkinFlashSaleSkin_5200131
+    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
@@ -1993,6 +2015,28 @@
       maxTextureSize: 2048
       textureCompression: 1
       textureFormat: 50
+  - folderName: HeroSkinFlashSaleSkin_5300121
+    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

--
Gitblit v1.8.0