From 00149ebe87d426f1e80b8758561b94d5e2b644d8 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 03 四月 2026 11:26:54 +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 54bad18..1f00977 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -607,28 +607,6 @@
maxTextureSize: 2048
textureCompression: 1
textureFormat: 50
- - folderName: SkillNameIcon
- 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: Store
blockOffset: 1
enableRotation: 0
@@ -1465,6 +1443,28 @@
maxTextureSize: 2048
textureCompression: 1
textureFormat: 50
+ - folderName: HeroReturn
+ 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
@@ -1509,6 +1509,28 @@
maxTextureSize: 2048
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: SkinGift
blockOffset: 1
enableRotation: 0
--
Gitblit v1.8.0