diff options
Diffstat (limited to 'SurvivalTest')
28 files changed, 1067 insertions, 101 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/sprites/characters/executor.png b/SurvivalTest/Assets/Resources/Art/sprites/characters/executor.png Binary files differnew file mode 100644 index 0000000..ffd698a --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/sprites/characters/executor.png diff --git a/SurvivalTest/Assets/Resources/Art/sprites/characters/executor.png.meta b/SurvivalTest/Assets/Resources/Art/sprites/characters/executor.png.meta new file mode 100644 index 0000000..e55be4d --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/sprites/characters/executor.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 73343eee2ade5624781e473b0f672573 +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: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 9 + spritePivot: {x: 0.50220954, y: 0.096072525} + spritePixelsToUnits: 32 + 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 + - 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: [] + 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/item/executor.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor.meta new file mode 100644 index 0000000..d846ff0 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0a8e58ca977ee94f9d591f3084263eb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_head.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_head.png.meta new file mode 100644 index 0000000..8f11c53 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_head.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: ae3a97550aa417946b506f93fb211ea9 +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/item/executor/executor_left_arm.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_left_arm.png.meta new file mode 100644 index 0000000..3f7342b --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_left_arm.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 51ae31e6228d565428965ba6728e3647 +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/item/executor/executor_left_leg.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_left_leg.png.meta new file mode 100644 index 0000000..e16e13a --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_left_leg.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 6161f10a014c0ee4cb36d6aa06416cff +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/item/executor/executor_right_arm.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_right_arm.png.meta new file mode 100644 index 0000000..9392811 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_right_arm.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 0b6ee16332098f241b7182611bb27a49 +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/item/executor/executor_right_leg.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_right_leg.png.meta new file mode 100644 index 0000000..da05ad0 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_right_leg.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b5dac2e73c8afee47b4683ff3cd05bfe +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/item/executor/executor_torso.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_torso.png.meta new file mode 100644 index 0000000..ed52064 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/item/executor/executor_torso.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: f000a6780fee9394da402d3f2223be36 +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/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab index 16ee443..1e417c6 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab @@ -1160,7 +1160,7 @@ GameObject: m_Component: - component: {fileID: 1150918167762467698} - component: {fileID: 4124801948345348695} - - component: {fileID: 954652062835819608} + - component: {fileID: 7229922926167417196} m_Layer: 5 m_Name: Grid m_TagString: Untagged @@ -1184,8 +1184,8 @@ RectTransform: 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_AnchoredPosition: {x: 3.7599945, y: 0} + m_SizeDelta: {x: 7.52, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4124801948345348695 MonoBehaviour: @@ -1199,7 +1199,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4dbae61f498dde342a95489aca8ff68c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &954652062835819608 +--- !u!114 &7229922926167417196 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1208,7 +1208,7 @@ MonoBehaviour: m_GameObject: {fileID: 1150918167762467697} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -1217,14 +1217,12 @@ MonoBehaviour: 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 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 40, y: 40} + m_Spacing: {x: 0, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &1432888387678203442 GameObject: m_ObjectHideFlags: 0 diff --git a/SurvivalTest/Assets/Scenes/AnimationEditScene.unity b/SurvivalTest/Assets/Scenes/AnimationEditScene.unity new file mode 100644 index 0000000..655940a --- /dev/null +++ b/SurvivalTest/Assets/Scenes/AnimationEditScene.unity @@ -0,0 +1,208 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &67661383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 67661386} + - component: {fileID: 67661385} + - component: {fileID: 67661384} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &67661384 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67661383} + m_Enabled: 1 +--- !u!20 &67661385 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67661383} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &67661386 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 67661383} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.7768755, y: 3.702357, z: 28.990599} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/SurvivalTest/Assets/Scenes/AnimationEditScene.unity.meta b/SurvivalTest/Assets/Scenes/AnimationEditScene.unity.meta new file mode 100644 index 0000000..8d5d92d --- /dev/null +++ b/SurvivalTest/Assets/Scenes/AnimationEditScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d4f918fc467cc364091e35723415218c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scenes/UIEditScene.unity b/SurvivalTest/Assets/Scenes/UIEditScene.unity index 7078943..f7a06ce 100644 --- a/SurvivalTest/Assets/Scenes/UIEditScene.unity +++ b/SurvivalTest/Assets/Scenes/UIEditScene.unity @@ -604,74 +604,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 302779389} m_Modifications: - - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.y - value: 15.299988 - objectReference: {fileID: 0} - - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8494652252006705340, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs index 08cd3a1..dec9d67 100644 --- a/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs +++ b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs @@ -18,4 +18,10 @@ public static class EditorTools UnityEditor.SceneManagement.EditorSceneManager.OpenScene("Assets/Scenes/UIEditScene.unity"); } + [MenuItem("Tools/场景/动画编辑场景 _F7")] + public static void OpenAnimationEditScene() + { + UnityEditor.SceneManagement.EditorSceneManager.OpenScene("Assets/Scenes/AnimationEditScene.unity"); + } + } diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs index 45450c1..d533ee5 100644 --- a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorHead.cs @@ -7,8 +7,8 @@ using UnityEngine; /// </summary> public class Item_ExecutorHead : Item_ExecutorPart { - public override string name => "执行者的头颅"; + public override string name => "执行者头颅"; - public override string iconPath => "art/ui/item/executor_head"; + public override string iconPath => "art/ui/item/executor/executor_head"; } diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs new file mode 100644 index 0000000..ffdbc1e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 宸﹁噦 +/// </summary> +public class Item_ExecutorLeftArm : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭乏鑷"; + + public override string iconPath => "art/ui/item/executor/executor_left_arm"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs.meta new file mode 100644 index 0000000..b946d08 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftArm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eca0d264d28abbc44bb5f7f83e1d8080 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs new file mode 100644 index 0000000..388db21 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 宸﹁吙 +/// </summary> +public class Item_ExecutorLeftLeg : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭乏鑵"; + + public override string iconPath => "art/ui/item/executor/executor_left_leg"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs.meta new file mode 100644 index 0000000..afdfaa2 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorLeftLeg.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 35f1315e849e0b043a058c7aa4d35498 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs new file mode 100644 index 0000000..dc35b5e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 鍙宠噦 +/// </summary> +public class Item_ExecutorRightArm : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭彸鑷"; + + public override string iconPath => "art/ui/item/executor/executor_right_arm"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs.meta new file mode 100644 index 0000000..7ba6fab --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightArm.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 28b80635484b8494ca6c1b9f39ddc72f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs new file mode 100644 index 0000000..50b0cc0 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 鍙宠吙 +/// </summary> +public class Item_ExecutorRightLeg : Item_ExecutorPart +{ + public override string name => "琛屽垜鑰呭彸鑵"; + + public override string iconPath => "art/ui/item/executor/executor_right_leg"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs.meta new file mode 100644 index 0000000..8d416cd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorRightLeg.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 99038c63e8dcb93478f5d06ae2cc20c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs new file mode 100644 index 0000000..8020e27 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 执行者的头 +/// </summary> +public class Item_ExecutorTorso : Item_ExecutorPart +{ + public override string name => "执行者躯干"; + + public override string iconPath => "art/ui/item/executor/executor_torso"; + +} diff --git a/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs.meta b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs.meta new file mode 100644 index 0000000..480e9b5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/ExecutorParts/Item_ExecutorTorso.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4b521e36f89b72044a82da40f5772db6 +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 581cfdd..f7359c5 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -19,10 +19,15 @@ public partial class PlayerManager : Singleton<PlayerManager> m_Items.Add(new Item_SwordSpectrum()); m_Items.Add(new Item_Wrench()); m_Items.Add(new Item_ExecutorHead()); + m_Items.Add(new Item_ExecutorTorso()); + m_Items.Add(new Item_ExecutorLeftArm()); + m_Items.Add(new Item_ExecutorRightArm()); + m_Items.Add(new Item_ExecutorLeftLeg()); + m_Items.Add(new Item_ExecutorRightLeg()); } void UpdateItems() { - } + }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs index c8a1f26..9727c6c 100644 --- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs +++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs @@ -219,21 +219,14 @@ public class TestPeaceMaker : CrewScript if (bJoytick) { m_ControlMode = ControlMode.Joystick; + dir = new Vector2(xAxis, -yAxis).normalized; } if (bMouse) { m_ControlMode = ControlMode.Mouse; - } - - if (m_ControlMode == ControlMode.Mouse) - { Vector2 camPos = GetCameraPosition(); dir = (camPos - centrePos).normalized; } - else - { - dir = new Vector2(xAxis, -yAxis).normalized; - } } if (dir.magnitude > 0) diff --git a/SurvivalTest/UserSettings/EditorUserSettings.asset b/SurvivalTest/UserSettings/EditorUserSettings.asset index 6ecccc2..270f3dc 100644 --- a/SurvivalTest/UserSettings/EditorUserSettings.asset +++ b/SurvivalTest/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 224247031146466f081d186d23205a1e1304577b13182f2828253c21f6ae2136ebf32f + value: 224247031146466f081d186d23205a1e13045778130e343528692d3afae53878c7e130ece42e2c7c0903ec374a2b0f36e613 flags: 0 RecentlyUsedScenePath-1: - value: 224247031146466f081d186d23205a1e13045778130e343528692d3afae53878c7e130ece42e2c7c0903ec374a2b0f36e613 + value: 224247031146466f081d186d23205a1e13045779130e273b2801183ae5e82076f7e93ffdfe flags: 0 RecentlyUsedScenePath-2: - value: 224247031146466f081d186d23205a1e13045779130e273b2801183ae5e82076f7e93ffdfe + value: 224247031146466f081d186d23205a1e1304577f13182f2828253e32ecf6352bacf238e0f323 flags: 0 RecentlyUsedScenePath-3: - value: 224247031146466f081d186d23205a1e1304577f13182f2828253e32ecf6352bacf238e0f323 + value: 224247031146466f081d186d23205a1e1304577c13182f2828253e32ecf6352ba2b678fce9332b25 flags: 0 RecentlyUsedScenePath-4: - value: 224247031146466f081d186d23205a1e1304577c13182f2828253e32ecf6352ba2b678fce9332b25 + value: 22424703114646680e0b0227036c6a3925141d242966333e243d04 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6a3925141d242966333e243d04 + value: 2242470311464669081d033702205a0359041b2f222d357f7b162d3afae5381be3e920e8f47a6e722c0ce6281d flags: 0 RecentlyUsedScenePath-6: - value: 2242470311464669081d033702205a0359041b2f222d357f7b162d3afae5381be3e920e8f47a6e722c0ce6281d + value: 2242470311464669081d033702205a0359041b2f222d357f7b163936efef7a2decee22f0 flags: 0 RecentlyUsedScenePath-7: - value: 2242470311464669081d033702205a0359041b2f222d357f7b163936efef7a2decee22f0 + value: 22424703114646680e0b0227036c6a393313113e1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6a393313113e1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c7e1e1f1a193e2527281529200900e1e53a3dacf238e0f323 flags: 0 RecentlyUsedScenePath-9: value: 2242470311464669081d033702205a0359041b2f222d357f092c103cacf53a31f6fe |
