From 0eff98708ab049559d7891f1aa24e365000caae1 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 25 Apr 2022 09:31:16 +0800 Subject: *misc --- .../\351\242\234\350\211\262.png" | Bin 0 -> 99985 bytes .../Assets/Resources/Art/ui/decoration/battery.png | Bin 9739 -> 8483 bytes .../Assets/Resources/Art/ui/decoration/horn.png | Bin 10667 -> 12983 bytes .../Resources/Art/ui/decoration/mestry_mask.png | Bin 12576 -> 11041 bytes .../Resources/Art/ui/decoration/power_ring.png | Bin 11612 -> 11705 bytes .../Resources/Art/ui/decoration/spectrum.png | Bin 16350 -> 16632 bytes .../Resources/Art/ui/itemicon/nuclear_bomb.png | Bin 0 -> 6126 bytes .../Art/ui/itemicon/nuclear_bomb.png.meta | 96 +++++++++++++++++++++ .../Assets/Scripts/Items/Item_NuclearBomb.cs | 14 +++ .../Assets/Scripts/Items/Item_NuclearBomb.cs.meta | 11 +++ .../Assets/Scripts/Managers/PlayerManager_Items.cs | 1 + 11 files changed, 122 insertions(+) create mode 100644 "Art/\346\272\220\346\226\207\344\273\266/\351\242\234\350\211\262.png" create mode 100644 SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png create mode 100644 SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs create mode 100644 SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs.meta diff --git "a/Art/\346\272\220\346\226\207\344\273\266/\351\242\234\350\211\262.png" "b/Art/\346\272\220\346\226\207\344\273\266/\351\242\234\350\211\262.png" new file mode 100644 index 0000000..2230bad Binary files /dev/null and "b/Art/\346\272\220\346\226\207\344\273\266/\351\242\234\350\211\262.png" differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png index a587a11..6e7e32f 100644 Binary files a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png and b/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png index 8a55166..3142021 100644 Binary files a/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png and b/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png index 8c98216..9c7318d 100644 Binary files a/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png and b/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png index ae46acd..1c17710 100644 Binary files a/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png and b/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png index 1c9c7ef..7013128 100644 Binary files a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png and b/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png b/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png new file mode 100644 index 0000000..68fa345 Binary files /dev/null and b/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png differ diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta b/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta new file mode 100644 index 0000000..53f3b74 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: aa34c3ffadcd2914e9df0c5828090a50 +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/Scripts/Items/Item_NuclearBomb.cs b/SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs new file mode 100644 index 0000000..eb483e2 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_NuclearBomb : ItemBase +{ + public override string name => "ΊΛ΅―ΓάΒλΟδ"; + + public override string iconPath => "art/ui/itemicon/nuclear_bomb"; + + public override void OnUse(GameObject owner) + { + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs.meta new file mode 100644 index 0000000..3428826 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_NuclearBomb.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 529a65114183a5c479ca08229cb6e458 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs index df924ca..a22947a 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -12,6 +12,7 @@ public partial class PlayerManager : Singleton { m_Items.Add(new Item_B2Phone()); m_Items.Add(new Item_SpaceBeamer()); + m_Items.Add(new Item_NuclearBomb()); } public void UseItem(ItemBase item) -- cgit v1.1-26-g67d0