From 9fde1256f221b0f299d2d53f474bcf46fc886106 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期一, 03 十一月 2025 11:26:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
/dev/null | 127 ------------------------------------------
Sprite/Arena.spriteatlasv2 | 2
Sprite/4Interactable/arena_img_600.png.meta | 2
UIComp/GiftBaseCell.prefab | 2
Sprite/4Interactable/arena_img_600.png | 0
Sprite/4Interactable.spriteatlasv2 | 3
UI/ArenaAwardWin.prefab | 4
7 files changed, 5 insertions(+), 135 deletions(-)
diff --git a/Sprite/4Interactable.spriteatlasv2 b/Sprite/4Interactable.spriteatlasv2
index cdfc75c..f74d9a9 100644
--- a/Sprite/4Interactable.spriteatlasv2
+++ b/Sprite/4Interactable.spriteatlasv2
@@ -116,7 +116,6 @@
- {fileID: 2800000, guid: 5397fc512e3c6a647a42b932ef293903, type: 3}
- {fileID: 2800000, guid: 072ff6d7795df3c43b826560a2ee4df6, type: 3}
- {fileID: 2800000, guid: 9cf19bfc973f01b4dafd24cb0ef01844, type: 3}
- - {fileID: 2800000, guid: c9e8ad4089510cc41ae40be5ef751b63, type: 3}
- {fileID: 2800000, guid: 9b84c47ad91af6c4699eb569c34cd6cc, type: 3}
- {fileID: 2800000, guid: 20cf7711243c10c4789c4961fa81e3fd, type: 3}
- {fileID: 2800000, guid: 37ec1f847e49721448e5a9c3fc0c7020, type: 3}
@@ -124,7 +123,6 @@
- {fileID: 2800000, guid: 3affaf940483cd640a2e6f732392dfcb, type: 3}
- {fileID: 2800000, guid: 25469b324ae12bd4980978504ffb3581, type: 3}
- {fileID: 2800000, guid: c14c1f7e4d2e2924e9599baf08477443, type: 3}
- - {fileID: 2800000, guid: 852e8b445668ec64eac9456b21aed92a, type: 3}
- {fileID: 2800000, guid: 9e755ae493464e24a8cd11d969bb6479, type: 3}
- {fileID: 2800000, guid: 28c0a56b9e5a8e9408755b646593557f, type: 3}
- {fileID: 2800000, guid: 0b42dfc347a088a4e87bd1aa3bf12179, type: 3}
@@ -134,4 +132,5 @@
- {fileID: 2800000, guid: ebe223400eee4244e888079686cb190a, type: 3}
- {fileID: 2800000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
- {fileID: 2800000, guid: 387750fa3f96ba14286328e1772d4825, type: 3}
+ - {fileID: 2800000, guid: 7e47c8f16a0dd7348964ce5b84234ba6, type: 3}
m_IsVariant: 0
diff --git a/Sprite/Arena/arena_img_600.png b/Sprite/4Interactable/arena_img_600.png
similarity index 100%
rename from Sprite/Arena/arena_img_600.png
rename to Sprite/4Interactable/arena_img_600.png
Binary files differ
diff --git a/Sprite/4Interactable/mainboss_img_240.png.meta b/Sprite/4Interactable/arena_img_600.png.meta
similarity index 98%
rename from Sprite/4Interactable/mainboss_img_240.png.meta
rename to Sprite/4Interactable/arena_img_600.png.meta
index b716515..1103d36 100644
--- a/Sprite/4Interactable/mainboss_img_240.png.meta
+++ b/Sprite/4Interactable/arena_img_600.png.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c9e8ad4089510cc41ae40be5ef751b63
+guid: 7e47c8f16a0dd7348964ce5b84234ba6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git a/Sprite/4Interactable/mainboss_img_240.png b/Sprite/4Interactable/mainboss_img_240.png
deleted file mode 100644
index 467b866..0000000
--- a/Sprite/4Interactable/mainboss_img_240.png
+++ /dev/null
Binary files differ
diff --git a/Sprite/4Interactable/mainboss_img_79.png b/Sprite/4Interactable/mainboss_img_79.png
deleted file mode 100644
index c64cb6a..0000000
--- a/Sprite/4Interactable/mainboss_img_79.png
+++ /dev/null
Binary files differ
diff --git a/Sprite/4Interactable/mainboss_img_79.png.meta b/Sprite/4Interactable/mainboss_img_79.png.meta
deleted file mode 100644
index 9494270..0000000
--- a/Sprite/4Interactable/mainboss_img_79.png.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 852e8b445668ec64eac9456b21aed92a
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- flipGreenChannel: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- vTOnly: 0
- ignoreMipmapLimit: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: 1
- aniso: 1
- mipBias: 0
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName: ui/sprite/4interactable
- assetBundleVariant:
diff --git a/Sprite/Arena.spriteatlasv2 b/Sprite/Arena.spriteatlasv2
index c94709b..f41d638 100644
--- a/Sprite/Arena.spriteatlasv2
+++ b/Sprite/Arena.spriteatlasv2
@@ -11,7 +11,6 @@
m_MasterAtlas: {fileID: 0}
m_ImporterData:
packables:
- - {fileID: 2800000, guid: 0b7d438bc3aaaa545a4883d90eb5db79, type: 3}
- {fileID: 2800000, guid: cdfc130190807244980ff3236bab40c0, type: 3}
- {fileID: 2800000, guid: fcd97b7418fdf6742807c04182d846bc, type: 3}
- {fileID: 2800000, guid: 2ba877dbae698a74884a9dd794589b53, type: 3}
@@ -30,7 +29,6 @@
- {fileID: 2800000, guid: 4073b0802cd45c244a91ddc8442a9fb6, type: 3}
- {fileID: 2800000, guid: fb3b1e356cb9050469807aa2d86e60fd, type: 3}
- {fileID: 2800000, guid: 46da5bae9dca59d45b22d0151ac1c237, type: 3}
- - {fileID: 2800000, guid: 7e47c8f16a0dd7348964ce5b84234ba6, type: 3}
- {fileID: 2800000, guid: 1d302c72053da9d4dbd776ef2343e61e, type: 3}
- {fileID: 2800000, guid: b83a50e4de5e10e46a3ff3ba482c1a13, type: 3}
- {fileID: 2800000, guid: 162d9e5d69f46354c8851ac794a5781c, type: 3}
diff --git a/Sprite/Arena/arena_img_111.png b/Sprite/Arena/arena_img_111.png
deleted file mode 100644
index c64cb6a..0000000
--- a/Sprite/Arena/arena_img_111.png
+++ /dev/null
Binary files differ
diff --git a/Sprite/Arena/arena_img_111.png.meta b/Sprite/Arena/arena_img_111.png.meta
deleted file mode 100644
index 5634265..0000000
--- a/Sprite/Arena/arena_img_111.png.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 0b7d438bc3aaaa545a4883d90eb5db79
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- flipGreenChannel: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- vTOnly: 0
- ignoreMipmapLimit: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: 1
- aniso: 1
- mipBias: 0
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName: ui/sprite/arena
- assetBundleVariant:
diff --git a/Sprite/Arena/arena_img_600.png.meta b/Sprite/Arena/arena_img_600.png.meta
deleted file mode 100644
index f156f85..0000000
--- a/Sprite/Arena/arena_img_600.png.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 7e47c8f16a0dd7348964ce5b84234ba6
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 13
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- flipGreenChannel: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- vTOnly: 0
- ignoreMipmapLimit: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: 1
- aniso: 1
- mipBias: 0
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- flipbookRows: 1
- flipbookColumns: 1
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- swizzle: 50462976
- cookieLightType: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- ignorePlatformSupport: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- mipmapLimitGroupName:
- pSDRemoveMatte: 0
- userData:
- assetBundleName: ui/sprite/arena
- assetBundleVariant:
diff --git a/UI/ArenaAwardWin.prefab b/UI/ArenaAwardWin.prefab
index 4b8fb7d..5a83ed9 100644
--- a/UI/ArenaAwardWin.prefab
+++ b/UI/ArenaAwardWin.prefab
@@ -2487,8 +2487,8 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 0b7d438bc3aaaa545a4883d90eb5db79, type: 3}
- m_Type: 0
+ m_Sprite: {fileID: 21300000, guid: 28c0a56b9e5a8e9408755b646593557f, type: 3}
+ m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
diff --git a/UIComp/GiftBaseCell.prefab b/UIComp/GiftBaseCell.prefab
index 9723358..b109d67 100644
--- a/UIComp/GiftBaseCell.prefab
+++ b/UIComp/GiftBaseCell.prefab
@@ -389,7 +389,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: c9e8ad4089510cc41ae40be5ef751b63, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 0b42dfc347a088a4e87bd1aa3bf12179, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
--
Gitblit v1.8.0