diff --git a/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat b/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat index 3407c2a..d4a0868 100644 Binary files a/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat and b/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat differ diff --git a/CollectCoins/Assets/Materials/Coin.mat b/CollectCoins/Assets/Materials/Coin.mat index d35d2ae..88cdaaa 100644 Binary files a/CollectCoins/Assets/Materials/Coin.mat and b/CollectCoins/Assets/Materials/Coin.mat differ diff --git a/CollectCoins/Assets/Scenes/CollectCoins.unity b/CollectCoins/Assets/Scenes/CollectCoins.unity index 44c9f67..2107f53 100644 Binary files a/CollectCoins/Assets/Scenes/CollectCoins.unity and b/CollectCoins/Assets/Scenes/CollectCoins.unity differ diff --git a/CollectCoins/Assets/Scenes/CollectCoins.unity.meta b/CollectCoins/Assets/Scenes/CollectCoins.unity.meta index aab9906..7815f0c 100644 --- a/CollectCoins/Assets/Scenes/CollectCoins.unity.meta +++ b/CollectCoins/Assets/Scenes/CollectCoins.unity.meta @@ -1,4 +1,4 @@ fileFormatVersion: 2 -guid: c20ecbe605d9f3749b6ecbf811cb2d80 +guid: b48fc750d71b8134397184c342c2bcc3 DefaultImporter: userData: diff --git a/CollectCoins/Assets/Scripts/CoinScript.cs b/CollectCoins/Assets/Scripts/CoinScript.cs index db24140..ea4f718 100644 --- a/CollectCoins/Assets/Scripts/CoinScript.cs +++ b/CollectCoins/Assets/Scripts/CoinScript.cs @@ -4,6 +4,8 @@ using System.Collections; public class CoinScript : MonoBehaviour { public float rotationSpeed = 100.0f; + public GUIText coinGUIText; + void Start () { } @@ -19,6 +21,10 @@ public class CoinScript : MonoBehaviour { { collider.SendMessage("pickup"); Destroy(this.gameObject); + // 触发显示金币数量 + coinGUIText.SendMessage("showTextHint", InventoryScript.coinCount.ToString()); + // 显示左下角图片和数量 + collider.SendMessage("showCoinCount"); } } } diff --git a/CollectCoins/Assets/Scripts/InventoryScript.cs b/CollectCoins/Assets/Scripts/InventoryScript.cs index 75cb540..76f37b7 100644 --- a/CollectCoins/Assets/Scripts/InventoryScript.cs +++ b/CollectCoins/Assets/Scripts/InventoryScript.cs @@ -5,6 +5,9 @@ public class InventoryScript : MonoBehaviour { // Use this for initialization public AudioClip pickupSound; + public static int coinCount = 0; + public GUIText coinCountText; + public GUITexture coinPic; void Start () { } @@ -17,5 +20,16 @@ public class InventoryScript : MonoBehaviour { void pickup() { AudioSource.PlayClipAtPoint(pickupSound, transform.position); + coinCount++; + } + + void showCoinCount() + { + if (!coinPic.enabled) + { + coinPic.enabled = true; + coinCountText.enabled = true; + } + coinCountText.text = coinCount.ToString(); } } diff --git a/CollectCoins/Assets/Scripts/TextHintScript.cs b/CollectCoins/Assets/Scripts/TextHintScript.cs new file mode 100644 index 0000000..d5ab355 --- /dev/null +++ b/CollectCoins/Assets/Scripts/TextHintScript.cs @@ -0,0 +1,43 @@ +using UnityEngine; +using System.Collections; + +public class TextHintScript : MonoBehaviour { + + // Use this for initialization + public int fontSizeAddSpeed = 1; + public float maxShowTime = 3.0f; + float timer = 0.0f; + public int maxfontSize = 100; + + void Start () { + + } + + // Update is called once per frame + void Update () { + if (guiText.enabled) + { + timer += Time.deltaTime; + if (guiText.fontSize < maxfontSize) + { + guiText.fontSize += fontSizeAddSpeed; + } + if (timer > maxShowTime) + { + guiText.enabled = false; + timer = 0.0f; + } + } + + } + + void showTextHint (string text) + { + if (!guiText.enabled) + { + guiText.enabled = true; + } + guiText.text = text; + timer = 0.0f; + } +} diff --git a/CollectCoins/Assets/Scripts/TextHintScript.cs.meta b/CollectCoins/Assets/Scripts/TextHintScript.cs.meta new file mode 100644 index 0000000..a0d8d09 --- /dev/null +++ b/CollectCoins/Assets/Scripts/TextHintScript.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6016e4bf32bdd7b4b825e06965ff6377 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/CollectCoins/Assets/Sounds.meta b/CollectCoins/Assets/Sounds.meta new file mode 100644 index 0000000..89526f3 --- /dev/null +++ b/CollectCoins/Assets/Sounds.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: a1286d80d540b4b4fa5d938e3ffa0b9a +folderAsset: yes +DefaultImporter: + userData: diff --git a/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3 b/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3 new file mode 100644 index 0000000..0804047 Binary files /dev/null and b/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3 differ diff --git a/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3.meta b/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3.meta new file mode 100644 index 0000000..b51e3a0 --- /dev/null +++ b/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 647fbd98c5dd8cf449638baf77c5e6a6 +AudioImporter: + serializedVersion: 4 + format: 0 + quality: .5 + stream: 1 + 3D: 0 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/CollectCoins/Assets/Textures.meta b/CollectCoins/Assets/Textures.meta index 9aa61f6..a65fd73 100644 --- a/CollectCoins/Assets/Textures.meta +++ b/CollectCoins/Assets/Textures.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55adb4081c6b94041b66dc5e93a86e86 +guid: eee839e72b48e45438c2082ae812dffa folderAsset: yes DefaultImporter: userData: diff --git a/CollectCoins/Assets/Textures/coin.png.meta b/CollectCoins/Assets/Textures/coin.png.meta index 7256070..305ddb7 100644 --- a/CollectCoins/Assets/Textures/coin.png.meta +++ b/CollectCoins/Assets/Textures/coin.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 8abe8fe8c5ddaa74d8ee10ec2e8dbcd2 +guid: 7b2341efd84de524f8d8b9e39fdb56f4 TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -25,10 +25,10 @@ TextureImporter: maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -38,8 +38,8 @@ TextureImporter: spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/CollectCoins/Assets/Textures/floor.jpg b/CollectCoins/Assets/Textures/floor.jpg new file mode 100644 index 0000000..c28fb01 Binary files /dev/null and b/CollectCoins/Assets/Textures/floor.jpg differ diff --git a/CollectCoins/Assets/Textures/floor.png.meta b/CollectCoins/Assets/Textures/floor.jpg.meta similarity index 96% rename from CollectCoins/Assets/Textures/floor.png.meta rename to CollectCoins/Assets/Textures/floor.jpg.meta index 536b686..ebe8d1f 100644 --- a/CollectCoins/Assets/Textures/floor.png.meta +++ b/CollectCoins/Assets/Textures/floor.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19960adcad453c44ca2f85b09aed3c48 +guid: cb6443244b408784c8b44a405040e801 TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 diff --git a/CollectCoins/Assets/Textures/floor.png b/CollectCoins/Assets/Textures/floor.png deleted file mode 100644 index 6b89229..0000000 Binary files a/CollectCoins/Assets/Textures/floor.png and /dev/null differ diff --git a/CollectCoins/Assets/Textures/hud_coin.jpg b/CollectCoins/Assets/Textures/hud_coin.jpg new file mode 100644 index 0000000..8e67d3a Binary files /dev/null and b/CollectCoins/Assets/Textures/hud_coin.jpg differ diff --git a/CollectCoins/Assets/Textures/hud_coin.jpg.meta b/CollectCoins/Assets/Textures/hud_coin.jpg.meta new file mode 100644 index 0000000..f507b9e --- /dev/null +++ b/CollectCoins/Assets/Textures/hud_coin.jpg.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 87a6e6a1efb241b41b2f1ee9ee0d33dc +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/CollectCoins/Library/AssetServerCacheV3 b/CollectCoins/Library/AssetServerCacheV3 index 9059a3f..516b4c7 100644 Binary files a/CollectCoins/Library/AssetServerCacheV3 and b/CollectCoins/Library/AssetServerCacheV3 differ diff --git a/CollectCoins/Library/CurrentLayout.dwlt b/CollectCoins/Library/CurrentLayout.dwlt index 1c115b4..d2c20ae 100644 Binary files a/CollectCoins/Library/CurrentLayout.dwlt and b/CollectCoins/Library/CurrentLayout.dwlt differ diff --git a/CollectCoins/Library/CurrentMaximizeLayout.dwlt b/CollectCoins/Library/CurrentMaximizeLayout.dwlt index 06046bc..5b5a98d 100644 Binary files a/CollectCoins/Library/CurrentMaximizeLayout.dwlt and b/CollectCoins/Library/CurrentMaximizeLayout.dwlt differ diff --git a/CollectCoins/Library/EditorUserBuildSettings.asset b/CollectCoins/Library/EditorUserBuildSettings.asset index 4300869..a71d6dd 100644 Binary files a/CollectCoins/Library/EditorUserBuildSettings.asset and b/CollectCoins/Library/EditorUserBuildSettings.asset differ diff --git a/CollectCoins/Library/InspectorExpandedItems.asset b/CollectCoins/Library/InspectorExpandedItems.asset index c0d0ddd..4f69c77 100644 Binary files a/CollectCoins/Library/InspectorExpandedItems.asset and b/CollectCoins/Library/InspectorExpandedItems.asset differ diff --git a/CollectCoins/Library/ProjectSettings.asset b/CollectCoins/Library/ProjectSettings.asset index 0e76a54..4d7e894 100644 Binary files a/CollectCoins/Library/ProjectSettings.asset and b/CollectCoins/Library/ProjectSettings.asset differ diff --git a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll index 4263d18..aff8977 100644 Binary files a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll and b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll differ diff --git a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll index 649231b..5380f5b 100644 Binary files a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll and b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll b/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll index 1a51f10..2d43c9c 100644 Binary files a/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll and b/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll differ diff --git a/CollectCoins/Library/ShaderCache.db b/CollectCoins/Library/ShaderCache.db new file mode 100644 index 0000000..b3f9882 Binary files /dev/null and b/CollectCoins/Library/ShaderCache.db differ diff --git a/CollectCoins/Library/assetDatabase3 b/CollectCoins/Library/assetDatabase3 index 000e4c7..afeb544 100644 Binary files a/CollectCoins/Library/assetDatabase3 and b/CollectCoins/Library/assetDatabase3 differ diff --git a/CollectCoins/Library/expandedItems b/CollectCoins/Library/expandedItems index 49d6afc..9d059ec 100644 Binary files a/CollectCoins/Library/expandedItems and b/CollectCoins/Library/expandedItems differ diff --git a/CollectCoins/Library/guidmapper b/CollectCoins/Library/guidmapper index df82c95..fef2138 100644 Binary files a/CollectCoins/Library/guidmapper and b/CollectCoins/Library/guidmapper differ diff --git a/CollectCoins/Library/metadata/19/19960adcad453c44ca2f85b09aed3c48 b/CollectCoins/Library/metadata/19/19960adcad453c44ca2f85b09aed3c48 deleted file mode 100644 index 731ba73..0000000 Binary files a/CollectCoins/Library/metadata/19/19960adcad453c44ca2f85b09aed3c48 and /dev/null differ diff --git a/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a b/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a index 4ee0b7a..f11ab3c 100644 Binary files a/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a and b/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a differ diff --git a/CollectCoins/Library/metadata/39/3944c5b23e9a9a048bdf782564025e55 b/CollectCoins/Library/metadata/39/3944c5b23e9a9a048bdf782564025e55 index 0c6f583..2a6e404 100644 Binary files a/CollectCoins/Library/metadata/39/3944c5b23e9a9a048bdf782564025e55 and b/CollectCoins/Library/metadata/39/3944c5b23e9a9a048bdf782564025e55 differ diff --git a/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 b/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 index f4af5ee..9e14461 100644 Binary files a/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 and b/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 differ diff --git a/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a b/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a index a426c2b..42d7d2f 100644 Binary files a/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a and b/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a differ diff --git a/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 b/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 index 33411d9..cd017f9 100644 Binary files a/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 and b/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 differ diff --git a/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b b/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b index 4f7fb40..4a955ea 100644 Binary files a/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b and b/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b differ diff --git a/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 b/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 new file mode 100644 index 0000000..d682659 Binary files /dev/null and b/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 differ diff --git a/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 b/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 new file mode 100644 index 0000000..56caa40 Binary files /dev/null and b/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 differ diff --git a/CollectCoins/Library/metadata/7b/7b2341efd84de524f8d8b9e39fdb56f4 b/CollectCoins/Library/metadata/7b/7b2341efd84de524f8d8b9e39fdb56f4 new file mode 100644 index 0000000..b440ac8 Binary files /dev/null and b/CollectCoins/Library/metadata/7b/7b2341efd84de524f8d8b9e39fdb56f4 differ diff --git a/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 b/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 index ca0ab0e..2aadda9 100644 Binary files a/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 and b/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 differ diff --git a/CollectCoins/Library/metadata/87/87a6e6a1efb241b41b2f1ee9ee0d33dc b/CollectCoins/Library/metadata/87/87a6e6a1efb241b41b2f1ee9ee0d33dc new file mode 100644 index 0000000..bd7f7d2 Binary files /dev/null and b/CollectCoins/Library/metadata/87/87a6e6a1efb241b41b2f1ee9ee0d33dc differ diff --git a/CollectCoins/Library/metadata/8a/8abe8fe8c5ddaa74d8ee10ec2e8dbcd2 b/CollectCoins/Library/metadata/8a/8abe8fe8c5ddaa74d8ee10ec2e8dbcd2 deleted file mode 100644 index 52ea7dc..0000000 Binary files a/CollectCoins/Library/metadata/8a/8abe8fe8c5ddaa74d8ee10ec2e8dbcd2 and /dev/null differ diff --git a/CollectCoins/Library/metadata/a0/a0c871c8a11f6034e90bca7f881e4a64 b/CollectCoins/Library/metadata/a0/a0c871c8a11f6034e90bca7f881e4a64 index 29c7a96..897a5d4 100644 Binary files a/CollectCoins/Library/metadata/a0/a0c871c8a11f6034e90bca7f881e4a64 and b/CollectCoins/Library/metadata/a0/a0c871c8a11f6034e90bca7f881e4a64 differ diff --git a/CollectCoins/Library/metadata/a1/a1286d80d540b4b4fa5d938e3ffa0b9a b/CollectCoins/Library/metadata/a1/a1286d80d540b4b4fa5d938e3ffa0b9a new file mode 100644 index 0000000..d0d4923 Binary files /dev/null and b/CollectCoins/Library/metadata/a1/a1286d80d540b4b4fa5d938e3ffa0b9a differ diff --git a/CollectCoins/Library/metadata/c2/c20ecbe605d9f3749b6ecbf811cb2d80 b/CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 similarity index 98% rename from CollectCoins/Library/metadata/c2/c20ecbe605d9f3749b6ecbf811cb2d80 rename to CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 index 934b2c9..ab41f74 100644 Binary files a/CollectCoins/Library/metadata/c2/c20ecbe605d9f3749b6ecbf811cb2d80 and b/CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 differ diff --git a/CollectCoins/Library/metadata/cb/cb6443244b408784c8b44a405040e801 b/CollectCoins/Library/metadata/cb/cb6443244b408784c8b44a405040e801 new file mode 100644 index 0000000..2354a9a Binary files /dev/null and b/CollectCoins/Library/metadata/cb/cb6443244b408784c8b44a405040e801 differ diff --git a/CollectCoins/Library/metadata/55/55adb4081c6b94041b66dc5e93a86e86 b/CollectCoins/Library/metadata/ee/eee839e72b48e45438c2082ae812dffa similarity index 98% rename from CollectCoins/Library/metadata/55/55adb4081c6b94041b66dc5e93a86e86 rename to CollectCoins/Library/metadata/ee/eee839e72b48e45438c2082ae812dffa index 7e7148f..c7a3f4c 100644 Binary files a/CollectCoins/Library/metadata/55/55adb4081c6b94041b66dc5e93a86e86 and b/CollectCoins/Library/metadata/ee/eee839e72b48e45438c2082ae812dffa differ diff --git a/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 b/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 index a1c8ead..1fd5846 100644 Binary files a/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 and b/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 differ diff --git a/CollectCoins/ProjectSettings/ProjectSettings.asset b/CollectCoins/ProjectSettings/ProjectSettings.asset index 0e76a54..4d7e894 100644 Binary files a/CollectCoins/ProjectSettings/ProjectSettings.asset and b/CollectCoins/ProjectSettings/ProjectSettings.asset differ