diff --git a/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_1.png b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_1.png new file mode 100644 index 0000000..bf134fa Binary files /dev/null and b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_1.png differ diff --git a/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_1.png.meta b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_1.png.meta new file mode 100644 index 0000000..1c55c5e --- /dev/null +++ b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_1.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 81aa4c7f74de0411b85bdf15c21bd5e1 +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: 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: iPhone + 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 + - serializedVersion: 3 + buildTarget: Server + 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/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_2.jpg b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_2.jpg new file mode 100644 index 0000000..a01ca32 Binary files /dev/null and b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_2.jpg differ diff --git a/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_2.jpg.meta b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_2.jpg.meta new file mode 100644 index 0000000..46243fc --- /dev/null +++ b/Forest/Assets/Art/GameBuild/Texture/BuildUI/BuildBg_2.jpg.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 0f68ff49660684ed7b3a65a7f094e04e +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: 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: iPhone + 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 + - serializedVersion: 3 + buildTarget: Server + 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/Forest/Assets/Art/UI/Prefab/UIBuyGoods.prefab b/Forest/Assets/Art/UI/Prefab/UIBuyGoods.prefab index 9402207..d1534f6 100644 --- a/Forest/Assets/Art/UI/Prefab/UIBuyGoods.prefab +++ b/Forest/Assets/Art/UI/Prefab/UIBuyGoods.prefab @@ -554,7 +554,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u514D\u8D39" + m_text: Free m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, @@ -1291,7 +1291,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u786E\u5B9A" + m_text: Yes m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, @@ -1440,7 +1440,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u53D6\u6D88" + m_text: Cancel m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8ff78e797c9504c05b77b3ed521b84a6, type: 2} m_sharedMaterial: {fileID: -6578629386010562579, guid: 8ff78e797c9504c05b77b3ed521b84a6, @@ -1739,8 +1739,74 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5635132457418752913, guid: e05323af44540403bbc02a94db734156, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4985810916669154318} m_SourcePrefab: {fileID: 100100000, guid: e05323af44540403bbc02a94db734156, type: 3} +--- !u!114 &4122826631012975918 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2325918073593504263, guid: e05323af44540403bbc02a94db734156, + type: 3} + m_PrefabInstance: {fileID: 1833082490013558569} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6288267309568435384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6288267309568435384 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5635132457418752913, guid: e05323af44540403bbc02a94db734156, + type: 3} + m_PrefabInstance: {fileID: 1833082490013558569} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4985810916669154318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6288267309568435384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4122826631012975918} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!224 &7550447369757967013 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8194573510791390604, guid: e05323af44540403bbc02a94db734156, diff --git a/Forest/Assets/Scenes/Build/Build_1.unity b/Forest/Assets/Scenes/Build/Build_1.unity index 2c01859..eced8f1 100644 --- a/Forest/Assets/Scenes/Build/Build_1.unity +++ b/Forest/Assets/Scenes/Build/Build_1.unity @@ -3457,7 +3457,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -10 - m_Sprite: {fileID: 21300000, guid: 83147324783244689a9d72b9fbe03a75, type: 3} + m_Sprite: {fileID: 21300000, guid: 81aa4c7f74de0411b85bdf15c21bd5e1, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Forest/Assets/Scenes/Build/Build_2.unity b/Forest/Assets/Scenes/Build/Build_2.unity index e8de356..112e1f4 100644 --- a/Forest/Assets/Scenes/Build/Build_2.unity +++ b/Forest/Assets/Scenes/Build/Build_2.unity @@ -5525,7 +5525,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -10 - m_Sprite: {fileID: 21300000, guid: 83147324783244689a9d72b9fbe03a75, type: 3} + m_Sprite: {fileID: 21300000, guid: 0f68ff49660684ed7b3a65a7f094e04e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs index 129f4c6..b9cb98e 100644 --- a/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs +++ b/Forest/Assets/Scripts/Gameplay/UI/Level/UIBuyGoodsController.cs @@ -154,13 +154,13 @@ public class UIBuyGoodsController : UIWindow CloseWin(); } - private void ADFailCallBack() + private async void ADFailCallBack() { //恢复游戏 Time.timeScale = 1f; BIManager.Instance.TrackEventLevel(Event.level_ad_show_fail, "101"); BIManager.Instance.TrackEventLevelOnce(EventFirst.fte_level_ad_show_fail, "101"); - UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); + await UIManager.Instance.OpenWindow(UIConstants.UITips, "Tip_AD_NotReady", () => { }); } private async void OpenShopInLevel()