diff options
Diffstat (limited to 'SurvivalTest/Assets/Resources')
13 files changed, 300 insertions, 156 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png Binary files differnew file mode 100644 index 0000000..c8571b8 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/launch.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta index 34dae4c..4e936cf 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/launch.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/boomerang.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90058b557b320284b803b4c0b87ff61f +guid: d00941a62ff01f444898277f40eb499c TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -46,7 +46,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 + spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -75,18 +75,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png Binary files differnew file mode 100644 index 0000000..e33bf32 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/glove.png.meta new file mode 100644 index 0000000..3a2f65c --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/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/equipicon/mystery_mask.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png Binary files differnew file mode 100644 index 0000000..6008995 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/mystery_mask.png.meta new file mode 100644 index 0000000..e719db3 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/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/equipicon/tesla_coil.png b/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png Binary files differnew file mode 100644 index 0000000..c2acabb --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta b/SurvivalTest/Assets/Resources/Art/ui/equipicon/tesla_coil.png.meta new file mode 100644 index 0000000..d55aa57 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/equipicon/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/Art/ui/weaponicon.meta b/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta deleted file mode 100644 index 0ca3c42..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/weaponicon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d339f1fd84bbf184b8fe7847aaadfc04 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/launch.png b/SurvivalTest/Assets/Resources/Art/ui/weaponicon/launch.png Binary files differdeleted file mode 100644 index c413369..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/weaponicon/launch.png +++ /dev/null diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab index 207830a..a59dfcd 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelEquipBar.prefab @@ -142,7 +142,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 15 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -343,7 +343,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &2033039220 MonoBehaviour: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab index 782f57a..8fa26e4 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab @@ -125,7 +125,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2978880214148668830} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -237,7 +237,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 2 - m_Spacing: 15 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -275,12 +275,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2978880214148668830} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -0.25006104, y: -2.73} - m_SizeDelta: {x: 44.02, y: 44.36} + m_AnchoredPosition: {x: 0.010000229, y: -2.02} + m_SizeDelta: {x: 35.09, y: 35.884} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2036552921 CanvasRenderer: @@ -507,15 +507,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1151704573595367937} - - {fileID: 360475750} - {fileID: 2036552919} + - {fileID: 360475750} m_Father: {fileID: 5461203906984040156} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 1, y: 1} --- !u!114 &1892896074 MonoBehaviour: diff --git a/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity b/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity index 8b4c805..c8d9f0c 100644 --- a/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity +++ b/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity @@ -221,130 +221,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!1 &153653412 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 153653416} - - component: {fileID: 153653415} - - component: {fileID: 153653414} - - component: {fileID: 153653413} - - component: {fileID: 153653417} - m_Layer: 0 - m_Name: launch - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &153653413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 153653412} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a9f0293bd6e86e43bbbefc99b5e2722, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &153653414 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 153653412} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_LocalPosition: {x: 1.8047028, y: 3.9977598, z: 0} ---- !u!212 &153653415 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 153653412} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 90058b557b320284b803b4c0b87ff61f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.65625, y: 0.625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &153653416 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 153653412} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.8047028, y: 3.9977598, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 21 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &153653417 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 153653412} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1ce201566412034c99687a8c5b94075, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Color: {r: 0, g: 0, b: 0, a: 0.22745098} - m_Scale: {x: 1, y: 0.5} --- !u!1 &185848754 GameObject: m_ObjectHideFlags: 0 |
