From ed8d2b2346580851ea427792764164d1583a7296 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 08 五月 2026 16:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Assets/Editor/SpritePacking/SpriteSettings.asset | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/Assets/Editor/SpritePacking/SpriteSettings.asset b/Assets/Editor/SpritePacking/SpriteSettings.asset
index edd93cf..ed23de9 100644
--- a/Assets/Editor/SpritePacking/SpriteSettings.asset
+++ b/Assets/Editor/SpritePacking/SpriteSettings.asset
@@ -1575,6 +1575,28 @@
maxTextureSize: 2048
textureCompression: 1
textureFormat: 50
+ - folderName: HeroDebutHero_510017
+ 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
@@ -1663,3 +1685,47 @@
maxTextureSize: 2048
textureCompression: 1
textureFormat: 50
+ - folderName: HorseIcon
+ 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: FestivalActivity
+ 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
--
Gitblit v1.8.0