diff --git a/assets/Media/Audio/Game.meta b/assets/Media/Audio/Game.meta new file mode 100644 index 0000000..5040f33 --- /dev/null +++ b/assets/Media/Audio/Game.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "f4ca52c1-6685-4c48-964c-f4b56cf4b828", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/Media/Audio/Music.meta b/assets/Media/Audio/Game/Music.meta similarity index 100% rename from assets/Media/Audio/Music.meta rename to assets/Media/Audio/Game/Music.meta diff --git a/assets/Media/Audio/Music/Goblins_Dance_(Battle).wav b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav similarity index 100% rename from assets/Media/Audio/Music/Goblins_Dance_(Battle).wav rename to assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav diff --git a/assets/Media/Audio/Music/Goblins_Dance_(Battle).wav.meta b/assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav.meta similarity index 100% rename from assets/Media/Audio/Music/Goblins_Dance_(Battle).wav.meta rename to assets/Media/Audio/Game/Music/Goblins_Dance_(Battle).wav.meta diff --git a/assets/Media/Audio/Sound.meta b/assets/Media/Audio/Game/Sound.meta similarity index 100% rename from assets/Media/Audio/Sound.meta rename to assets/Media/Audio/Game/Sound.meta diff --git a/assets/Media/Audio/Sound/07_human_atk_sword_1.wav b/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav similarity index 100% rename from assets/Media/Audio/Sound/07_human_atk_sword_1.wav rename to assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav diff --git a/assets/Media/Audio/Sound/07_human_atk_sword_1.wav.meta b/assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/07_human_atk_sword_1.wav.meta rename to assets/Media/Audio/Game/Sound/07_human_atk_sword_1.wav.meta diff --git a/assets/Media/Audio/Sound/12_human_jump_3.wav b/assets/Media/Audio/Game/Sound/12_human_jump_3.wav similarity index 100% rename from assets/Media/Audio/Sound/12_human_jump_3.wav rename to assets/Media/Audio/Game/Sound/12_human_jump_3.wav diff --git a/assets/Media/Audio/Sound/12_human_jump_3.wav.meta b/assets/Media/Audio/Game/Sound/12_human_jump_3.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/12_human_jump_3.wav.meta rename to assets/Media/Audio/Game/Sound/12_human_jump_3.wav.meta diff --git a/assets/Media/Audio/Sound/15_human_dash_2.wav b/assets/Media/Audio/Game/Sound/15_human_dash_2.wav similarity index 100% rename from assets/Media/Audio/Sound/15_human_dash_2.wav rename to assets/Media/Audio/Game/Sound/15_human_dash_2.wav diff --git a/assets/Media/Audio/Sound/15_human_dash_2.wav.meta b/assets/Media/Audio/Game/Sound/15_human_dash_2.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/15_human_dash_2.wav.meta rename to assets/Media/Audio/Game/Sound/15_human_dash_2.wav.meta diff --git a/assets/Media/Audio/Sound/27_sword_miss_1.wav b/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav similarity index 100% rename from assets/Media/Audio/Sound/27_sword_miss_1.wav rename to assets/Media/Audio/Game/Sound/27_sword_miss_1.wav diff --git a/assets/Media/Audio/Sound/27_sword_miss_1.wav.meta b/assets/Media/Audio/Game/Sound/27_sword_miss_1.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/27_sword_miss_1.wav.meta rename to assets/Media/Audio/Game/Sound/27_sword_miss_1.wav.meta diff --git a/assets/Media/Audio/Sound/GP_Begin_Turn_1.wav b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav similarity index 100% rename from assets/Media/Audio/Sound/GP_Begin_Turn_1.wav rename to assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav diff --git a/assets/Media/Audio/Sound/GP_Begin_Turn_1.wav.meta b/assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/GP_Begin_Turn_1.wav.meta rename to assets/Media/Audio/Game/Sound/GP_Begin_Turn_1.wav.meta diff --git a/assets/Media/Audio/Sound/GP_Damage_8.wav b/assets/Media/Audio/Game/Sound/GP_Damage_8.wav similarity index 100% rename from assets/Media/Audio/Sound/GP_Damage_8.wav rename to assets/Media/Audio/Game/Sound/GP_Damage_8.wav diff --git a/assets/Media/Audio/Sound/GP_Damage_8.wav.meta b/assets/Media/Audio/Game/Sound/GP_Damage_8.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/GP_Damage_8.wav.meta rename to assets/Media/Audio/Game/Sound/GP_Damage_8.wav.meta diff --git a/assets/Media/Audio/Sound/GP_Damage_9.wav b/assets/Media/Audio/Game/Sound/GP_Damage_9.wav similarity index 100% rename from assets/Media/Audio/Sound/GP_Damage_9.wav rename to assets/Media/Audio/Game/Sound/GP_Damage_9.wav diff --git a/assets/Media/Audio/Sound/GP_Damage_9.wav.meta b/assets/Media/Audio/Game/Sound/GP_Damage_9.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/GP_Damage_9.wav.meta rename to assets/Media/Audio/Game/Sound/GP_Damage_9.wav.meta diff --git a/assets/Media/Audio/Sound/GP_Heal_1.wav b/assets/Media/Audio/Game/Sound/GP_Heal_1.wav similarity index 100% rename from assets/Media/Audio/Sound/GP_Heal_1.wav rename to assets/Media/Audio/Game/Sound/GP_Heal_1.wav diff --git a/assets/Media/Audio/Sound/GP_Heal_1.wav.meta b/assets/Media/Audio/Game/Sound/GP_Heal_1.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/GP_Heal_1.wav.meta rename to assets/Media/Audio/Game/Sound/GP_Heal_1.wav.meta diff --git a/assets/Media/Audio/Sound/GP_Turbo_Discard_2.wav b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav similarity index 100% rename from assets/Media/Audio/Sound/GP_Turbo_Discard_2.wav rename to assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav diff --git a/assets/Media/Audio/Sound/GP_Turbo_Discard_2.wav.meta b/assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/GP_Turbo_Discard_2.wav.meta rename to assets/Media/Audio/Game/Sound/GP_Turbo_Discard_2.wav.meta diff --git a/assets/Media/Audio/Sound/Special_Powerup_10.WAV b/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV similarity index 100% rename from assets/Media/Audio/Sound/Special_Powerup_10.WAV rename to assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV diff --git a/assets/Media/Audio/Sound/Special_Powerup_10.WAV.meta b/assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV.meta similarity index 100% rename from assets/Media/Audio/Sound/Special_Powerup_10.WAV.meta rename to assets/Media/Audio/Game/Sound/Special_Powerup_10.WAV.meta diff --git a/assets/Media/Audio/Sound/UI_Select_2.wav b/assets/Media/Audio/Game/Sound/UI_Select_2.wav similarity index 100% rename from assets/Media/Audio/Sound/UI_Select_2.wav rename to assets/Media/Audio/Game/Sound/UI_Select_2.wav diff --git a/assets/Media/Audio/Sound/UI_Select_2.wav.meta b/assets/Media/Audio/Game/Sound/UI_Select_2.wav.meta similarity index 100% rename from assets/Media/Audio/Sound/UI_Select_2.wav.meta rename to assets/Media/Audio/Game/Sound/UI_Select_2.wav.meta diff --git a/assets/Media/Audio/Sound/coin.1.ogg b/assets/Media/Audio/Game/Sound/coin.1.ogg similarity index 100% rename from assets/Media/Audio/Sound/coin.1.ogg rename to assets/Media/Audio/Game/Sound/coin.1.ogg diff --git a/assets/Media/Audio/Sound/coin.1.ogg.meta b/assets/Media/Audio/Game/Sound/coin.1.ogg.meta similarity index 100% rename from assets/Media/Audio/Sound/coin.1.ogg.meta rename to assets/Media/Audio/Game/Sound/coin.1.ogg.meta diff --git a/assets/Media/Audio/Menu.meta b/assets/Media/Audio/Menu.meta new file mode 100644 index 0000000..15fb427 --- /dev/null +++ b/assets/Media/Audio/Menu.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "58ea6b48-b28b-4108-87bd-edd283cab9c1", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/Media/Audio/Shared.meta b/assets/Media/Audio/Shared.meta new file mode 100644 index 0000000..fb19be8 --- /dev/null +++ b/assets/Media/Audio/Shared.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "07540f3c-d3c4-4c19-b514-430664cebda1", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/Media/Audio/Shared/UI_Click_1.wav b/assets/Media/Audio/Shared/UI_Click_1.wav new file mode 100644 index 0000000..4a3db95 Binary files /dev/null and b/assets/Media/Audio/Shared/UI_Click_1.wav differ diff --git a/assets/Media/Audio/Shared/UI_Click_1.wav.meta b/assets/Media/Audio/Shared/UI_Click_1.wav.meta new file mode 100644 index 0000000..15f55a8 --- /dev/null +++ b/assets/Media/Audio/Shared/UI_Click_1.wav.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "c7a46a75-446c-476a-a46e-31cf8c642110", + "files": [ + ".json", + ".wav" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/Media/Prefabs/AppRoot.prefab b/assets/Media/Prefabs/AppRoot.prefab index 7fc5ad3..0803de1 100644 --- a/assets/Media/Prefabs/AppRoot.prefab +++ b/assets/Media/Prefabs/AppRoot.prefab @@ -321,6 +321,10 @@ "__uuid__": "7d43843c-0765-427c-9161-2fd9030369c8", "__expectedType__": "cc.JsonAsset" }, + "gameAssetsPrefab": { + "__uuid__": "bc8c3fb4-28d9-472e-aa3d-947f8a7fa037", + "__expectedType__": "cc.Prefab" + }, "_id": "" }, { diff --git a/assets/Media/Prefabs/GameDataHolders.prefab b/assets/Media/Prefabs/GameDataHolders.prefab new file mode 100644 index 0000000..0ffc1f5 --- /dev/null +++ b/assets/Media/Prefabs/GameDataHolders.prefab @@ -0,0 +1,372 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "GameDataHolders", + "_objFlags": 0, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false, + "asyncLoadAssets": false + }, + { + "__type__": "cc.Node", + "_name": "GameDataHolders", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 6 + }, + { + "__id__": 10 + } + ], + "_active": true, + "_components": [ + { + "__id__": 14 + } + ], + "_prefab": { + "__id__": 16 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "UpgradeIcons", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + } + ], + "_prefab": { + "__id__": 5 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "c397biITvtFvqyVIZApPuax", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "weaponLengthSprite": { + "__uuid__": "1ed8c850-646c-4883-97ae-022e97a5e58e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "weaponDamageSprite": { + "__uuid__": "1ed8c850-646c-4883-97ae-022e97a5e58e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "horizontalProjectileSprite": { + "__uuid__": "1ed8c850-646c-4883-97ae-022e97a5e58e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "diagonalProjectileSprite": { + "__uuid__": "1ed8c850-646c-4883-97ae-022e97a5e58e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "haloProjectileSprite": { + "__uuid__": "1ed8c850-646c-4883-97ae-022e97a5e58e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "regenerationSprite": { + "__uuid__": "1ed8c850-646c-4883-97ae-022e97a5e58e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f3eS2Q2HFOqLgQhIz8PIlB" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7cBfYduKBCEapID2zGvDHQ" + }, + { + "__type__": "cc.Node", + "_name": "MetaUpgradeIcons", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "b18fbEgJGZOJ6w+6tEMaD+0", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 6 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "healthSprite": { + "__uuid__": "9bebe8fc-7ccd-4376-a6ff-f9e471b40fcb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "overallDamageSprite": { + "__uuid__": "9bebe8fc-7ccd-4376-a6ff-f9e471b40fcb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "projectilePiercingSprite": { + "__uuid__": "9bebe8fc-7ccd-4376-a6ff-f9e471b40fcb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "movementSpeedSprite": { + "__uuid__": "9bebe8fc-7ccd-4376-a6ff-f9e471b40fcb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "xpGathererSprite": { + "__uuid__": "9bebe8fc-7ccd-4376-a6ff-f9e471b40fcb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "goldGathererSprite": { + "__uuid__": "9bebe8fc-7ccd-4376-a6ff-f9e471b40fcb@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12FTj8QgpB/baWHKKi+uDt" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "42ec+03JlFxoiK/zgq1zKF" + }, + { + "__type__": "cc.Node", + "_name": "AudioAssets", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "20793WnayxKkrU5an4AntLg", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "buttonClick": { + "__uuid__": "c7a46a75-446c-476a-a46e-31cf8c642110", + "__expectedType__": "cc.AudioClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e35iJ9jQpCcLdydHmLEqsM" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "eeUoX6uztPs4nvlhOIzEiy" + }, + { + "__type__": "564e96LsN1Hzbs2aO5hhzLF", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "upgradeIcons": { + "__id__": 3 + }, + "metaUpgradeIcons": { + "__id__": 7 + }, + "audioAssets": { + "__id__": 11 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "84blFlifdOJIZL6azwkZFU" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "74y1g3YJBFk4JiTAPJBtA2" + } +] \ No newline at end of file diff --git a/assets/Media/Prefabs/GameDataHolders.prefab.meta b/assets/Media/Prefabs/GameDataHolders.prefab.meta new file mode 100644 index 0000000..778c039 --- /dev/null +++ b/assets/Media/Prefabs/GameDataHolders.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.40", + "importer": "prefab", + "imported": true, + "uuid": "bc8c3fb4-28d9-472e-aa3d-947f8a7fa037", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "GameDataHolders" + } +} diff --git a/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab index 0ede285..baa99f3 100644 --- a/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/AudioSettings/AudioSettingsModalWindow.prefab @@ -24,18 +24,18 @@ ], "_active": true, "_components": [ - { - "__id__": 100 - }, - { - "__id__": 102 - }, { "__id__": 104 + }, + { + "__id__": 106 + }, + { + "__id__": 108 } ], "_prefab": { - "__id__": 106 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -84,14 +84,14 @@ "_active": true, "_components": [ { - "__id__": 95 + "__id__": 99 }, { - "__id__": 97 + "__id__": 101 } ], "_prefab": { - "__id__": 99 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,23 +286,23 @@ "__id__": 20 }, { - "__id__": 28 + "__id__": 30 }, { - "__id__": 44 + "__id__": 48 }, { - "__id__": 68 + "__id__": 72 } ], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 96 } ], "_prefab": { - "__id__": 94 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -499,10 +499,13 @@ }, { "__id__": 25 + }, + { + "__id__": 27 } ], "_prefab": { - "__id__": 27 + "__id__": 29 }, "_lpos": { "__type__": "cc.Vec3", @@ -620,6 +623,26 @@ "__type__": "cc.CompPrefabInfo", "fileId": "6cKPriiXpMaIUOeMX1Lu+M" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "button": { + "__id__": 25 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02zTxm4vtCr5wLs4oFvOyd" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -639,14 +662,11 @@ }, "_children": [ { - "__id__": 29 + "__id__": 31 } ], "_active": true, "_components": [ - { - "__id__": 35 - }, { "__id__": 37 }, @@ -655,10 +675,16 @@ }, { "__id__": 41 + }, + { + "__id__": 43 + }, + { + "__id__": 45 } ], "_prefab": { - "__id__": 43 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -693,20 +719,20 @@ "_name": "Square", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 32 }, { - "__id__": 32 + "__id__": 34 } ], "_prefab": { - "__id__": 34 + "__id__": 36 }, "_lpos": { "__type__": "cc.Vec3", @@ -741,11 +767,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 33 }, "_contentSize": { "__type__": "cc.Size", @@ -768,11 +794,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 35 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -825,11 +851,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -852,11 +878,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 40 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -896,11 +922,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 42 }, "clickEvents": [], "_interactable": true, @@ -952,7 +978,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 28 + "__id__": 30 }, "_id": "" }, @@ -965,11 +991,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_id": "" }, @@ -977,6 +1003,26 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d0RPfnrYtEaqyGS7+1mWsi" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 30 + }, + "_enabled": true, + "__prefab": { + "__id__": 46 + }, + "button": { + "__id__": 43 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6fJ4uVur5G06dcdIl7jgYZ" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -996,16 +1042,16 @@ }, "_children": [ { - "__id__": 45 + "__id__": 49 }, { - "__id__": 51 + "__id__": 55 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 67 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -1040,20 +1086,20 @@ "_name": "SoundLabel", "_objFlags": 0, "_parent": { - "__id__": 44 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 46 + "__id__": 50 }, { - "__id__": 48 + "__id__": 52 } ], "_prefab": { - "__id__": 50 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -1088,11 +1134,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -1115,11 +1161,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1172,27 +1218,27 @@ "_name": "SoundVolumeSlider", "_objFlags": 0, "_parent": { - "__id__": 44 + "__id__": 48 }, "_children": [ { - "__id__": 52 + "__id__": 56 } ], "_active": true, "_components": [ - { - "__id__": 60 - }, - { - "__id__": 62 - }, { "__id__": 64 + }, + { + "__id__": 66 + }, + { + "__id__": 68 } ], "_prefab": { - "__id__": 66 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1227,23 +1273,23 @@ "_name": "Handle", "_objFlags": 0, "_parent": { - "__id__": 51 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 53 - }, - { - "__id__": 55 - }, { "__id__": 57 + }, + { + "__id__": 59 + }, + { + "__id__": 61 } ], "_prefab": { - "__id__": 59 + "__id__": 63 }, "_lpos": { "__type__": "cc.Vec3", @@ -1278,11 +1324,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -1305,11 +1351,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1349,11 +1395,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 62 }, "clickEvents": [], "_interactable": true, @@ -1396,7 +1442,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 52 + "__id__": 56 }, "_id": "" }, @@ -1419,11 +1465,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 51 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 61 + "__id__": 65 }, "_contentSize": { "__type__": "cc.Size", @@ -1446,11 +1492,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 51 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 67 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1490,15 +1536,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 51 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 69 }, "slideEvents": [], "_handle": { - "__id__": 55 + "__id__": 59 }, "_direction": 0, "_progress": 0.1, @@ -1537,16 +1583,16 @@ }, "_children": [ { - "__id__": 69 + "__id__": 73 }, { - "__id__": 75 + "__id__": 79 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 91 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -1581,20 +1627,20 @@ "_name": "MusicLabel", "_objFlags": 0, "_parent": { - "__id__": 68 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 74 }, { - "__id__": 72 + "__id__": 76 } ], "_prefab": { - "__id__": 74 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -1629,11 +1675,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -1656,11 +1702,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 73 + "__id__": 77 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1713,27 +1759,27 @@ "_name": "MusicVolumeSlider", "_objFlags": 0, "_parent": { - "__id__": 68 + "__id__": 72 }, "_children": [ { - "__id__": 76 + "__id__": 80 } ], "_active": true, "_components": [ - { - "__id__": 84 - }, - { - "__id__": 86 - }, { "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 } ], "_prefab": { - "__id__": 90 + "__id__": 94 }, "_lpos": { "__type__": "cc.Vec3", @@ -1768,23 +1814,23 @@ "_name": "Handle", "_objFlags": 0, "_parent": { - "__id__": 75 + "__id__": 79 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 77 - }, - { - "__id__": 79 - }, { "__id__": 81 + }, + { + "__id__": 83 + }, + { + "__id__": 85 } ], "_prefab": { - "__id__": 83 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", @@ -1819,11 +1865,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 82 }, "_contentSize": { "__type__": "cc.Size", @@ -1846,11 +1892,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 84 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1890,11 +1936,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 80 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 86 }, "clickEvents": [], "_interactable": true, @@ -1937,7 +1983,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 76 + "__id__": 80 }, "_id": "" }, @@ -1960,11 +2006,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", @@ -1987,11 +2033,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 91 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2031,15 +2077,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 93 }, "slideEvents": [], "_handle": { - "__id__": 79 + "__id__": 83 }, "_direction": 0, "_progress": 0.1, @@ -2078,7 +2124,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 97 }, "_contentSize": { "__type__": "cc.Size", @@ -2115,7 +2161,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 100 }, "_contentSize": { "__type__": "cc.Size", @@ -2142,7 +2188,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 102 }, "playOnLoad": false, "_clips": [ @@ -2184,7 +2230,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 105 }, "_contentSize": { "__type__": "cc.Size", @@ -2212,7 +2258,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 107 }, "_alignFlags": 45, "_target": null, @@ -2247,10 +2293,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 109 }, "animation": { - "__id__": 97 + "__id__": 101 }, "closeButton": { "__id__": 25 @@ -2259,13 +2305,13 @@ "__id__": 8 }, "soundVolumeSlider": { - "__id__": 64 + "__id__": 68 }, "musicVolumeSlider": { - "__id__": 88 + "__id__": 92 }, "okButton": { - "__id__": 41 + "__id__": 43 }, "_id": "" }, diff --git a/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab b/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab index 8c06ae7..f68859f 100644 --- a/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab +++ b/assets/Media/Prefabs/ModalWindows/Pause/PauseModalWindow.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 90 + "__id__": 98 }, { - "__id__": 92 + "__id__": 100 }, { - "__id__": 94 + "__id__": 102 } ], "_prefab": { - "__id__": 96 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -84,14 +84,14 @@ "_active": true, "_components": [ { - "__id__": 85 + "__id__": 93 }, { - "__id__": 87 + "__id__": 95 } ], "_prefab": { - "__id__": 89 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -286,26 +286,26 @@ "__id__": 20 }, { - "__id__": 28 + "__id__": 30 }, { - "__id__": 44 + "__id__": 48 }, { - "__id__": 60 + "__id__": 66 }, { - "__id__": 76 + "__id__": 84 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 90 } ], "_prefab": { - "__id__": 84 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -502,10 +502,13 @@ }, { "__id__": 25 + }, + { + "__id__": 27 } ], "_prefab": { - "__id__": 27 + "__id__": 29 }, "_lpos": { "__type__": "cc.Vec3", @@ -623,6 +626,26 @@ "__type__": "cc.CompPrefabInfo", "fileId": "6cKPriiXpMaIUOeMX1Lu+M" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "button": { + "__id__": 25 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "26iMBW1IBFOIKUWiX0Jg9C" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -642,14 +665,11 @@ }, "_children": [ { - "__id__": 29 + "__id__": 31 } ], "_active": true, "_components": [ - { - "__id__": 35 - }, { "__id__": 37 }, @@ -658,10 +678,16 @@ }, { "__id__": 41 + }, + { + "__id__": 43 + }, + { + "__id__": 45 } ], "_prefab": { - "__id__": 43 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -696,20 +722,20 @@ "_name": "Square", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 32 }, { - "__id__": 32 + "__id__": 34 } ], "_prefab": { - "__id__": 34 + "__id__": 36 }, "_lpos": { "__type__": "cc.Vec3", @@ -744,11 +770,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 33 }, "_contentSize": { "__type__": "cc.Size", @@ -771,11 +797,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 35 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -828,11 +854,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 38 }, "_contentSize": { "__type__": "cc.Size", @@ -855,11 +881,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 40 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -899,11 +925,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 42 }, "clickEvents": [], "_interactable": true, @@ -955,7 +981,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 28 + "__id__": 30 }, "_id": "" }, @@ -968,11 +994,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 44 }, "_id": "" }, @@ -980,6 +1006,26 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d0RPfnrYtEaqyGS7+1mWsi" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 30 + }, + "_enabled": true, + "__prefab": { + "__id__": 46 + }, + "button": { + "__id__": 43 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "11TEBgMD5BPJXOLEjIAeKT" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -999,26 +1045,29 @@ }, "_children": [ { - "__id__": 45 + "__id__": 49 } ], "_active": true, "_components": [ - { - "__id__": 51 - }, - { - "__id__": 53 - }, { "__id__": 55 }, { "__id__": 57 + }, + { + "__id__": 59 + }, + { + "__id__": 61 + }, + { + "__id__": 63 } ], "_prefab": { - "__id__": 59 + "__id__": 65 }, "_lpos": { "__type__": "cc.Vec3", @@ -1053,20 +1102,20 @@ "_name": "Square", "_objFlags": 0, "_parent": { - "__id__": 44 + "__id__": 48 }, "_children": [], "_active": true, "_components": [ { - "__id__": 46 + "__id__": 50 }, { - "__id__": 48 + "__id__": 52 } ], "_prefab": { - "__id__": 50 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", @@ -1101,11 +1150,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 51 }, "_contentSize": { "__type__": "cc.Size", @@ -1128,11 +1177,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 49 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 53 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1185,11 +1234,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1212,11 +1261,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1256,11 +1305,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 60 }, "clickEvents": [], "_interactable": true, @@ -1312,7 +1361,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 44 + "__id__": 48 }, "_id": "" }, @@ -1325,11 +1374,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 44 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 62 }, "_id": "" }, @@ -1337,6 +1386,26 @@ "__type__": "cc.CompPrefabInfo", "fileId": "14KoAgm55C5JO3vB/TfgAv" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 48 + }, + "_enabled": true, + "__prefab": { + "__id__": 64 + }, + "button": { + "__id__": 61 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5bPDVfNOxKzYFdYwzcyy5V" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1356,26 +1425,29 @@ }, "_children": [ { - "__id__": 61 + "__id__": 67 } ], "_active": true, "_components": [ - { - "__id__": 67 - }, - { - "__id__": 69 - }, - { - "__id__": 71 - }, { "__id__": 73 + }, + { + "__id__": 75 + }, + { + "__id__": 77 + }, + { + "__id__": 79 + }, + { + "__id__": 81 } ], "_prefab": { - "__id__": 75 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -1410,20 +1482,20 @@ "_name": "Square", "_objFlags": 0, "_parent": { - "__id__": 60 + "__id__": 66 }, "_children": [], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 68 }, { - "__id__": 64 + "__id__": 70 } ], "_prefab": { - "__id__": 66 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -1458,11 +1530,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1485,11 +1557,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 61 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1542,11 +1614,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 74 }, "_contentSize": { "__type__": "cc.Size", @@ -1569,11 +1641,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 76 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1613,11 +1685,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 78 }, "clickEvents": [], "_interactable": true, @@ -1669,7 +1741,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 60 + "__id__": 66 }, "_id": "" }, @@ -1682,11 +1754,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 80 }, "_id": "" }, @@ -1694,6 +1766,26 @@ "__type__": "cc.CompPrefabInfo", "fileId": "0dLU8MYB9LPbVkcWsvOp+Y" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 66 + }, + "_enabled": true, + "__prefab": { + "__id__": 82 + }, + "button": { + "__id__": 79 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1b9knYLxFIKKTTbO7ZlpdD" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1715,14 +1807,14 @@ "_active": true, "_components": [ { - "__id__": 77 + "__id__": 85 }, { - "__id__": 79 + "__id__": 87 } ], "_prefab": { - "__id__": 81 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1757,11 +1849,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 86 }, "_contentSize": { "__type__": "cc.Size", @@ -1784,11 +1876,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 88 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1845,7 +1937,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", @@ -1882,7 +1974,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -1909,7 +2001,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 96 }, "playOnLoad": false, "_clips": [ @@ -1951,7 +2043,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -1979,7 +2071,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 101 }, "_alignFlags": 45, "_target": null, @@ -2014,10 +2106,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 103 }, "animation": { - "__id__": 87 + "__id__": 95 }, "closeButton": { "__id__": 25 @@ -2026,13 +2118,13 @@ "__id__": 8 }, "continueBtn": { - "__id__": 41 + "__id__": 43 }, "audioSettingsButton": { - "__id__": 73 + "__id__": 79 }, "exitBtn": { - "__id__": 57 + "__id__": 61 }, "_id": "" }, diff --git a/assets/Scenes/Game.scene b/assets/Scenes/Game.scene index 961095d..9181c2d 100644 --- a/assets/Scenes/Game.scene +++ b/assets/Scenes/Game.scene @@ -27,11 +27,11 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 103 + "__id__": 104 }, "autoReleaseAssets": false, "_globals": { - "__id__": 106 + "__id__": 107 }, "_id": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f" }, @@ -196,7 +196,7 @@ "_enabled": true, "__prefab": null, "startTime": 0, - "startXP": 300, + "startXP": 0, "maxHpLevel": 0, "bonusDamageLevel": 0, "projectilePiercingLevel": 0, @@ -246,9 +246,6 @@ ], "_active": true, "_components": [ - { - "__id__": 99 - }, { "__id__": 100 }, @@ -257,6 +254,9 @@ }, { "__id__": 102 + }, + { + "__id__": 103 } ], "_prefab": null, @@ -1294,25 +1294,25 @@ "__id__": 49 }, { - "__id__": 83 + "__id__": 84 }, { - "__id__": 86 + "__id__": 87 }, { - "__id__": 89 + "__id__": 90 }, { - "__id__": 92 + "__id__": 93 }, { - "__id__": 95 + "__id__": 96 } ], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 99 } ], "_prefab": null, @@ -1356,13 +1356,13 @@ "__id__": 50 }, { - "__id__": 73 + "__id__": 74 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 83 } ], "_prefab": null, @@ -1415,10 +1415,10 @@ "_active": true, "_components": [ { - "__id__": 71 + "__id__": 72 }, { - "__id__": 72 + "__id__": 73 } ], "_prefab": null, @@ -1885,6 +1885,9 @@ }, { "__id__": 70 + }, + { + "__id__": 71 } ], "_prefab": null, @@ -2157,6 +2160,20 @@ "__prefab": null, "_id": "94Ye77Hc9Hw6DUaP7suX3j" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 63 + }, + "_enabled": true, + "__prefab": null, + "button": { + "__id__": 70 + }, + "_id": "19CfluWQpOB4qddmLDK5n9" + }, { "__type__": "cc.UITransform", "_name": "", @@ -2216,13 +2233,13 @@ }, "_children": [ { - "__id__": 74 + "__id__": 75 } ], "_active": true, "_components": [ { - "__id__": 81 + "__id__": 82 } ], "_prefab": null, @@ -2259,23 +2276,23 @@ "_name": "VirtualJoystic", "_objFlags": 0, "_parent": { - "__id__": 73 + "__id__": 74 }, "_children": [ { - "__id__": 75 + "__id__": 76 } ], "_active": true, "_components": [ - { - "__id__": 78 - }, { "__id__": 79 }, { "__id__": 80 + }, + { + "__id__": 81 } ], "_prefab": null, @@ -2312,16 +2329,16 @@ "_name": "Knob", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 75 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 77 }, { - "__id__": 77 + "__id__": 78 } ], "_prefab": null, @@ -2358,7 +2375,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2379,7 +2396,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 76 }, "_enabled": true, "__prefab": null, @@ -2417,7 +2434,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -2438,7 +2455,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 75 }, "_enabled": true, "__prefab": null, @@ -2476,13 +2493,13 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 74 + "__id__": 75 }, "_enabled": true, "__prefab": null, "maxDistance": 50, "knob": { - "__id__": 75 + "__id__": 76 }, "_id": "50ceZG62tGlYXvZWEvSDKl" }, @@ -2491,7 +2508,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 73 + "__id__": 74 }, "_enabled": true, "__prefab": null, @@ -2538,10 +2555,10 @@ "_active": true, "_components": [ { - "__id__": 84 + "__id__": 85 }, { - "__id__": 85 + "__id__": 86 } ], "_prefab": null, @@ -2578,7 +2595,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 84 }, "_enabled": true, "__prefab": null, @@ -2599,7 +2616,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 83 + "__id__": 84 }, "_enabled": true, "__prefab": null, @@ -2630,10 +2647,10 @@ "_active": true, "_components": [ { - "__id__": 87 + "__id__": 88 }, { - "__id__": 88 + "__id__": 89 } ], "_prefab": null, @@ -2670,7 +2687,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 86 + "__id__": 87 }, "_enabled": true, "__prefab": null, @@ -2691,7 +2708,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 86 + "__id__": 87 }, "_enabled": true, "__prefab": null, @@ -2735,10 +2752,10 @@ "_active": true, "_components": [ { - "__id__": 90 + "__id__": 91 }, { - "__id__": 91 + "__id__": 92 } ], "_prefab": null, @@ -2775,7 +2792,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 89 + "__id__": 90 }, "_enabled": true, "__prefab": null, @@ -2796,7 +2813,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 89 + "__id__": 90 }, "_enabled": true, "__prefab": null, @@ -2840,10 +2857,10 @@ "_active": true, "_components": [ { - "__id__": 93 + "__id__": 94 }, { - "__id__": 94 + "__id__": 95 } ], "_prefab": null, @@ -2880,7 +2897,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 93 }, "_enabled": true, "__prefab": null, @@ -2901,7 +2918,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 92 + "__id__": 93 }, "_enabled": true, "__prefab": null, @@ -2945,10 +2962,10 @@ "_active": true, "_components": [ { - "__id__": 96 + "__id__": 97 }, { - "__id__": 97 + "__id__": 98 } ], "_prefab": null, @@ -2985,7 +3002,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 95 + "__id__": 96 }, "_enabled": true, "__prefab": null, @@ -3006,7 +3023,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 95 + "__id__": 96 }, "_enabled": true, "__prefab": null, @@ -3113,7 +3130,7 @@ "_enabled": true, "__prefab": null, "_cameraComponent": { - "__id__": 98 + "__id__": 99 }, "_alignCanvasWithScreen": true, "_id": "12O/ljcVlEqLmVm3U2gEOQ" @@ -3157,7 +3174,7 @@ "_enabled": true, "__prefab": null, "virtualJoystic": { - "__id__": 80 + "__id__": 81 }, "player": null, "haloProjectileLauncherComponent": { @@ -3179,16 +3196,16 @@ "__id__": 43 }, "camera": { - "__id__": 98 + "__id__": 99 }, "gameUI": { - "__id__": 82 + "__id__": 83 }, "background": { "__id__": 17 }, "modalWindowManager": { - "__id__": 85 + "__id__": 86 }, "gameAudioAdapter": { "__id__": 14 @@ -3200,7 +3217,7 @@ "fileId": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f", "targetOverrides": [ { - "__id__": 104 + "__id__": 105 } ], "nestedPrefabInstanceRoots": [ @@ -3215,7 +3232,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 102 + "__id__": 103 }, "sourceInfo": null, "propertyPath": [ @@ -3225,7 +3242,7 @@ "__id__": 26 }, "targetInfo": { - "__id__": 105 + "__id__": 106 } }, { @@ -3237,19 +3254,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 107 - }, - "shadows": { "__id__": 108 }, - "_skybox": { + "shadows": { "__id__": 109 }, - "fog": { + "_skybox": { "__id__": 110 }, - "octree": { + "fog": { "__id__": 111 + }, + "octree": { + "__id__": 112 } }, { diff --git a/assets/Scenes/Menu.scene b/assets/Scenes/Menu.scene index 32cc4e1..6021076 100644 --- a/assets/Scenes/Menu.scene +++ b/assets/Scenes/Menu.scene @@ -24,11 +24,11 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 44 + "__id__": 47 }, "autoReleaseAssets": false, "_globals": { - "__id__": 45 + "__id__": 48 }, "_id": "1a3bccb5-bbb7-4058-846c-ed41b52415b0" }, @@ -155,28 +155,28 @@ "__id__": 13 }, { - "__id__": 21 + "__id__": 22 }, { - "__id__": 29 + "__id__": 31 }, { - "__id__": 37 + "__id__": 40 } ], "_active": true, "_components": [ - { - "__id__": 40 - }, - { - "__id__": 41 - }, - { - "__id__": 42 - }, { "__id__": 43 + }, + { + "__id__": 44 + }, + { + "__id__": 45 + }, + { + "__id__": 46 } ], "_prefab": null, @@ -319,6 +319,9 @@ }, { "__id__": 20 + }, + { + "__id__": 21 } ], "_prefab": null, @@ -588,6 +591,20 @@ "__prefab": null, "_id": "8d2ldk4JNJYKGBH48A9kCb" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 13 + }, + "_enabled": true, + "__prefab": null, + "button": { + "__id__": 20 + }, + "_id": "3f/GLS2YxHJI360Fym4+Nl" + }, { "__type__": "cc.Node", "_name": "UpgradesBtn", @@ -597,14 +614,11 @@ }, "_children": [ { - "__id__": 22 + "__id__": 23 } ], "_active": true, "_components": [ - { - "__id__": 25 - }, { "__id__": 26 }, @@ -613,6 +627,12 @@ }, { "__id__": 28 + }, + { + "__id__": 29 + }, + { + "__id__": 30 } ], "_prefab": null, @@ -649,16 +669,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 21 + "__id__": 22 }, "_children": [], "_active": true, "_components": [ { - "__id__": 23 + "__id__": 24 }, { - "__id__": 24 + "__id__": 25 } ], "_prefab": null, @@ -695,7 +715,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -716,7 +736,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 23 }, "_enabled": true, "__prefab": null, @@ -754,7 +774,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 21 + "__id__": 22 }, "_enabled": true, "__prefab": null, @@ -775,7 +795,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 21 + "__id__": 22 }, "_enabled": true, "__prefab": null, @@ -813,7 +833,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 21 + "__id__": 22 }, "_enabled": true, "__prefab": null, @@ -867,7 +887,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 21 + "__id__": 22 }, "_id": "02km9/CjtM4LntV5ZcaVeR" }, @@ -876,12 +896,26 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 21 + "__id__": 22 }, "_enabled": true, "__prefab": null, "_id": "17dRwdDH1DH7KDpkjt3c0f" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 22 + }, + "_enabled": true, + "__prefab": null, + "button": { + "__id__": 29 + }, + "_id": "adNyH1o7lEPoaiPeZSxUCn" + }, { "__type__": "cc.Node", "_name": "AudioSettingsBtn", @@ -891,22 +925,25 @@ }, "_children": [ { - "__id__": 30 + "__id__": 32 } ], "_active": true, "_components": [ - { - "__id__": 33 - }, - { - "__id__": 34 - }, { "__id__": 35 }, { "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 38 + }, + { + "__id__": 39 } ], "_prefab": null, @@ -943,16 +980,16 @@ "_name": "Label", "_objFlags": 512, "_parent": { - "__id__": 29 + "__id__": 31 }, "_children": [], "_active": true, "_components": [ { - "__id__": 31 + "__id__": 33 }, { - "__id__": 32 + "__id__": 34 } ], "_prefab": null, @@ -989,7 +1026,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -1010,7 +1047,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 30 + "__id__": 32 }, "_enabled": true, "__prefab": null, @@ -1048,7 +1085,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1069,7 +1106,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1107,7 +1144,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": null, @@ -1161,7 +1198,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 29 + "__id__": 31 }, "_id": "83MUZ70BBPoqpCJzA3nVTN" }, @@ -1170,12 +1207,26 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 29 + "__id__": 31 }, "_enabled": true, "__prefab": null, "_id": "32FMfxdN1Auo3dMG2+/Ftl" }, + { + "__type__": "146cdU9Cw9I+otUVSgpwCCT", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 31 + }, + "_enabled": true, + "__prefab": null, + "button": { + "__id__": 38 + }, + "_id": "6bWmS+us9G55ZQR94w+B3i" + }, { "__type__": "cc.Node", "_name": "ModalWindowManager", @@ -1187,10 +1238,10 @@ "_active": true, "_components": [ { - "__id__": 38 + "__id__": 41 }, { - "__id__": 39 + "__id__": 42 } ], "_prefab": null, @@ -1227,7 +1278,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 40 }, "_enabled": true, "__prefab": null, @@ -1248,7 +1299,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 37 + "__id__": 40 }, "_enabled": true, "__prefab": null, @@ -1342,13 +1393,13 @@ "__id__": 20 }, "upgradeBtn": { - "__id__": 28 + "__id__": 29 }, "audioSettingsBtn": { - "__id__": 36 + "__id__": 38 }, "modalWindowManager": { - "__id__": 39 + "__id__": 42 }, "_id": "4cQFnvx1xB65sFsTPGRrB7" }, @@ -1364,19 +1415,19 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 46 - }, - "shadows": { - "__id__": 47 - }, - "_skybox": { - "__id__": 48 - }, - "fog": { "__id__": 49 }, - "octree": { + "shadows": { "__id__": 50 + }, + "_skybox": { + "__id__": 51 + }, + "fog": { + "__id__": 52 + }, + "octree": { + "__id__": 53 } }, { diff --git a/assets/Scripts/AppRoot/AppRoot.ts b/assets/Scripts/AppRoot/AppRoot.ts index f9620c4..7e5b87c 100644 --- a/assets/Scripts/AppRoot/AppRoot.ts +++ b/assets/Scripts/AppRoot/AppRoot.ts @@ -1,5 +1,6 @@ -import { Component, director, JsonAsset, _decorator } from "cc"; +import { Component, director, instantiate, JsonAsset, Prefab, _decorator } from "cc"; import { GameSettings } from "../Game/Data/GameSettings"; +import { GameAssets } from "../Game/Data/Assets/GameAssets"; import { TranslationData } from "../Game/Data/TranslationData"; import { UserData } from "../Game/Data/UserData"; import { AudioPlayer } from "../Services/AudioPlayer/AudioPlayer"; @@ -11,11 +12,13 @@ export class AppRoot extends Component { @property(AudioPlayer) private audio: AudioPlayer; @property(JsonAsset) private settingsAsset: JsonAsset; @property(JsonAsset) private engTranslationAsset: JsonAsset; + @property(Prefab) private gameAssetsPrefab: Prefab; private static instance: AppRoot; private saveSystem: SaveSystem; private liveUserData: UserData; + private gameAssets: GameAssets; public static get Instance(): AppRoot { return this.instance; @@ -25,6 +28,10 @@ export class AppRoot extends Component { return this.audio; } + public get GameAssets(): GameAssets { + return this.gameAssets; + } + public get LiveUserData(): UserData { return this.liveUserData; } @@ -55,6 +62,10 @@ export class AppRoot extends Component { this.saveSystem = new SaveSystem(); this.liveUserData = this.saveSystem.load(); + const gameAssetsNode = instantiate(this.gameAssetsPrefab); + gameAssetsNode.setParent(this.node); + this.gameAssets = gameAssetsNode.getComponent(GameAssets); + this.audio.init(this.LiveUserData.soundVolume, this.LiveUserData.musicVolume); } } diff --git a/assets/Scripts/Game/Data/Assets.meta b/assets/Scripts/Game/Data/Assets.meta new file mode 100644 index 0000000..25cb02b --- /dev/null +++ b/assets/Scripts/Game/Data/Assets.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.1.0", + "importer": "directory", + "imported": true, + "uuid": "2c68679f-e9d3-4ce0-8e9a-908415d73fc7", + "files": [], + "subMetas": {}, + "userData": { + "compressionType": {}, + "isRemoteBundle": {} + } +} diff --git a/assets/Scripts/Game/Data/Assets/AudioAssets.ts b/assets/Scripts/Game/Data/Assets/AudioAssets.ts new file mode 100644 index 0000000..9687baa --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/AudioAssets.ts @@ -0,0 +1,8 @@ +import { AudioClip, Component, _decorator } from "cc"; + +const { ccclass, property } = _decorator; + +@ccclass("AudioAssets") +export class AudioAssets extends Component { + @property(AudioClip) public buttonClick: AudioClip; +} diff --git a/assets/Scripts/Game/Data/Assets/AudioAssets.ts.meta b/assets/Scripts/Game/Data/Assets/AudioAssets.ts.meta new file mode 100644 index 0000000..9cf069b --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/AudioAssets.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "207935a7-6b2c-4a92-b539-6a7e009ed2e0", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/Game/Data/Assets/GameAssets.ts b/assets/Scripts/Game/Data/Assets/GameAssets.ts new file mode 100644 index 0000000..9244f63 --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/GameAssets.ts @@ -0,0 +1,24 @@ +import { _decorator, Component, Node } from "cc"; +import { AudioAssets } from "./AudioAssets"; +import { MetaUpgradeIcons } from "./MetaUpgradeIcons"; +import { UpgradeIcons } from "./UpgradeIcons"; +const { ccclass, property } = _decorator; + +@ccclass("GameAssets") +export class GameAssets extends Component { + @property(UpgradeIcons) private upgradeIcons: UpgradeIcons; + @property(MetaUpgradeIcons) private metaUpgradeIcons: MetaUpgradeIcons; + @property(AudioAssets) private audioAssets: AudioAssets; + + public get UpgradeIcons(): UpgradeIcons { + return this.upgradeIcons; + } + + public get MetaUpgradeIcons(): MetaUpgradeIcons { + return this.metaUpgradeIcons; + } + + public get AudioAssets(): AudioAssets { + return this.audioAssets; + } +} diff --git a/assets/Scripts/Game/Data/Assets/GameAssets.ts.meta b/assets/Scripts/Game/Data/Assets/GameAssets.ts.meta new file mode 100644 index 0000000..ce32612 --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/GameAssets.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "564e9e8b-b0dd-47cd-bb36-68ee618732c5", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/Game/Data/Assets/MetaUpgradeIcons.ts b/assets/Scripts/Game/Data/Assets/MetaUpgradeIcons.ts new file mode 100644 index 0000000..8d3fce4 --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/MetaUpgradeIcons.ts @@ -0,0 +1,30 @@ +import { Component, SpriteFrame, _decorator } from "cc"; +import { MetaUpgradeType, UpgradeType } from "../../Upgrades/UpgradeType"; + +const { ccclass, property } = _decorator; + +@ccclass("MetaUpgradeIcons") +export class MetaUpgradeIcons extends Component { + @property(SpriteFrame) private healthSprite: SpriteFrame; + @property(SpriteFrame) private overallDamageSprite: SpriteFrame; + @property(SpriteFrame) private projectilePiercingSprite: SpriteFrame; + @property(SpriteFrame) private movementSpeedSprite: SpriteFrame; + @property(SpriteFrame) private xpGathererSprite: SpriteFrame; + @property(SpriteFrame) private goldGathererSprite: SpriteFrame; + + private typeToIcon = new Map(); + + public init(): void { + this.typeToIcon.set(MetaUpgradeType.Health, this.healthSprite); + this.typeToIcon.set(MetaUpgradeType.OverallDamage, this.overallDamageSprite); + this.typeToIcon.set(MetaUpgradeType.ProjectilePiercing, this.projectilePiercingSprite); + this.typeToIcon.set(MetaUpgradeType.MovementSpeed, this.movementSpeedSprite); + this.typeToIcon.set(MetaUpgradeType.XPGatherer, this.xpGathererSprite); + this.typeToIcon.set(MetaUpgradeType.GoldGatherer, this.goldGathererSprite); + } + + public getIcon(upgradeType: MetaUpgradeType): SpriteFrame { + if (!this.typeToIcon.has(upgradeType)) throw new Error("Does not have upgrade type asset " + upgradeType); + return this.typeToIcon.get(upgradeType); + } +} diff --git a/assets/Scripts/Game/Data/Assets/MetaUpgradeIcons.ts.meta b/assets/Scripts/Game/Data/Assets/MetaUpgradeIcons.ts.meta new file mode 100644 index 0000000..b029163 --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/MetaUpgradeIcons.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "b18fb120-2466-4e27-ac3e-ead10c683fb4", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/Game/Data/Assets/UpgradeIcons.ts b/assets/Scripts/Game/Data/Assets/UpgradeIcons.ts new file mode 100644 index 0000000..4deb089 --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/UpgradeIcons.ts @@ -0,0 +1,30 @@ +import { Component, SpriteFrame, _decorator } from "cc"; +import { UpgradeType } from "../../Upgrades/UpgradeType"; + +const { ccclass, property } = _decorator; + +@ccclass("UpgradeIcons") +export class UpgradeIcons extends Component { + @property(SpriteFrame) private weaponLengthSprite: SpriteFrame; + @property(SpriteFrame) private weaponDamageSprite: SpriteFrame; + @property(SpriteFrame) private horizontalProjectileSprite: SpriteFrame; + @property(SpriteFrame) private diagonalProjectileSprite: SpriteFrame; + @property(SpriteFrame) private haloProjectileSprite: SpriteFrame; + @property(SpriteFrame) private regenerationSprite: SpriteFrame; + + private typeToIcon = new Map(); + + public init(): void { + this.typeToIcon.set(UpgradeType.WeaponLength, this.weaponLengthSprite); + this.typeToIcon.set(UpgradeType.WeaponDamage, this.weaponDamageSprite); + this.typeToIcon.set(UpgradeType.HorizontalProjectile, this.horizontalProjectileSprite); + this.typeToIcon.set(UpgradeType.DiagonalProjectile, this.diagonalProjectileSprite); + this.typeToIcon.set(UpgradeType.HaloProjectlie, this.haloProjectileSprite); + this.typeToIcon.set(UpgradeType.Regeneration, this.regenerationSprite); + } + + public getIcon(upgradeType: UpgradeType): SpriteFrame { + if (!this.typeToIcon.has(upgradeType)) throw new Error("Does not have upgrade type asset " + upgradeType); + return this.typeToIcon.get(upgradeType); + } +} diff --git a/assets/Scripts/Game/Data/Assets/UpgradeIcons.ts.meta b/assets/Scripts/Game/Data/Assets/UpgradeIcons.ts.meta new file mode 100644 index 0000000..8309f76 --- /dev/null +++ b/assets/Scripts/Game/Data/Assets/UpgradeIcons.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "c397b888-4efb-45be-ac95-2190293ee6b1", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/Scripts/Game/Game.ts b/assets/Scripts/Game/Game.ts index e5ee012..d07ea9b 100644 --- a/assets/Scripts/Game/Game.ts +++ b/assets/Scripts/Game/Game.ts @@ -1,4 +1,4 @@ -import { Camera, Component, KeyCode, Vec2, _decorator } from "cc"; +import { Camera, Component, KeyCode, Prefab, Vec2, _decorator } from "cc"; import { ModalWindowManager } from "../Services/ModalWindowSystem/ModalWindowManager"; import { delay } from "../Services/Utils/AsyncUtils"; import { GameAudioAdapter } from "./Audio/GameAudioAdapter"; diff --git a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts b/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts index 013b311..78319b0 100644 --- a/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts +++ b/assets/Scripts/Game/Unit/Player/ProjectileLauncher/ProjectileLauncher.ts @@ -42,6 +42,8 @@ export class ProjectileLauncher extends Component implements IProjectileLauncher this.projectilePierces = projectilePierces; this.projectilePool = new ObjectPool(this.projectilePrefab, this.node, 6, "Projectile"); + + console.log("DAMAGE " + JSON.stringify((this.projectilePrefab.data).Damage)); } public gameTick(deltaTime: number): void { diff --git a/assets/Scripts/Utils/UIButtonAudioPlayer.ts b/assets/Scripts/Utils/UIButtonAudioPlayer.ts new file mode 100644 index 0000000..a4251ed --- /dev/null +++ b/assets/Scripts/Utils/UIButtonAudioPlayer.ts @@ -0,0 +1,17 @@ +import { Component, _decorator } from "cc"; +import { AppRoot } from "../AppRoot/AppRoot"; +import { UIButton } from "../Services/UI/Button/UIButton"; +const { ccclass, property } = _decorator; + +@ccclass("UIButtonAudioPlayer") +export class UIButtonAudioPlayer extends Component { + @property(UIButton) private button: UIButton; + public start(): void { + this.button.InteractedEvent.on(this.playButtonClick, this); + } + + private playButtonClick(): void { + const audioClip = AppRoot.Instance.GameAssets.AudioAssets.buttonClick; + AppRoot.Instance.AudioPlayer.playSound(audioClip); + } +} diff --git a/assets/Scripts/Utils/UIButtonAudioPlayer.ts.meta b/assets/Scripts/Utils/UIButtonAudioPlayer.ts.meta new file mode 100644 index 0000000..b22bd05 --- /dev/null +++ b/assets/Scripts/Utils/UIButtonAudioPlayer.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "146cd53d-0b0f-48fa-8b54-552829c02093", + "files": [], + "subMetas": {}, + "userData": {} +}