diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_01.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_01.png.meta deleted file mode 100644 index b39c7486d4..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_01.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 5e52ff27f921f044a816fe47282215f9 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: ea482b69c4959394eafa9aa91b095cf7 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_02.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_02.png.meta deleted file mode 100644 index 7f31db267d..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_02.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: be4f4fcaa29405448bc178f8b53c2665 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 4ffa00b78428f1247a7d9ee509134eb5 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_03.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_03.png.meta deleted file mode 100644 index ffa4bf6e38..0000000000 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_03.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: f83a7cf9f1b0e354eaa4d9bb286bad7a -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 2423899c86993b14f9cf9a3d07e9b470 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: DynamicActivityAtlas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png deleted file mode 100644 index 898eca56ce..0000000000 Binary files a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_01.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_01.png rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png.meta b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png.meta similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_01.png.meta rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_01_png.png.meta diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png deleted file mode 100644 index dc6923b1bd..0000000000 Binary files a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_02.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_02.png rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png.meta b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png.meta similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_02.png.meta rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_02_png.png.meta diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png deleted file mode 100644 index 4a6f6c7069..0000000000 Binary files a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_03.png b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png similarity index 100% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/SheJiDaDian/r_guanka_sheji_bu_03.png rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png diff --git a/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png.meta b/Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png.meta similarity index 100% rename from Assets/ManagedResources/Icons/r_guanka_sheji_bu_03.png.meta rename to Assets/ManagedResources/Icons/r_guanka_sheji_bu_03_png.png.meta diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index c106de0352..beb11f318d 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -8119,7 +8119,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5e52ff27f921f044a816fe47282215f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 0588a537239acc347b569987c2422993, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8515,7 +8515,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: be4f4fcaa29405448bc178f8b53c2665, type: 3} + m_Sprite: {fileID: 21300000, guid: 9a7452e68cec9d34d9c0555cdff0c572, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -25618,7 +25618,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f83a7cf9f1b0e354eaa4d9bb286bad7a, type: 3} + m_Sprite: {fileID: 21300000, guid: d7707322ae9b89d4c82f5c4b9ef4ac9a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -49748,11 +49748,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4364234898477055512} m_Modifications: - - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, - type: 3} - propertyPath: m_Name - value: Effect_UI_changjing_qiankuanbaoguo - objectReference: {fileID: 0} - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} propertyPath: m_LocalPosition.x @@ -49808,6 +49803,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_Name + value: Effect_UI_changjing_qiankuanbaoguo + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} --- !u!4 &5379899409067946649 stripped @@ -49823,16 +49823,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7319957226166616999} m_Modifications: - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -49938,6 +49928,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &3110801484483406645 stripped