From 71ae3d755a03a706d93291ca57c6de8e6f0d5926 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 25 Apr 2022 09:58:56 +0800 Subject: * rename equip to weapon --- .../Assets/Resources/Art/ui/equipicon.meta | 8 - .../Resources/Art/ui/equipicon/boomerang.png | Bin 4395 -> 0 bytes .../Resources/Art/ui/equipicon/boomerang.png.meta | 96 ---- .../Assets/Resources/Art/ui/equipicon/glove.png | Bin 9786 -> 0 bytes .../Resources/Art/ui/equipicon/glove.png.meta | 96 ---- .../Assets/Resources/Art/ui/equipicon/grenade.png | Bin 7466 -> 0 bytes .../Resources/Art/ui/equipicon/grenade.png.meta | 96 ---- .../Assets/Resources/Art/ui/equipicon/gun.png | Bin 10775 -> 0 bytes .../Assets/Resources/Art/ui/equipicon/gun.png.meta | 96 ---- .../Resources/Art/ui/equipicon/light_saber.png | Bin 9411 -> 0 bytes .../Art/ui/equipicon/light_saber.png.meta | 96 ---- .../Resources/Art/ui/equipicon/mystery_mask.png | Bin 14172 -> 0 bytes .../Art/ui/equipicon/mystery_mask.png.meta | 96 ---- .../Resources/Art/ui/equipicon/tesla_coil.png | Bin 13489 -> 0 bytes .../Resources/Art/ui/equipicon/tesla_coil.png.meta | 96 ---- .../Assets/Resources/Art/ui/weaponicon.meta | 8 + .../Resources/Art/ui/weaponicon/boomerang.png | Bin 0 -> 4395 bytes .../Resources/Art/ui/weaponicon/boomerang.png.meta | 96 ++++ .../Assets/Resources/Art/ui/weaponicon/glove.png | Bin 0 -> 9786 bytes .../Resources/Art/ui/weaponicon/glove.png.meta | 96 ++++ .../Assets/Resources/Art/ui/weaponicon/grenade.png | Bin 0 -> 7466 bytes .../Resources/Art/ui/weaponicon/grenade.png.meta | 96 ++++ .../Assets/Resources/Art/ui/weaponicon/gun.png | Bin 0 -> 10775 bytes .../Resources/Art/ui/weaponicon/gun.png.meta | 96 ++++ .../Resources/Art/ui/weaponicon/light_saber.png | Bin 0 -> 9411 bytes .../Art/ui/weaponicon/light_saber.png.meta | 96 ++++ .../Resources/Art/ui/weaponicon/mystery_mask.png | Bin 0 -> 14172 bytes .../Art/ui/weaponicon/mystery_mask.png.meta | 96 ++++ .../Resources/Art/ui/weaponicon/tesla_coil.png | Bin 0 -> 13489 bytes .../Art/ui/weaponicon/tesla_coil.png.meta | 96 ++++ .../Resources/Prefabs/ui/PanelEquipBar.prefab | 502 --------------------- .../Resources/Prefabs/ui/PanelEquipBar.prefab.meta | 7 - .../Resources/Prefabs/ui/PanelTopSuffBar.prefab | 29 +- .../Resources/Prefabs/ui/PanelWeaponBar.prefab | 502 +++++++++++++++++++++ .../Prefabs/ui/PanelWeaponBar.prefab.meta | 7 + SurvivalTest/Assets/Scenes/UIEditScene.unity | 8 +- SurvivalTest/Assets/Scripts/Equips.meta | 8 - SurvivalTest/Assets/Scripts/Equips/EquipBase.cs | 66 --- .../Assets/Scripts/Equips/EquipBase.cs.meta | 11 - .../Assets/Scripts/Equips/Equip_Boomerang.cs | 34 -- .../Assets/Scripts/Equips/Equip_Boomerang.cs.meta | 11 - .../Assets/Scripts/Equips/Equip_GrenadeLauncher.cs | 49 -- .../Scripts/Equips/Equip_GrenadeLauncher.cs.meta | 11 - SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs | 57 --- .../Assets/Scripts/Equips/Equip_Gun.cs.meta | 11 - .../Assets/Scripts/Equips/Equip_MightyGlove.cs | 22 - .../Scripts/Equips/Equip_MightyGlove.cs.meta | 11 - .../Assets/Scripts/Equips/Equip_TeslaCoil.cs | 23 - .../Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta | 11 - SurvivalTest/Assets/Scripts/Equips/LightSaber.meta | 8 - .../Scripts/Equips/LightSaber/Equip_LightSaber.cs | 63 --- .../Equips/LightSaber/Equip_LightSaber.cs.meta | 11 - .../Assets/Scripts/Equips/LightSaber/LightSaber.cs | 18 - .../Scripts/Equips/LightSaber/LightSaber.cs.meta | 11 - SurvivalTest/Assets/Scripts/Equips/RailGun.meta | 8 - .../Assets/Scripts/Equips/RailGun/Equip_RailGun.cs | 16 - .../Scripts/Equips/RailGun/Equip_RailGun.cs.meta | 11 - .../Assets/Scripts/Equips/RailGun/RailGun.cs | 18 - .../Assets/Scripts/Equips/RailGun/RailGun.cs.meta | 11 - .../Assets/Scripts/Managers/BattleManager.cs | 2 +- .../Assets/Scripts/Managers/PlayerManager.cs | 6 +- .../Scripts/Managers/PlayerManager_Equips.cs | 140 ------ .../Scripts/Managers/PlayerManager_Equips.cs.meta | 11 - .../Scripts/Managers/PlayerManager_Weapons.cs | 140 ++++++ .../Scripts/Managers/PlayerManager_Weapons.cs.meta | 11 + .../Assets/Scripts/UI/Panel/PanelEquipBar.meta | 8 - .../UI/Panel/PanelEquipBar/PanelEquipBar.cs | 40 -- .../UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta | 11 - .../UI/Panel/PanelEquipBar/UIEquipWidget.cs | 39 -- .../UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta | 11 - .../UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs | 4 +- .../UI/Panel/PanelTopStuffBar/UIEquipBar.cs | 41 -- .../UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta | 11 - .../UI/Panel/PanelTopStuffBar/UIWeaponBar.cs | 41 ++ .../UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta | 11 + .../Assets/Scripts/UI/Panel/PanelWeaponBar.meta | 8 + .../UI/Panel/PanelWeaponBar/PanelWeaponBar.cs | 40 ++ .../UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta | 11 + .../UI/Panel/PanelWeaponBar/UIWeaponWidget.cs | 39 ++ .../UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta | 11 + SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs | 4 +- SurvivalTest/Assets/Scripts/Weapons.meta | 8 + .../Assets/Scripts/Weapons/LightSaber.meta | 8 + .../Scripts/Weapons/LightSaber/LightSaber.cs | 18 + .../Scripts/Weapons/LightSaber/LightSaber.cs.meta | 11 + .../Weapons/LightSaber/Weapon_LightSaber.cs | 63 +++ .../Weapons/LightSaber/Weapon_LightSaber.cs.meta | 11 + SurvivalTest/Assets/Scripts/Weapons/RailGun.meta | 8 + .../Assets/Scripts/Weapons/RailGun/RailGun.cs | 18 + .../Assets/Scripts/Weapons/RailGun/RailGun.cs.meta | 11 + .../Scripts/Weapons/RailGun/Weapon_RailGun.cs | 16 + .../Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta | 11 + SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs | 66 +++ .../Assets/Scripts/Weapons/WeaponBase.cs.meta | 11 + .../Assets/Scripts/Weapons/Weapon_Boomerang.cs | 34 ++ .../Scripts/Weapons/Weapon_Boomerang.cs.meta | 11 + .../Scripts/Weapons/Weapon_GrenadeLauncher.cs | 49 ++ .../Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta | 11 + SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs | 57 +++ .../Assets/Scripts/Weapons/Weapon_Gun.cs.meta | 11 + .../Assets/Scripts/Weapons/Weapon_MightyGlove.cs | 22 + .../Scripts/Weapons/Weapon_MightyGlove.cs.meta | 11 + .../Assets/Scripts/Weapons/Weapon_TeslaCoil.cs | 23 + .../Scripts/Weapons/Weapon_TeslaCoil.cs.meta | 11 + 104 files changed, 2035 insertions(+), 2020 deletions(-) delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png delete mode 100644 SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta delete mode 100644 SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab delete mode 100644 SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta create mode 100644 SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab create mode 100644 SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/EquipBase.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta (limited to 'SurvivalTest/Assets') diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta deleted file mode 100644 index b402ae1..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e749821f81bfed2428b1befd0927f182 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png deleted file mode 100644 index c8571b8..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta deleted file mode 100644 index 4e936cf..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: d00941a62ff01f444898277f40eb499c -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png deleted file mode 100644 index e33bf32..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta deleted file mode 100644 index 3a2f65c..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 6e2e3484178c6f8478351a20c53411d1 -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png deleted file mode 100644 index 3036358..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta deleted file mode 100644 index 78c3200..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/grenade.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: e1b736de4152d434d8fb757fac16f223 -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png deleted file mode 100644 index 0b5cab0..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta deleted file mode 100644 index 8e738de..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/gun.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: e7d386bc720056d479b608be0afa73dd -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png deleted file mode 100644 index 9fcb826..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta deleted file mode 100644 index 31cb26f..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/light_saber.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: 917ad1c1b89d42d408d2f45581c68787 -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png deleted file mode 100644 index 6008995..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta deleted file mode 100644 index e719db3..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: a36c65cebbe270041ad2e74adcdfa868 -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png deleted file mode 100644 index c2acabb..0000000 Binary files a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png and /dev/null differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta deleted file mode 100644 index d55aa57..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta +++ /dev/null @@ -1,96 +0,0 @@ -fileFormatVersion: 2 -guid: a38ee0491dfaa30429afe3bf0920eb38 -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: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta new file mode 100644 index 0000000..0ca3c42 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d339f1fd84bbf184b8fe7847aaadfc04 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png new file mode 100644 index 0000000..c8571b8 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta new file mode 100644 index 0000000..4e936cf --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/boomerang.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: d00941a62ff01f444898277f40eb499c +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png new file mode 100644 index 0000000..e33bf32 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta new file mode 100644 index 0000000..3a2f65c --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/glove.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6e2e3484178c6f8478351a20c53411d1 +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png new file mode 100644 index 0000000..3036358 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta new file mode 100644 index 0000000..78c3200 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/grenade.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: e1b736de4152d434d8fb757fac16f223 +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png new file mode 100644 index 0000000..0b5cab0 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta new file mode 100644 index 0000000..8e738de --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/gun.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: e7d386bc720056d479b608be0afa73dd +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png new file mode 100644 index 0000000..9fcb826 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta new file mode 100644 index 0000000..31cb26f --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/light_saber.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 917ad1c1b89d42d408d2f45581c68787 +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png new file mode 100644 index 0000000..6008995 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta new file mode 100644 index 0000000..e719db3 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/mystery_mask.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a36c65cebbe270041ad2e74adcdfa868 +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png new file mode 100644 index 0000000..c2acabb Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta new file mode 100644 index 0000000..d55aa57 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/tesla_coil.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a38ee0491dfaa30429afe3bf0920eb38 +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: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab deleted file mode 100644 index a59dfcd..0000000 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab +++ /dev/null @@ -1,502 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1433800100 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1433800101} - - component: {fileID: 1433800103} - - component: {fileID: 1433800102} - m_Layer: 5 - m_Name: Image_CD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1433800101 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433800100} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2762965039604320079} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1433800103 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433800100} - m_CullTransparentMesh: 1 ---- !u!114 &1433800102 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1433800100} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.13333334} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: be5e635b9d3d6f542ad447f7ae74d785, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 1 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1085118836000191244 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1085118836000191247} - - component: {fileID: 4164072259357555242} - - component: {fileID: 993156772322233381} - m_Layer: 5 - m_Name: Grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1085118836000191247 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1085118836000191244} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4955373364382747661} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.000015258789, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4164072259357555242 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1085118836000191244} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4dbae61f498dde342a95489aca8ff68c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &993156772322233381 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1085118836000191244} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!1 &1375102333325764175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8436322772745603753} - - component: {fileID: 3587346365448633421} - - component: {fileID: 7293713770503003309} - - component: {fileID: 8008270481914925385} - m_Layer: 5 - m_Name: Icon_Item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8436322772745603753 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375102333325764175} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 68874370905088208} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.20401001, y: 0.16799927} - m_SizeDelta: {x: -5.855, y: -5.927} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3587346365448633421 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375102333325764175} - m_CullTransparentMesh: 1 ---- !u!114 &7293713770503003309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375102333325764175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e1b736de4152d434d8fb757fac16f223, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8008270481914925385 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375102333325764175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 1 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7293713770503003309} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &4552908487503979030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4955373364382747661} - m_Layer: 5 - m_Name: Root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4955373364382747661 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4552908487503979030} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2762965039604320079} - - {fileID: 1085118836000191247} - m_Father: {fileID: 8436628705391075521} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.9227778} - m_AnchorMax: {x: 0.4, y: 0.9710001} - m_AnchoredPosition: {x: 18, y: -10.999817} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!1 &5896155432149764499 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2762965039604320079} - - component: {fileID: 2033039220} - m_Layer: 5 - m_Name: EquipTemplate - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2762965039604320079 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5896155432149764499} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 68874370905088208} - - {fileID: 1433800101} - m_Father: {fileID: 4955373364382747661} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0, y: 1} ---- !u!114 &2033039220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5896155432149764499} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83ab90093bb5312428311a589a4fe90f, type: 3} - m_Name: - m_EditorClassIdentifier: - Image_Icon: {fileID: 7293713770503003309} - Image_CD: {fileID: 1433800102} ---- !u!1 &7599170346437084209 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 68874370905088208} - - component: {fileID: 7997936969523246281} - m_Layer: 5 - m_Name: Button_Item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &68874370905088208 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7599170346437084209} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8436322772745603753} - m_Father: {fileID: 2762965039604320079} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7997936969523246281 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7599170346437084209} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 1, g: 0, b: 0, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7293713770503003309} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &8436628705391075520 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8436628705391075521} - - component: {fileID: 8436628705391075523} - - component: {fileID: 719302489} - m_Layer: 5 - m_Name: PanelEquipBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8436628705391075521 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8436628705391075520} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4955373364382747661} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8436628705391075523 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8436628705391075520} - m_CullTransparentMesh: 1 ---- !u!114 &719302489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8436628705391075520} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1382539f3296aa47b7e2d7f269f9007, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EquipTemplate: {fileID: 2033039220} - m_EquipGrid: {fileID: 4164072259357555242} diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta deleted file mode 100644 index 9a75998..0000000 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6f8f312a90e5b264eb2db0c1bf204471 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab index 1a7ff02..65d34ed 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab @@ -264,9 +264,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 563803806} - - component: {fileID: 2748991041996116403} + - component: {fileID: 696148772594564389} + - component: {fileID: 7551546431576210827} m_Layer: 5 - m_Name: Root_Equip + m_Name: Root_Weapon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -293,7 +294,7 @@ RectTransform: m_AnchoredPosition: {x: 10, y: -25} m_SizeDelta: {x: 395.19995, y: 30} m_Pivot: {x: 0, y: 1} ---- !u!114 &2748991041996116403 +--- !u!114 &696148772594564389 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -305,8 +306,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3eefcc4321abff24e88f7cbb843e3fda, type: 3} m_Name: m_EditorClassIdentifier: - m_EquipTemplate: {fileID: 1891821505} - m_EquipGrid: {fileID: 913444338} + m_WeaponTemplate: {fileID: 1891821505} + m_WeaponGrid: {fileID: 913444338} +--- !u!114 &7551546431576210827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563803805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3eefcc4321abff24e88f7cbb843e3fda, type: 3} + m_Name: + m_EditorClassIdentifier: + m_WeaponTemplate: {fileID: 1891821505} + m_WeaponGrid: {fileID: 913444338} --- !u!1 &657550471 GameObject: m_ObjectHideFlags: 0 @@ -914,7 +929,7 @@ GameObject: - component: {fileID: 1891821504} - component: {fileID: 1891821505} m_Layer: 5 - m_Name: EquipTemplate + m_Name: WeaponTemplate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1522,6 +1537,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c7a0239a22d86847b5806d7e4f2e500, type: 3} m_Name: m_EditorClassIdentifier: - m_EquipBar: {fileID: 2748991041996116403} + m_WeaponBar: {fileID: 696148772594564389} m_ItemBar: {fileID: 1336027010569382835} m_DecorationBar: {fileID: 1323087931109695763} diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab new file mode 100644 index 0000000..c0f697f --- /dev/null +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab @@ -0,0 +1,502 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1433800100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1433800101} + - component: {fileID: 1433800103} + - component: {fileID: 1433800102} + m_Layer: 5 + m_Name: Image_CD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1433800101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433800100} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2762965039604320079} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1433800103 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433800100} + m_CullTransparentMesh: 1 +--- !u!114 &1433800102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1433800100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.13333334} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: be5e635b9d3d6f542ad447f7ae74d785, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 1 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1085118836000191244 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1085118836000191247} + - component: {fileID: 4164072259357555242} + - component: {fileID: 993156772322233381} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1085118836000191247 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085118836000191244} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4955373364382747661} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -0.000015258789, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4164072259357555242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085118836000191244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4dbae61f498dde342a95489aca8ff68c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &993156772322233381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085118836000191244} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &1375102333325764175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8436322772745603753} + - component: {fileID: 3587346365448633421} + - component: {fileID: 7293713770503003309} + - component: {fileID: 8008270481914925385} + m_Layer: 5 + m_Name: Icon_Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8436322772745603753 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375102333325764175} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 68874370905088208} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.20401001, y: 0.16799927} + m_SizeDelta: {x: -5.855, y: -5.927} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3587346365448633421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375102333325764175} + m_CullTransparentMesh: 1 +--- !u!114 &7293713770503003309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375102333325764175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e1b736de4152d434d8fb757fac16f223, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8008270481914925385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375102333325764175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 1 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7293713770503003309} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4552908487503979030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4955373364382747661} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4955373364382747661 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4552908487503979030} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2762965039604320079} + - {fileID: 1085118836000191247} + m_Father: {fileID: 8436628705391075521} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.9227778} + m_AnchorMax: {x: 0.4, y: 0.9710001} + m_AnchoredPosition: {x: 18, y: -10.999817} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!1 &5896155432149764499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2762965039604320079} + - component: {fileID: 2033039220} + m_Layer: 5 + m_Name: EquipTemplate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2762965039604320079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5896155432149764499} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 68874370905088208} + - {fileID: 1433800101} + m_Father: {fileID: 4955373364382747661} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2033039220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5896155432149764499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83ab90093bb5312428311a589a4fe90f, type: 3} + m_Name: + m_EditorClassIdentifier: + Image_Icon: {fileID: 7293713770503003309} + Image_CD: {fileID: 1433800102} +--- !u!1 &7599170346437084209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 68874370905088208} + - component: {fileID: 7997936969523246281} + m_Layer: 5 + m_Name: Button_Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &68874370905088208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7599170346437084209} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8436322772745603753} + m_Father: {fileID: 2762965039604320079} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7997936969523246281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7599170346437084209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 1, g: 0, b: 0, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7293713770503003309} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8436628705391075520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8436628705391075521} + - component: {fileID: 8436628705391075523} + - component: {fileID: 719302489} + m_Layer: 5 + m_Name: PanelWeaponBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8436628705391075521 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8436628705391075520} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4955373364382747661} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8436628705391075523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8436628705391075520} + m_CullTransparentMesh: 1 +--- !u!114 &719302489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8436628705391075520} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1382539f3296aa47b7e2d7f269f9007, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EquipTemplate: {fileID: 2033039220} + m_EquipGrid: {fileID: 4164072259357555242} diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta new file mode 100644 index 0000000..9a75998 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelWeaponBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6f8f312a90e5b264eb2db0c1bf204471 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scenes/UIEditScene.unity b/SurvivalTest/Assets/Scenes/UIEditScene.unity index 1ca54d7..d947f78 100644 --- a/SurvivalTest/Assets/Scenes/UIEditScene.unity +++ b/SurvivalTest/Assets/Scenes/UIEditScene.unity @@ -799,10 +799,6 @@ PrefabInstance: propertyPath: m_Name value: PanelTopSuffBar objectReference: {fileID: 0} - - target: {fileID: 8494652252006705341, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} --- !u!1001 &870056664923787661 @@ -1010,6 +1006,10 @@ PrefabInstance: propertyPath: m_Name value: PanelBossHpBar objectReference: {fileID: 0} + - target: {fileID: 1765710737091365654, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6288909076716388209, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3} propertyPath: m_AnchorMax.y value: 1 diff --git a/SurvivalTest/Assets/Scripts/Equips.meta b/SurvivalTest/Assets/Scripts/Equips.meta deleted file mode 100644 index 0cc5388..0000000 --- a/SurvivalTest/Assets/Scripts/Equips.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09f9eba1fb9f9ac4aaf7bb4f335eb9f1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs deleted file mode 100644 index ff8a198..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public abstract class EquipBase -{ - - public abstract string name { get; } - - public abstract string iconPath { get; } - - /// - /// Á¬·¢Ä£Ê½ - /// - public enum AutoMode - { - Interval, // °´Ê±Á¬·¢£¬ÐèÒªÉèÖÃInterval - Condition, // °´Ìõ¼þ´¥·¢£¬ÐèÒªÖØдCheckCondition - Always, // ³£×¤ - } - - public abstract AutoMode autoMode { get; } - - /// - /// ´¥·¢µÄʱ¼ä¼ä¸ô - /// - public virtual float interval { get; } - - /// - /// ³õʼ»¯ - /// - public virtual void OnInitialize(GameObject owner) - { - } - - /// - /// Ïú»Ù - /// - /// - public virtual void OnDestroy(GameObject owner) - { - } - - /// - /// ʹÓÃ×°±¸ - /// - public abstract void OnTrigger(GameObject owner); - - public virtual bool CheckCondition(GameObject owner) - { - return false; - } - - /// - /// Í£Ö¹¿ª»ð - /// - /// - public virtual void OnStop(GameObject owner) - { - } - - public virtual void Update(GameObject owner) - { - } - -} diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta deleted file mode 100644 index 23e0a00..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a9ad03a26b4af7a42a81bd9216665ebb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs deleted file mode 100644 index 8e3d917..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// »ØÐýïÚ -/// -public class Equip_Boomerang : EquipBase -{ - public override AutoMode autoMode => AutoMode.Condition; - - public override string name => "»ØÐýïÚ"; - - public override string iconPath => "art/ui/equipicon/boomerang"; - - /// - /// ½Óµ½»ØÐýïÚºóÖØÐÂÖÀ³ö£¬·ñÔò¼ä¸ôÒ»¶Îʱ¼äͶÖÀ - /// - /// - /// - public override bool CheckCondition(GameObject owner) - { - return false; - } - - public override void OnTrigger(GameObject owner) - { - } - - public override void Update(GameObject owner) - { - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta deleted file mode 100644 index dc65c95..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: de55161bf2db13f48b0192e0c4fcbcfa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs deleted file mode 100644 index cd020a0..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// Áñµ¯·¢ÉäÆ÷ -/// -public class Equip_GrenadeLauncher : EquipBase -{ - - public override string name => "Áñµ¯·¢ÉäÆ÷"; - - public override string iconPath => "art/ui/equipicon/grenade"; - - public override AutoMode autoMode => AutoMode.Interval; - - public override float interval => 0.5f; - - private string prefabPath = "prefabs/grenade/grenade_v1"; - - // ÌØЧvfx - private string vfxPath = "prefabs/effect/eff_launch"; - - Vector3 GetRandomLaunchGrenadeDirection(CrewScript crew) - { - Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-15f, 15f)) * new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0); - dirOnPlane = dirOnPlane.normalized; - Vector3 dir = new Vector3(dirOnPlane.x, dirOnPlane.y, Random.Range(0f, 1f)).normalized; - return dir.normalized; - } - - - public override void OnTrigger(GameObject owner) - { - CrewScript crew = owner.GetComponent(); - - // grenade - TestPeaceMakerGrenade grenade = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(prefabPath)); - Vector3 position = owner.GetComponent().position + new Vector3(0, 0, 1.8f); - grenade.Set(position, GetRandomLaunchGrenadeDirection(crew), Random.Range(8f, 10f)); - grenade.gameObject.SetActive(true); - - // vfx - GameObject eff = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(vfxPath), crew.transform); - eff.transform.position = crew.launchPoint.position; - eff.SetActive(true); - - } -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta deleted file mode 100644 index 0664e49..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8576c95cf1a888f41be5cb6907cd02bc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs deleted file mode 100644 index 8daf999..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 枪 -/// -public class Equip_Gun : EquipBase -{ - - public override string name => "枪"; - - public override string iconPath => "art/ui/equipicon/gun"; - - public override AutoMode autoMode => AutoMode.Interval; - - public override float interval => 0.1f; - - private string prefabPath = "prefabs/bullet/bullet"; - - private int index = 0; - - TestPeaceMakerBullet CreateBullet(CrewScript crew, Vector2 dir, float speed, float lifeTime) - { - TestPeaceMakerBullet bullet = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load< TestPeaceMakerBullet>(prefabPath)); - - bullet.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * -0.3f; - - bullet.Set(dir, speed, lifeTime); - bullet.gameObject.SetActive(true); - - return bullet; - } - - public override void OnTrigger(GameObject owner) - { - CrewScript crew = owner.GetComponent(); - - index++; - index = index % 3; - - if(index == 0) - { - CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, -10 * Mathf.Deg2Rad), 12f, 2f); - } - else if(index == 1) - { - CreateBullet(crew, crew.aimDirection, 12f, 2f); - } - else if(index == 2) - { - CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, 10 * Mathf.Deg2Rad), 12f, 2f); - } - - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta deleted file mode 100644 index 0388d5b..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e3705ee478644d4092b29376c9173ad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs deleted file mode 100644 index 6a05b18..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// ³¬·²ÊÖÌ×£¬¼¯ÆëÎå¿Å±¦Ê¯ÊÎÆ·½âËø³¬Îä -/// -public class Equip_MightyGlove : EquipBase -{ - - public override string name => "³¬·²ÊÖÌ×"; - - public override string iconPath => "art/ui/equipicon/glove"; - - public override AutoMode autoMode => AutoMode.Interval; - - public override float interval => 100f; - - public override void OnTrigger(GameObject owner) - { - } -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta deleted file mode 100644 index 1a7c505..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3fb783e0a66c9e349bbd4a5c0d51a55b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs deleted file mode 100644 index af523cd..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// ÌØ˹À­ÏßȦ -/// -public class Equip_TeslaCoil : EquipBase -{ - - public override string name => "ÌØ˹À­ÏßȦ"; - - public override string iconPath => "art/ui/equipicon/tesla_coil"; - - public override AutoMode autoMode => AutoMode.Interval; - - public override float interval => 20f; - - public override void OnTrigger(GameObject owner) - { - } - -} diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta deleted file mode 100644 index b8d5d7f..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d7080bdedf9532d4bb649fe643619fab -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta deleted file mode 100644 index 1920297..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 253a4032920545c4488fd1eeedac07e3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs b/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs deleted file mode 100644 index 9066884..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Equip_LightSaber : EquipBase -{ - public override string name => "¹â½£"; - - public override string iconPath => "art/ui/equipicon/light_saber"; - - public override AutoMode autoMode => AutoMode.Condition; - - private string lightSaberPrefabPath = "prefabs/weapon/light_saber"; - - private bool isWielding = false; - - private LightSaber m_LightSaber; - - private TopDownTransform m_TopDownTransform; - - private float m_Dist = 0.2f; - - public override void OnInitialize(GameObject owner) - { - m_LightSaber = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(lightSaberPrefabPath)); - m_TopDownTransform = m_LightSaber.gameObject.GetComponent(); - SetLightSaberPositionAndRotation(owner.GetComponent()); - m_LightSaber.gameObject.SetActive(false); - } - - public override bool CheckCondition(GameObject owner) - { - return true; - } - - public override void OnTrigger(GameObject owner) - { - if (isWielding) - return; - isWielding = true; - - m_LightSaber.gameObject.SetActive(true); - } - - public override void OnStop(GameObject owner) - { - isWielding = false; - m_LightSaber.gameObject.SetActive(false); - } - - public override void Update(GameObject owner) - { - CrewScript crew = owner.GetComponent(); - SetLightSaberPositionAndRotation(crew); - } - - void SetLightSaberPositionAndRotation(CrewScript crew) - { - m_LightSaber.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * m_Dist; - m_LightSaber.transform.rotation = Quaternion.Euler(0, 0, Mathf.Atan2(crew.aimDirection.y, crew.aimDirection.x) * Mathf.Rad2Deg); - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta deleted file mode 100644 index dcc1028..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cf80263cc579a3c46887c696a8f09d56 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs b/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs deleted file mode 100644 index 4db08ee..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LightSaber : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta deleted file mode 100644 index e8200d8..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 72f3d28485a45ba4b8906603b170f9fa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun.meta deleted file mode 100644 index 901bfca..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 58852a4f6155748468fd8812fd61446d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs deleted file mode 100644 index e83614c..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Equip_RailGun : EquipBase -{ - public override string name => "¹ìµÀÅÚ"; - - public override string iconPath => ""; - - public override AutoMode autoMode => AutoMode.Interval; - - public override void OnTrigger(GameObject owner) - { - } -} diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta deleted file mode 100644 index 6d71ccc..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a9a37b2731565934eb4ef0f95a64aaea -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs deleted file mode 100644 index 0ffb5eb..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class RailGun : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta deleted file mode 100644 index 28040c3..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 840b1c98faf9e654abb4f09bf46fb3f5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs index 701f27c..c473a5d 100644 --- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -10,7 +10,7 @@ public class BattleManager : Singleton UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); - //UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); + //UIManager.Instance.OpenPanel(PanelType.PanelWeaponBar, null); } public void Update() diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index bb97ce3..bae437e 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -11,7 +11,7 @@ public partial class PlayerManager : Singleton public void Init() { InitItems(); - InitEquips(); + InitWeapons(); InitDecorations(); } @@ -20,14 +20,14 @@ public partial class PlayerManager : Singleton CheckInput(); UpdateItems(); - UpdateEquips(); + UpdateWeapons(); UpdateDecorations(); } public void SetCrew(CrewScript crew) { m_Crew = crew; - m_Equips.ForEach(e => e.OnInitialize(crew.gameObject)); + m_Weapons.ForEach(e => e.OnInitialize(crew.gameObject)); } } \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs deleted file mode 100644 index 7f50ea9..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public partial class PlayerManager : Singleton -{ - // ³ÖÓеÄ×°±¸ - public List equips { get { return m_Equips; } } - private List m_Equips = new List(); - - private Coroutine m_CoFire; - - public bool isFire { get; private set; } - - private bool m_AutoFire; - private float m_AutoFireDuration = 0.8f; - - private float m_LastAxisValue = 0; - - void InitEquips() - { - m_Equips.Add(new Equip_LightSaber()); - m_Equips.Add(new Equip_Gun()); - m_Equips.Add(new Equip_GrenadeLauncher()); - m_Equips.Add(new Equip_Boomerang()); - m_Equips.Add(new Equip_TeslaCoil()); - m_Equips.Add(new Equip_MightyGlove()); - - m_AutoFire = false; - - m_LastAxisValue = Input.GetAxisRaw("GunTrigger"); - } - - /// - /// ×°±¸Ñ­»· - /// - void UpdateEquips() - { - for(int i = 0; i < m_Equips.Count; ++i) - { - m_Equips[i].Update(m_Crew.gameObject); - } - } - - /// - /// ¼ì²éÊäÈ룬ʹÓÃ×°±¸ - /// - void CheckInput() - { - float axis = Input.GetAxisRaw("GunTrigger"); - - if (Input.GetButtonDown("Fire1") || (axis == 1 && m_LastAxisValue != 1)) - { - if(m_AutoFire) - { - m_AutoFire = false; - } - - isFire = true; - RunFireCoroutine(true); - } - - if (!m_AutoFire && !Input.GetButton("Fire1") && (axis == 0 && m_LastAxisValue != 0)) - { - if (TinyCountDown.Instance.Get("ReleaseFire") > 0) - { - m_AutoFire = true; - isFire = true; - RunFireCoroutine(true); - } - else - { - TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration); - isFire = false; - RunFireCoroutine(false); - } - } - - m_LastAxisValue = axis; - } - - void RunFireCoroutine(bool start) - { - if (start) - { - if (m_CoFire == null) - { - m_CoFire = GameApp.Instance.StartCoroutine(coFire()); - } - } - else - { - if (m_CoFire != null) - { - GameApp.Instance.StopCoroutine(m_CoFire); - m_Equips.ForEach(e => e.OnStop(m_Crew.gameObject)); - m_CoFire = null; - } - } - } - - /// - /// ×ÔÓÉ¿ª»ð - /// - /// - IEnumerator coFire() - { - while (true) - { - for(int i = 0; i < m_Equips.Count; ++i) - { - EquipBase equip = m_Equips[i]; - if (equip == null) - continue; - if(equip.autoMode == EquipBase.AutoMode.Interval) - { - string id = equip.GetHashCode().ToString(); - float countDown = TinyCountDown.Instance.Get(id); // µ¹¼ÆʱÍÑÀëfireµ¥¶À¼Æʱ - if(countDown <= 0) - { - equip.OnTrigger(m_Crew.gameObject); - TinyCountDown.Instance.Set(id, equip.interval); - } - else - { - } - } - else if(equip.autoMode == EquipBase.AutoMode.Condition) - { - if(equip.CheckCondition(m_Crew.gameObject)) - { - equip.OnTrigger(m_Crew.gameObject); - } - } - } - yield return null; - } - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta deleted file mode 100644 index c43b512..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19dc8d657411e8d47a563a47442d687d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs new file mode 100644 index 0000000..381beb8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs @@ -0,0 +1,140 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public partial class PlayerManager : Singleton +{ + // ³ÖÓеÄ×°±¸ + public List weapons { get { return m_Weapons; } } + private List m_Weapons = new List(); + + private Coroutine m_CoFire; + + public bool isFire { get; private set; } + + private bool m_AutoFire; + private float m_AutoFireDuration = 0.8f; + + private float m_LastAxisValue = 0; + + void InitWeapons() + { + m_Weapons.Add(new Weapon_LightSaber()); + m_Weapons.Add(new Weapon_Gun()); + m_Weapons.Add(new Weapon_GrenadeLauncher()); + m_Weapons.Add(new Weapon_Boomerang()); + m_Weapons.Add(new Weapon_TeslaCoil()); + m_Weapons.Add(new Weapon_MightyGlove()); + + m_AutoFire = false; + + m_LastAxisValue = Input.GetAxisRaw("GunTrigger"); + } + + /// + /// ×°±¸Ñ­»· + /// + void UpdateWeapons() + { + for(int i = 0; i < m_Weapons.Count; ++i) + { + m_Weapons[i].Update(m_Crew.gameObject); + } + } + + /// + /// ¼ì²éÊäÈ룬ʹÓÃ×°±¸ + /// + void CheckInput() + { + float axis = Input.GetAxisRaw("GunTrigger"); + + if (Input.GetButtonDown("Fire1") || (axis == 1 && m_LastAxisValue != 1)) + { + if(m_AutoFire) + { + m_AutoFire = false; + } + + isFire = true; + RunFireCoroutine(true); + } + + if (!m_AutoFire && !Input.GetButton("Fire1") && (axis == 0 && m_LastAxisValue != 0)) + { + if (TinyCountDown.Instance.Get("ReleaseFire") > 0) + { + m_AutoFire = true; + isFire = true; + RunFireCoroutine(true); + } + else + { + TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration); + isFire = false; + RunFireCoroutine(false); + } + } + + m_LastAxisValue = axis; + } + + void RunFireCoroutine(bool start) + { + if (start) + { + if (m_CoFire == null) + { + m_CoFire = GameApp.Instance.StartCoroutine(coFire()); + } + } + else + { + if (m_CoFire != null) + { + GameApp.Instance.StopCoroutine(m_CoFire); + m_Weapons.ForEach(e => e.OnStop(m_Crew.gameObject)); + m_CoFire = null; + } + } + } + + /// + /// ×ÔÓÉ¿ª»ð + /// + /// + IEnumerator coFire() + { + while (true) + { + for(int i = 0; i < m_Weapons.Count; ++i) + { + WeaponBase weapon = m_Weapons[i]; + if (weapon == null) + continue; + if(weapon.autoMode == WeaponBase.AutoMode.Interval) + { + string id = weapon.GetHashCode().ToString(); + float countDown = TinyCountDown.Instance.Get(id); // µ¹¼ÆʱÍÑÀëfireµ¥¶À¼Æʱ + if(countDown <= 0) + { + weapon.OnTrigger(m_Crew.gameObject); + TinyCountDown.Instance.Set(id, weapon.interval); + } + else + { + } + } + else if(weapon.autoMode == WeaponBase.AutoMode.Condition) + { + if(weapon.CheckCondition(m_Crew.gameObject)) + { + weapon.OnTrigger(m_Crew.gameObject); + } + } + } + yield return null; + } + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta new file mode 100644 index 0000000..baba6a3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc3ba8ee467185942a84fa7c6ced6ec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta deleted file mode 100644 index 380d967..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 26efe0e32407015498a94f7fe8930a70 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs deleted file mode 100644 index 03ee945..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PanelEquipBar : PanelBase -{ - public UIEquipWidget m_EquipTemplate; - - public UISimpleGrid m_EquipGrid; - - private List m_Equips = new List(); - - public override void Set(object param) - { - m_EquipTemplate.gameObject.SetActive(false); - - for (int i = 0; i < PlayerManager.Instance.equips.Count; ++i) - { - UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]); - m_Equips.Add(widget); - } - } - - UIEquipWidget MakeEquipWidget(EquipBase equip) - { - UIEquipWidget widget = Instantiate(m_EquipTemplate); - widget.transform.SetParent(m_EquipGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().anchoredPosition = new Vector2(0, 0); -#if UNITY_EDITOR - widget.name = "equip (" + equip.name + ")"; -#endif - - UIEquipWidgetParam param = new UIEquipWidgetParam(); - param.equip = equip; - widget.Set(param); - return widget; - } - -} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta deleted file mode 100644 index bf78ef3..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f1382539f3296aa47b7e2d7f269f9007 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs deleted file mode 100644 index 9099f18..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public struct UIEquipWidgetParam -{ - public EquipBase equip; -} - -public class UIEquipWidget : UIGridItemBase -{ - public Image Image_Icon; - public Image Image_CD; - - public EquipBase equip { get { return m_Equip; } } - private EquipBase m_Equip; - - public override void Set(object param) - { - UIEquipWidgetParam info = (UIEquipWidgetParam)param; - m_Equip = info.equip; - - Image_Icon.sprite = ResourceManager.Instance.Load(info.equip.iconPath); - - Image_CD.gameObject.SetActive(equip.autoMode == EquipBase.AutoMode.Interval); - } - - private void Update() - { - if(equip.autoMode == EquipBase.AutoMode.Interval) - { - float countDown = TinyCountDown.Instance.Get(equip.GetHashCode().ToString()); - float t = countDown / equip.interval; - Image_CD.fillAmount = t; - } - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta deleted file mode 100644 index bad655e..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 83ab90093bb5312428311a589a4fe90f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs index 2d1e02b..6e91c6b 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs @@ -4,13 +4,13 @@ using UnityEngine; public class PanelTopStuffBar : PanelBase { - public UIEquipBar m_EquipBar; + public UIWeaponBar m_WeaponBar; public UIItemBar m_ItemBar; public UIDecorationBar m_DecorationBar; public override void Set(object param) { - m_EquipBar.Set(); + m_WeaponBar.Set(); m_ItemBar.Set(); m_DecorationBar.Set(); } diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs deleted file mode 100644 index d658663..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UIEquipBar : MonoBehaviour -{ - public UIEquipWidget m_EquipTemplate; - - public UISimpleGrid m_EquipGrid; - - private List m_Equips = new List(); - - public void Set() - { - m_EquipTemplate.gameObject.SetActive(false); - - for (int i = 0; i < PlayerManager.Instance.equips.Count; ++i) - { - UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]); - m_Equips.Add(widget); - } - } - - UIEquipWidget MakeEquipWidget(EquipBase equip) - { - UIEquipWidget widget = Instantiate(m_EquipTemplate); - widget.transform.SetParent(m_EquipGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().anchoredPosition = new Vector2(0, 0); -#if UNITY_EDITOR - widget.name = "equip (" + equip.name + ")"; -#endif - - UIEquipWidgetParam param = new UIEquipWidgetParam(); - param.equip = equip; - widget.Set(param); - return widget; - } - - -} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta deleted file mode 100644 index 68bf843..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3eefcc4321abff24e88f7cbb843e3fda -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs new file mode 100644 index 0000000..96e6cfd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIWeaponBar : MonoBehaviour +{ + public UIWeaponWidget m_WeaponTemplate; + + public UISimpleGrid m_WeaponGrid; + + private List m_Weapons = new List(); + + public void Set() + { + m_WeaponTemplate.gameObject.SetActive(false); + + for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i) + { + UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]); + m_Weapons.Add(widget); + } + } + + UIWeaponWidget MakeWeaponWidget(WeaponBase weapon) + { + UIWeaponWidget widget = Instantiate(m_WeaponTemplate); + widget.transform.SetParent(m_WeaponGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "weapon (" + weapon.name + ")"; +#endif + + UIWeaponWidgetParam param = new UIWeaponWidgetParam(); + param.weapon = weapon; + widget.Set(param); + return widget; + } + + +} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta new file mode 100644 index 0000000..68bf843 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3eefcc4321abff24e88f7cbb843e3fda +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta new file mode 100644 index 0000000..380d967 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26efe0e32407015498a94f7fe8930a70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs new file mode 100644 index 0000000..24c208c --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PanelWeaponBar : PanelBase +{ + public UIWeaponWidget m_WeaponTemplate; + + public UISimpleGrid m_WeaponGrid; + + private List m_Weapons = new List(); + + public override void Set(object param) + { + m_WeaponTemplate.gameObject.SetActive(false); + + for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i) + { + UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]); + m_Weapons.Add(widget); + } + } + + UIWeaponWidget MakeWeaponWidget(WeaponBase weapon) + { + UIWeaponWidget widget = Instantiate(m_WeaponTemplate); + widget.transform.SetParent(m_WeaponGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "weapon (" + weapon.name + ")"; +#endif + + UIWeaponWidgetParam param = new UIWeaponWidgetParam(); + param.weapon = weapon; + widget.Set(param); + return widget; + } + +} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta new file mode 100644 index 0000000..bf78ef3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1382539f3296aa47b7e2d7f269f9007 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs new file mode 100644 index 0000000..f061a3b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public struct UIWeaponWidgetParam +{ + public WeaponBase weapon; +} + +public class UIWeaponWidget : UIGridItemBase +{ + public Image Image_Icon; + public Image Image_CD; + + public WeaponBase weapon { get { return m_Weapon; } } + private WeaponBase m_Weapon; + + public override void Set(object param) + { + UIWeaponWidgetParam info = (UIWeaponWidgetParam)param; + m_Weapon = info.weapon; + + Image_Icon.sprite = ResourceManager.Instance.Load(info.weapon.iconPath); + + Image_CD.gameObject.SetActive(weapon.autoMode == WeaponBase.AutoMode.Interval); + } + + private void Update() + { + if(weapon.autoMode == WeaponBase.AutoMode.Interval) + { + float countDown = TinyCountDown.Instance.Get(weapon.GetHashCode().ToString()); + float t = countDown / weapon.interval; + Image_CD.fillAmount = t; + } + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta new file mode 100644 index 0000000..bad655e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83ab90093bb5312428311a589a4fe90f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs index 02b3a06..649d685 100644 --- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs +++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs @@ -9,7 +9,7 @@ public enum PanelType PanelLevelBar, PanelItemBar, - PanelEquipBar, + PanelWeaponBar, PanelTopSuffBar, PanelBossHpBar, } @@ -30,7 +30,7 @@ public partial class UIManager : Singleton { AddPanel(PanelType.PanelLevelBar, "PanelLevelBar"); AddPanel(PanelType.PanelItemBar, "PanelItemBar"); - AddPanel(PanelType.PanelEquipBar, "PanelEquipBar"); + AddPanel(PanelType.PanelWeaponBar, "PanelWeaponBar"); AddPanel(PanelType.PanelTopSuffBar, "PanelTopSuffBar"); AddPanel(PanelType.PanelBossHpBar, "PanelBossHpBar"); } diff --git a/SurvivalTest/Assets/Scripts/Weapons.meta b/SurvivalTest/Assets/Scripts/Weapons.meta new file mode 100644 index 0000000..0cc5388 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09f9eba1fb9f9ac4aaf7bb4f335eb9f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta new file mode 100644 index 0000000..1920297 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 253a4032920545c4488fd1eeedac07e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs new file mode 100644 index 0000000..4db08ee --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LightSaber : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta new file mode 100644 index 0000000..e8200d8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 72f3d28485a45ba4b8906603b170f9fa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs new file mode 100644 index 0000000..ad942f3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Weapon_LightSaber : WeaponBase +{ + public override string name => "¹â½£"; + + public override string iconPath => "art/ui/weaponicon/light_saber"; + + public override AutoMode autoMode => AutoMode.Condition; + + private string lightSaberPrefabPath = "prefabs/weapon/light_saber"; + + private bool isWielding = false; + + private LightSaber m_LightSaber; + + private TopDownTransform m_TopDownTransform; + + private float m_Dist = 0.2f; + + public override void OnInitialize(GameObject owner) + { + m_LightSaber = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(lightSaberPrefabPath)); + m_TopDownTransform = m_LightSaber.gameObject.GetComponent(); + SetLightSaberPositionAndRotation(owner.GetComponent()); + m_LightSaber.gameObject.SetActive(false); + } + + public override bool CheckCondition(GameObject owner) + { + return true; + } + + public override void OnTrigger(GameObject owner) + { + if (isWielding) + return; + isWielding = true; + + m_LightSaber.gameObject.SetActive(true); + } + + public override void OnStop(GameObject owner) + { + isWielding = false; + m_LightSaber.gameObject.SetActive(false); + } + + public override void Update(GameObject owner) + { + CrewScript crew = owner.GetComponent(); + SetLightSaberPositionAndRotation(crew); + } + + void SetLightSaberPositionAndRotation(CrewScript crew) + { + m_LightSaber.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * m_Dist; + m_LightSaber.transform.rotation = Quaternion.Euler(0, 0, Mathf.Atan2(crew.aimDirection.y, crew.aimDirection.x) * Mathf.Rad2Deg); + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta new file mode 100644 index 0000000..68db854 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d419253b4eae555459a2800a7c95308c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta new file mode 100644 index 0000000..901bfca --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58852a4f6155748468fd8812fd61446d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs new file mode 100644 index 0000000..0ffb5eb --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RailGun : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta new file mode 100644 index 0000000..28040c3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 840b1c98faf9e654abb4f09bf46fb3f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs new file mode 100644 index 0000000..abad760 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Weapon_RailGun : WeaponBase +{ + public override string name => "¹ìµÀÅÚ"; + + public override string iconPath => ""; + + public override AutoMode autoMode => AutoMode.Interval; + + public override void OnTrigger(GameObject owner) + { + } +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta new file mode 100644 index 0000000..8ecfcb4 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b319aeb6ad3ae5842bb716ffa24b898a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs new file mode 100644 index 0000000..d143199 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs @@ -0,0 +1,66 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class WeaponBase +{ + + public abstract string name { get; } + + public abstract string iconPath { get; } + + /// + /// Á¬·¢Ä£Ê½ + /// + public enum AutoMode + { + Interval, // °´Ê±Á¬·¢£¬ÐèÒªÉèÖÃInterval + Condition, // °´Ìõ¼þ´¥·¢£¬ÐèÒªÖØдCheckCondition + Always, // ³£×¤ + } + + public abstract AutoMode autoMode { get; } + + /// + /// ´¥·¢µÄʱ¼ä¼ä¸ô + /// + public virtual float interval { get; } + + /// + /// ³õʼ»¯ + /// + public virtual void OnInitialize(GameObject owner) + { + } + + /// + /// Ïú»Ù + /// + /// + public virtual void OnDestroy(GameObject owner) + { + } + + /// + /// ʹÓÃ×°±¸ + /// + public abstract void OnTrigger(GameObject owner); + + public virtual bool CheckCondition(GameObject owner) + { + return false; + } + + /// + /// Í£Ö¹¿ª»ð + /// + /// + public virtual void OnStop(GameObject owner) + { + } + + public virtual void Update(GameObject owner) + { + } + +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta new file mode 100644 index 0000000..23e0a00 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9ad03a26b4af7a42a81bd9216665ebb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs new file mode 100644 index 0000000..d701c83 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// »ØÐýïÚ +/// +public class Weapon_Boomerang : WeaponBase +{ + public override AutoMode autoMode => AutoMode.Condition; + + public override string name => "»ØÐýïÚ"; + + public override string iconPath => "art/ui/weaponicon/boomerang"; + + /// + /// ½Óµ½»ØÐýïÚºóÖØÐÂÖÀ³ö£¬·ñÔò¼ä¸ôÒ»¶Îʱ¼äͶÖÀ + /// + /// + /// + public override bool CheckCondition(GameObject owner) + { + return false; + } + + public override void OnTrigger(GameObject owner) + { + } + + public override void Update(GameObject owner) + { + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta new file mode 100644 index 0000000..401fde6 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1c95bca840a78e64bba70c9ecceb2628 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs new file mode 100644 index 0000000..3a4457a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Áñµ¯·¢ÉäÆ÷ +/// +public class Weapon_GrenadeLauncher : WeaponBase +{ + + public override string name => "Áñµ¯·¢ÉäÆ÷"; + + public override string iconPath => "art/ui/weaponicon/grenade"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 0.5f; + + private string prefabPath = "prefabs/grenade/grenade_v1"; + + // ÌØЧvfx + private string vfxPath = "prefabs/effect/eff_launch"; + + Vector3 GetRandomLaunchGrenadeDirection(CrewScript crew) + { + Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-15f, 15f)) * new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0); + dirOnPlane = dirOnPlane.normalized; + Vector3 dir = new Vector3(dirOnPlane.x, dirOnPlane.y, Random.Range(0f, 1f)).normalized; + return dir.normalized; + } + + + public override void OnTrigger(GameObject owner) + { + CrewScript crew = owner.GetComponent(); + + // grenade + TestPeaceMakerGrenade grenade = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(prefabPath)); + Vector3 position = owner.GetComponent().position + new Vector3(0, 0, 1.8f); + grenade.Set(position, GetRandomLaunchGrenadeDirection(crew), Random.Range(8f, 10f)); + grenade.gameObject.SetActive(true); + + // vfx + GameObject eff = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(vfxPath), crew.transform); + eff.transform.position = crew.launchPoint.position; + eff.SetActive(true); + + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta new file mode 100644 index 0000000..024da76 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dba5a0f9f2cde934e9a3c047eadfbf00 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs new file mode 100644 index 0000000..5517edd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs @@ -0,0 +1,57 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 枪 +/// +public class Weapon_Gun : WeaponBase +{ + + public override string name => "枪"; + + public override string iconPath => "art/ui/weaponicon/gun"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 0.1f; + + private string prefabPath = "prefabs/bullet/bullet"; + + private int index = 0; + + TestPeaceMakerBullet CreateBullet(CrewScript crew, Vector2 dir, float speed, float lifeTime) + { + TestPeaceMakerBullet bullet = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load< TestPeaceMakerBullet>(prefabPath)); + + bullet.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * -0.3f; + + bullet.Set(dir, speed, lifeTime); + bullet.gameObject.SetActive(true); + + return bullet; + } + + public override void OnTrigger(GameObject owner) + { + CrewScript crew = owner.GetComponent(); + + index++; + index = index % 3; + + if(index == 0) + { + CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, -10 * Mathf.Deg2Rad), 12f, 2f); + } + else if(index == 1) + { + CreateBullet(crew, crew.aimDirection, 12f, 2f); + } + else if(index == 2) + { + CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, 10 * Mathf.Deg2Rad), 12f, 2f); + } + + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta new file mode 100644 index 0000000..5aeaa24 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a5f1ba1ce3c9824f9dd23e7a47458e8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs new file mode 100644 index 0000000..3253f33 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// ³¬·²ÊÖÌ×£¬¼¯ÆëÎå¿Å±¦Ê¯ÊÎÆ·½âËø³¬Îä +/// +public class Weapon_MightyGlove : WeaponBase +{ + + public override string name => "³¬·²ÊÖÌ×"; + + public override string iconPath => "art/ui/weaponicon/glove"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 100f; + + public override void OnTrigger(GameObject owner) + { + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta new file mode 100644 index 0000000..b0c414f --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9fff60e7cb47d545bef9de999f5a0f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs new file mode 100644 index 0000000..1a6e448 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// ÌØ˹À­ÏßȦ +/// +public class Weapon_TeslaCoil : WeaponBase +{ + + public override string name => "ÌØ˹À­ÏßȦ"; + + public override string iconPath => "art/ui/weaponicon/tesla_coil"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 20f; + + public override void OnTrigger(GameObject owner) + { + } + +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta new file mode 100644 index 0000000..5a30a14 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 482fe3c5e222fbe4b82527cd796989db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0