Assets/Resources/Music/BGM1.mp3Binary files differ
Assets/Resources/Music/BGM2.mp3Binary files differ
Assets/Resources/Music/BOSS死亡.mp3Binary files differ
Assets/Resources/Music/BOSS死亡.mp3.meta
File was renamed from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 8c4936a5984b167448607471b79ab3a1 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/BOSS死亡.wavBinary files differ
Assets/Resources/Music/BOSS死亡.wav.meta
File was deleted Assets/Resources/Music/UI按键.mp3Binary files differ
Assets/Resources/Music/不可点击_错误.mp3Binary files differ
Assets/Resources/Music/不可点击_错误.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\344\270\215\345\217\257\347\202\271\345\207\273_\351\224\231\350\257\257.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 2ee80335bcaca8d4889f41fe043ddab7 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/不可点击_错误.wavBinary files differ
Assets/Resources/Music/不可点击_错误.wav.meta
File was deleted Assets/Resources/Music/冰淇淋技能.mp3Binary files differ
Assets/Resources/Music/冰淇淋技能.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\345\206\260\346\267\207\346\267\213\346\212\200\350\203\275.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: f998999a83c9d7b4c8df05a190374d86 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/冰淇淋技能.wavBinary files differ
Assets/Resources/Music/冰淇淋技能.wav.meta
File was deleted Assets/Resources/Music/拖动宝石时.mp3Binary files differ
Assets/Resources/Music/拖动宝石时.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\346\213\226\345\212\250\345\256\235\347\237\263\346\227\266.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: da404fd9f776d3e42b84a9881b5eeeab AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/拖动宝石时.wavBinary files differ
Assets/Resources/Music/拖动宝石时.wav.meta
File was deleted Assets/Resources/Music/放下宝石.mp3Binary files differ
Assets/Resources/Music/放下宝石.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\346\224\276\344\270\213\345\256\235\347\237\263.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: bd8696bf8e76cb74481d247a54f298f2 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/放下宝石.wavBinary files differ
Assets/Resources/Music/放下宝石.wav.meta
File was deleted Assets/Resources/Music/敌人攻击塔.mp3Binary files differ
Assets/Resources/Music/敌人攻击塔.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\346\225\214\344\272\272\346\224\273\345\207\273\345\241\224.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 466ddd0a8e2d46543b52711e68f38b9f AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/敌人攻击塔.wavBinary files differ
Assets/Resources/Music/敌人攻击塔.wav.meta
File was deleted Assets/Resources/Music/木攻击.mp3Binary files differ
Assets/Resources/Music/木攻击.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\346\234\250\346\224\273\345\207\273.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 88dfd354648519e45b2a965e649de74d AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/木攻击.wavBinary files differ
Assets/Resources/Music/木攻击.wav.meta
File was deleted Assets/Resources/Music/气泡.mp3Binary files differ
Assets/Resources/Music/水攻击.mp3Binary files differ
Assets/Resources/Music/水攻击.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\346\260\264\346\224\273\345\207\273.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 8f059b53a030288448c963ef3759db4a AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/水攻击.wavBinary files differ
Assets/Resources/Music/水攻击.wav.meta
File was deleted Assets/Resources/Music/游戏结束.mp3Binary files differ
Assets/Resources/Music/火攻击.mp3Binary files differ
Assets/Resources/Music/火攻击.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 5a76047bef3156a4da0442f7dab87e99 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/火攻击.wavBinary files differ
Assets/Resources/Music/火焰喷射.mp3Binary files differ
Assets/Resources/Music/玉米狙击子弹.mp3Binary files differ
Assets/Resources/Music/玉米狙击子弹.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\347\216\211\347\261\263\347\213\231\345\207\273\345\255\220\345\274\271.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 6b762a9d5bf3dd249bd902aa517b7fe1 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/玉米狙击子弹.wavBinary files differ
Assets/Resources/Music/玉米狙击子弹.wav.meta
File was deleted Assets/Resources/Music/电技能.mp3Binary files differ
Assets/Resources/Music/电技能.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\347\224\265\346\212\200\350\203\275.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: a6fa0f40693528844b582348385dc07b AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/电技能.wavBinary files differ
Assets/Resources/Music/电技能.wav.meta
File was deleted Assets/Resources/Music/结算分数.mp3Binary files differ
Assets/Resources/Music/结算分数.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\347\273\223\347\256\227\345\210\206\346\225\260.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 3a9819c1e494a214e88a51ca9b776aee AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/结算分数.wavBinary files differ
Assets/Resources/Music/结算分数.wav.meta
File was deleted Assets/Resources/Music/翻书.mp3Binary files differ
Assets/Resources/Music/翻书.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\347\277\273\344\271\246.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: fe440c9288a1fb74eb38f5bf29748553 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/翻书.wavBinary files differ
Assets/Resources/Music/翻书.wav.meta
File was deleted Assets/Resources/Music/选择buff后.mp3Binary files differ
Assets/Resources/Music/选择buff后.mp3.metacopy from "Assets/Resources/Music/\347\201\253\346\224\273\345\207\273.wav.meta" copy to "Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3.meta"
File was copied from Assets/Resources/Music/火攻击.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: b034842bd9cf25e4f8428d69e5139efd guid: 7038f3d098e09e24dae79641a76e7784 AudioImporter: externalObjects: {} serializedVersion: 6 Assets/Resources/Music/选择buff后.wavBinary files differ
Assets/Resources/Music/选择buff后.wav.meta
File was deleted Assets/Resources/Music/金币.mp3Binary files differ
Assets/Resources/UI/Endless/BuffIcon/10027.png
New file @@ -0,0 +1,118 @@ fileFormatVersion: 2 guid: 02facd9e5db97e74cb6c3e18b4e4c464 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 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 vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 filterMode: -1 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 ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 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 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 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: Assets/Resources/UI/Endless/BuffIcon/10028.png
New file @@ -0,0 +1,118 @@ fileFormatVersion: 2 guid: bb4fe3fc6ee6b6e4a911347902393f7a TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 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 vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 filterMode: -1 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 ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 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 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 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: Assets/Scripts/Music/AudioSourceManager.cs
@@ -136,13 +136,9 @@ Play("电技能", true); break; case AudioEnum.FireSkill: Debug.Log("火焰喷射"); Play("火焰喷射", true); break; case AudioEnum.FinalScore: Debug.Log("结算分数"); Play("结算分数", true); break; case AudioEnum.BossWaterSkill: @@ -153,12 +149,9 @@ Play("冰淇淋技能", true); break; case AudioEnum.WoodSkill: Play("玉米狙击子弹", true); break; case AudioEnum.Upgrade: Debug.Log("合成"); Play("合成", true); break; } Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -534,7 +534,7 @@ if (GameConfig.EnergyCount == energyMax) { Debug.Log("能量已满"); //Debug.Log("能量已满"); if (fireSkillBgImg.color != disColor) { fireSkillBgImg.color = disColor; @@ -544,7 +544,7 @@ } else { Debug.Log("能量达到一次使用"); //Debug.Log("能量达到一次使用"); if (fireSkillBgImg.color != normalColor) { fireSkillBgImg.color = normalColor; Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -200,6 +200,7 @@ } } // TowerList用于简单记录相关的数据 protected List<Tower> m_listTower = new List<Tower>(); @@ -1163,6 +1164,15 @@ #endregion /// <summary> /// 推拽结束，如果判断HasTower==true 就强行释放 /// </summary> public void EndDragCancelPlaceTower() { Debug.Log("强行释放了m_CurrentTower"); CancelPlaceTower(null); } /// <summary> /// 拖动一个Tower之后，松开鼠标或者EndDrag. /// 1: 目标点可合成，则直接合成。 /// 2: 目标点不管是空白，还是不能放置Tower，都要让当前的Tower返回到原来的TowerPlace Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -202,6 +202,8 @@ private void PlayDoTween() { AudioSourceManager.Ins.Play(AudioEnum.End); Sequence agentTweenSeq = DOTween.Sequence(); //先出现 Image tsTiele = transform.Find("Image_Tiele").GetComponent<Image>();
