diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas index d207db20..c38b0215 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_登录.spriteatlas @@ -72,24 +72,18 @@ SpriteAtlas: variantMultiplier: 1 packables: - {fileID: 21300000, guid: 346ace4c36c0e70439cc4e264a54e7fe, type: 3} + - {fileID: 21300000, guid: 1f32cc3539821d84fa1d38bdc7e15faa, type: 3} - {fileID: 21300000, guid: 9c4f53e9ccf3de442994111b32d0334c, type: 3} + - {fileID: 21300000, guid: a7b373fa6831d8f41abad130b231ff33, type: 3} - {fileID: 21300000, guid: 329c27d19bace40408fe12636d57a348, type: 3} + - {fileID: 21300000, guid: b3fc31f739543024e8e7e7bf648f27f6, type: 3} bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: - - 329c27d19bace40408fe12636d57a348: 21300000 - - 9c4f53e9ccf3de442994111b32d0334c: 21300000 - - 346ace4c36c0e70439cc4e264a54e7fe: 21300000 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: 329c27d19bace40408fe12636d57a348, type: 3} - - {fileID: 21300000, guid: 9c4f53e9ccf3de442994111b32d0334c, type: 3} - - {fileID: 21300000, guid: 346ace4c36c0e70439cc4e264a54e7fe, type: 3} - m_PackedSpriteNamesToIndex: - - dl_bt3 - - dl_bt2 - - dl_bt1 + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u767B\u5F55" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameMainForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameMainForm.prefab index e61b80b0..0202a0e0 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameMainForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameMainForm.prefab @@ -393,7 +393,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.0000076294, y: -1.4309} - m_SizeDelta: {x: 346, y: 119} + m_SizeDelta: {x: 413, y: 177} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4761366044680436145 CanvasRenderer: @@ -423,7 +423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9c4f53e9ccf3de442994111b32d0334c, type: 3} + m_Sprite: {fileID: 21300000, guid: a7b373fa6831d8f41abad130b231ff33, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -468,7 +468,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.0000076294, y: -1.4309} - m_SizeDelta: {x: 346, y: 119} + m_SizeDelta: {x: 413, y: 177} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4592885157423171675 CanvasRenderer: @@ -498,7 +498,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 346ace4c36c0e70439cc4e264a54e7fe, type: 3} + m_Sprite: {fileID: 21300000, guid: 1f32cc3539821d84fa1d38bdc7e15faa, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -956,7 +956,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.0000076294, y: -1.4309} - m_SizeDelta: {x: 346, y: 119} + m_SizeDelta: {x: 413, y: 177} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &320093249577183939 CanvasRenderer: @@ -986,7 +986,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 329c27d19bace40408fe12636d57a348, type: 3} + m_Sprite: {fileID: 21300000, guid: b3fc31f739543024e8e7e7bf648f27f6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt1_2.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt1_2.png new file mode 100644 index 00000000..a4f6d22f Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt1_2.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt1_2.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt1_2.png.meta new file mode 100644 index 00000000..c40a53f9 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt1_2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 1f32cc3539821d84fa1d38bdc7e15faa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt2_2.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt2_2.png new file mode 100644 index 00000000..5ba40173 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt2_2.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt2_2.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt2_2.png.meta new file mode 100644 index 00000000..91d8ae97 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt2_2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: a7b373fa6831d8f41abad130b231ff33 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt3_2.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt3_2.png new file mode 100644 index 00000000..6b66dc49 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt3_2.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt3_2.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt3_2.png.meta new file mode 100644 index 00000000..bc75600c --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/登录/dl_bt3_2.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: b3fc31f739543024e8e7e7bf648f27f6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs index 2e8d7cc3..553864cd 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameMainForm.cs @@ -10,14 +10,12 @@ namespace GameLogic { #region 脚本工具生成的代码 private RectTransform m_rect_GameModel; - private RectTransform m_rect_GameTimeLen; private Button m_btn_GameStart; private Button m_btn_Setting; private Button m_btn_GameRank; protected override void ScriptGenerator() { m_rect_GameModel = FindChildComponent("Bg/m_rect_GameModel"); - m_rect_GameTimeLen = FindChildComponent("Bg/m_rect_GameTimeLen"); m_btn_GameStart = FindChildComponent