diff --git a/Assets/Inventory System/2D Assets/PSD/Storage Slot Worksheet.psd.meta b/Assets/Inventory System/2D Assets/PSD/Storage Slot Worksheet.psd.meta index 511781b4..ade0b120 100644 --- a/Assets/Inventory System/2D Assets/PSD/Storage Slot Worksheet.psd.meta +++ b/Assets/Inventory System/2D Assets/PSD/Storage Slot Worksheet.psd.meta @@ -63,7 +63,7 @@ TextureImporter: 213: 3958611719109721434 second: Storage Slot Worksheet_19 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -80,9 +80,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -92,11 +95,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -114,10 +117,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -129,6 +137,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -141,6 +150,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -576,9 +599,29 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Storage Slot Worksheet_0: 4688662200685470796 + Storage Slot Worksheet_1: 7336309917601819170 + Storage Slot Worksheet_10: -8267922819859380871 + Storage Slot Worksheet_11: -9195788171339703850 + Storage Slot Worksheet_12: 6027968011691412022 + Storage Slot Worksheet_13: -2391932128779353075 + Storage Slot Worksheet_14: -1318163098911902403 + Storage Slot Worksheet_15: 1311336834765581509 + Storage Slot Worksheet_16: 2814847439896877141 + Storage Slot Worksheet_17: -8688580402548533459 + Storage Slot Worksheet_18: 2565495694635435868 + Storage Slot Worksheet_19: 3958611719109721434 + Storage Slot Worksheet_2: -4511287823274278066 + Storage Slot Worksheet_3: -6023322112142336961 + Storage Slot Worksheet_4: 3934105401477898586 + Storage Slot Worksheet_5: -6737608302225131456 + Storage Slot Worksheet_6: 5815926888198177976 + Storage Slot Worksheet_7: 2416956932728349698 + Storage Slot Worksheet_8: 982772137216820167 + Storage Slot Worksheet_9: -6689788841972819828 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 1 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Consumables.meta b/Assets/Inventory System/Prefabs/Item UI/Consumables.meta new file mode 100644 index 00000000..15352ab8 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Consumables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18906e0d14b4849448eb63ddd09e4f5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta new file mode 100644 index 00000000..57122dcc --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Foregrips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a642bf0a33311a4c80ac8379cae7684 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta new file mode 100644 index 00000000..27037639 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Magazines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d0cda18af15aae468f87fe0f86fc466 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta new file mode 100644 index 00000000..657d26cc --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Muzzle Devices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2943919ce44692d4c95c6d63c910e349 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta new file mode 100644 index 00000000..5afc5d92 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Gun Attachments/Optics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02b4de7a2e9e6494f855610cfdc896a6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta b/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta new file mode 100644 index 00000000..7f808b94 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Headset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57975bed53103674291bed4602b12f03 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta new file mode 100644 index 00000000..002278f8 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Foregrips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaa582e1c7ae46b46869cf09bfe48dc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta new file mode 100644 index 00000000..2d03a8f8 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Magazines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4736df418d82ce346baffcb35f1807f6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta new file mode 100644 index 00000000..65e5415e --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Muzzle Devices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55d7e84284c5299489973477b29d9ea1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta new file mode 100644 index 00000000..26f5227a --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Gun Attachments/Optics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40f32ad70335b6043b2197f3ed7bb64e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta new file mode 100644 index 00000000..8bc01d96 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Handguards.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8504e037e12f7f447b28bd369185f166 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta new file mode 100644 index 00000000..16729a39 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Pistol Grips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c79a6cbe08269e647ac6ef99ee85173a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta new file mode 100644 index 00000000..21eedbcf --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AK Platform/Stocks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b40bc90553027a4428365fe9e0df128d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta new file mode 100644 index 00000000..6c552549 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Barrels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 147e163ede9beb34fb999c4a636f1b94 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta new file mode 100644 index 00000000..f606656e --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Handguards.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a4f411128826bae4c8b1c847000dfe8c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta new file mode 100644 index 00000000..4ca51258 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Pistol Grips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d3ae93cb811ae449876214caa44b476 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta new file mode 100644 index 00000000..9f78c7aa --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/AR Platform/Stocks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32feeb0af8e5895449b8f58944051699 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta b/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta new file mode 100644 index 00000000..9ac18ac5 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Guns/G22.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1027cbd82e54d944b0c0bd9bacb6294 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Other.meta b/Assets/Inventory System/Prefabs/Item UI/Other.meta new file mode 100644 index 00000000..bfe239c5 --- /dev/null +++ b/Assets/Inventory System/Prefabs/Item UI/Other.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8170ea60c9a2c714d870372fb89c306f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/$Prefabs/Consumables.meta b/Assets/Items/$Prefabs/Consumables.meta new file mode 100644 index 00000000..b916c0a3 --- /dev/null +++ b/Assets/Items/$Prefabs/Consumables.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26f808e8ee3809c43867c1c1eb226124 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/$Prefabs/Gear/Headset.meta b/Assets/Items/$Prefabs/Gear/Headset.meta new file mode 100644 index 00000000..c0fe9783 --- /dev/null +++ b/Assets/Items/$Prefabs/Gear/Headset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 932332605b143de408257962fa7ff175 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Items/$Prefabs/Other.meta b/Assets/Items/$Prefabs/Other.meta new file mode 100644 index 00000000..addf3cdd --- /dev/null +++ b/Assets/Items/$Prefabs/Other.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34df9cfc25be6f547a48b9abf4422566 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta b/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta new file mode 100644 index 00000000..4f03d758 --- /dev/null +++ b/Assets/Map/Blender/MapsModelsImporter/map-0d1klcr.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b4313c97c87b0da42b32b9465a89e002 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta b/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta new file mode 100644 index 00000000..7a683e10 --- /dev/null +++ b/Assets/Map/Blender/MapsModelsImporter/map-fggisoa.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b0c4bb5983488a438c06d5e35e09d2b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta b/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta new file mode 100644 index 00000000..f43ed4aa --- /dev/null +++ b/Assets/Map/Blender/MapsModelsImporter/map2-hws3u1q.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0b4fd9f8be79d34ba1fb5abecbb4aca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta b/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta new file mode 100644 index 00000000..4303815c --- /dev/null +++ b/Assets/NeoFPS/Extensions/NeoFpsExtension_Cinemachine_v1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7032d000d3add4948ae9729fff4b493a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta b/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta new file mode 100644 index 00000000..34279aa4 --- /dev/null +++ b/Assets/NeoFPS/Extensions/NeoFpsExtension_InputSystem_v1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9bd692981c3b41e4e9c65dd7cdb03cb8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_Box.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_Box.png.meta index 180e3304..bc4fd93b 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_Box.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_Box.png.meta @@ -1,10 +1,12 @@ fileFormatVersion: 2 guid: e24459b8cb56b054397d141f5fb65751 TextureImporter: - fileIDToRecycleName: - 21300000: HUD_Box_0 + internalIDToNameTable: + - first: + 213: 21300000 + second: HUD_Box_0 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -21,9 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -32,12 +37,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -55,11 +60,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,8 +80,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,8 +93,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -91,7 +106,22 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -111,6 +141,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: + internalID: 21300000 vertices: [] indices: edges: [] @@ -119,13 +150,16 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 200e53063989ab74fb49f872a15d6435 + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + HUD_Box_0: 21300000 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_DamageVignette.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_DamageVignette.png.meta index 68b4ea25..335b551e 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_DamageVignette.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_DamageVignette.png.meta @@ -18,7 +18,7 @@ TextureImporter: 213: 21300008 second: HUD_DamageVignette_Backward externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -35,9 +35,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -46,12 +49,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -69,10 +72,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -84,6 +92,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -96,6 +105,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -108,6 +118,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -228,9 +252,14 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + HUD_DamageVignette_Backward: 21300008 + HUD_DamageVignette_Forward: 21300004 + HUD_DamageVignette_Full: 21300000 + HUD_DamageVignette_Left: 21300002 + HUD_DamageVignette_Right: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_ToolIcons.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_ToolIcons.png.meta index 265177b6..2b9f6b5d 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_ToolIcons.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_ToolIcons.png.meta @@ -12,7 +12,7 @@ TextureImporter: 213: 21300004 second: HUD_ToolIcons_Blink externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -40,12 +43,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,10 +66,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -78,6 +86,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -156,9 +191,12 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + HUD_ToolIcons_Blink: 21300004 + HUD_ToolIcons_Flashlight: 21300000 + HUD_ToolIcons_Grapple: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_WeaponIcons.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_WeaponIcons.png.meta index 9d5cd0ca..2bb83a47 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/HUD_WeaponIcons.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/HUD_WeaponIcons.png.meta @@ -27,7 +27,7 @@ TextureImporter: 213: 21300014 second: HUD_WeaponIcons_HandGrenade externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -44,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -57,10 +60,10 @@ TextureImporter: serializedVersion: 2 filterMode: 1 aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -78,10 +81,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -93,6 +101,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -105,6 +114,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -117,6 +127,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -300,9 +324,17 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + HUD_WeaponIcons_AssaultRifle: 21300008 + HUD_WeaponIcons_GrenadeLauncher: 21300012 + HUD_WeaponIcons_HandGrenade: 21300014 + HUD_WeaponIcons_Melee: 21300000 + HUD_WeaponIcons_Pistol: 21300002 + HUD_WeaponIcons_Revolver: 21300004 + HUD_WeaponIcons_Shotgun: 21300006 + HUD_WeaponIcons_SniperRifle: 21300010 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/NeoFpsUIIcons.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/NeoFpsUIIcons.png.meta index 60bf8c77..5b1ee602 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/NeoFpsUIIcons.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/NeoFpsUIIcons.png.meta @@ -15,7 +15,7 @@ TextureImporter: 213: 21300006 second: NeoFpsUIIcons_Right externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -32,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -43,12 +46,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 16 - mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -66,10 +69,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -81,6 +89,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -93,6 +102,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -105,6 +115,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -204,9 +228,13 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + NeoFpsUIIcons_Left: 21300004 + NeoFpsUIIcons_Minus: 21300000 + NeoFpsUIIcons_Plus: 21300002 + NeoFpsUIIcons_Right: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair.png.meta index 17b6e440..582cf586 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair.png.meta @@ -18,7 +18,7 @@ TextureImporter: 213: 21300008 second: Sprite_Crosshair_S externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -35,9 +35,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,7 +51,7 @@ TextureImporter: serializedVersion: 2 filterMode: 0 aniso: 16 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -69,10 +72,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -84,6 +92,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -96,6 +105,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -108,6 +118,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -228,9 +252,14 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Sprite_Crosshair_Center: 21300000 + Sprite_Crosshair_E: 21300006 + Sprite_Crosshair_N: 21300004 + Sprite_Crosshair_S: 21300008 + Sprite_Crosshair_W: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair_Large.png.meta b/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair_Large.png.meta index 26b8d9f0..635a847b 100644 --- a/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair_Large.png.meta +++ b/Assets/NeoFPS/Samples/Shared/Sprites/Sprite_Crosshair_Large.png.meta @@ -18,7 +18,7 @@ TextureImporter: 213: 21300008 second: Sprite_Crosshair_Large_Center externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -35,9 +35,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -46,12 +49,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -69,10 +72,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -84,6 +92,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -96,6 +105,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -108,6 +118,20 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -228,9 +252,14 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + Sprite_Crosshair_Large_Center: 21300008 + Sprite_Crosshair_Large_E: 21300002 + Sprite_Crosshair_Large_N: 21300000 + Sprite_Crosshair_Large_S: 21300004 + Sprite_Crosshair_Large_W: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/NeoFPS Character Controllers/Test NeoFpsSoloPlayerCharacter.prefab b/Assets/Prefabs/NeoFPS Character Controllers/Test NeoFpsSoloPlayerCharacter.prefab index fcdf9430..f62f4472 100644 --- a/Assets/Prefabs/NeoFPS Character Controllers/Test NeoFpsSoloPlayerCharacter.prefab +++ b/Assets/Prefabs/NeoFPS Character Controllers/Test NeoFpsSoloPlayerCharacter.prefab @@ -24,12 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1133175101} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000014130248298} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!20 &1133175104 Camera: @@ -45,9 +46,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -98,12 +107,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604667016} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2017772458228884918} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1604667018 MonoBehaviour: @@ -163,16 +173,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010381446024} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1133175102} - {fileID: 4000010669391302} - {fileID: 4679028612336088} - {fileID: 2017772459047828448} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &136476800189575594 CapsuleCollider: @@ -182,8 +193,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010381446024} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.5 m_Height: 2 m_Direction: 1 @@ -195,10 +215,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010381446024} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 80 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -326,7 +357,7 @@ MonoBehaviour: outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 0 + m_RotationOrder: 4 --- !u!114 &114012715847808828 MonoBehaviour: m_ObjectHideFlags: 0 @@ -427,7 +458,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010381446024} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6f17c45f21e7bc47b6761b49f6c333e, type: 3} m_Name: @@ -638,15 +669,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000011745390456} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4724244053790452} - {fileID: 4105038135487464} - {fileID: 4935261428968312} m_Father: {fileID: 4000014130248298} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114465142474638646 MonoBehaviour: @@ -726,13 +758,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012095391488} + serializedVersion: 2 m_LocalRotation: {x: 0.000000029802326, y: -0, z: -2.6645353e-14, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4000010195993730} m_Father: {fileID: 4198637582876028} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114705403420448292 MonoBehaviour: @@ -976,12 +1009,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013759886196} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000013376435590} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &20978101300941664 Camera: @@ -997,9 +1031,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1287,13 +1329,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000014026923868} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: -0, z: 1.7355464e-29, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4838170793447760} m_Father: {fileID: 4198637582876028} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114660341047048418 MonoBehaviour: @@ -1349,12 +1392,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1065108785962622} + serializedVersion: 2 m_LocalRotation: {x: -0.21986613, y: -0.6107123, z: -0.07341261, w: 0.75716573} m_LocalPosition: {x: 0, y: -0.24999999, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000010309613496} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -25, y: -80, z: 10} --- !u!1 &1187235902794858 GameObject: @@ -1382,15 +1426,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1187235902794858} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4018481069194878} - {fileID: 4125630707496040} - {fileID: 4733997722158288} m_Father: {fileID: 4000014130248298} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &82497810387605986 AudioSource: @@ -1625,12 +1670,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1236214075426820} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.8, z: 0} m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4679028612336088} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &135879840610947528 SphereCollider: @@ -1640,9 +1686,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1236214075426820} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.1 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1261963891865452 @@ -1669,13 +1723,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1261963891865452} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4198637582876028} m_Father: {fileID: 4000010669391302} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &584190260139407573 MonoBehaviour: @@ -1736,12 +1791,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288384513055100} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4198637582876028} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &135619751506549384 SphereCollider: @@ -1751,9 +1807,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288384513055100} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.2 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114743622975509260 @@ -1825,12 +1889,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291339746101142} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4198637582876028} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &135438268700647164 SphereCollider: @@ -1840,9 +1905,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1291339746101142} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.1 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1410278385737660 @@ -1869,12 +1942,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1410278385737660} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4679028612336088} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &135111952513836916 SphereCollider: @@ -1884,9 +1958,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1410278385737660} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.1 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1448049338675306 @@ -1915,12 +1997,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1448049338675306} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000010669391302} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &82323408440616296 AudioSource: @@ -2158,12 +2241,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695833676836804} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.65, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000010669391302} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &136675314043399218 CapsuleCollider: @@ -2173,8 +2257,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695833676836804} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.35 m_Height: 1 m_Direction: 1 @@ -2249,16 +2342,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1853179909635880} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4000013376435590} - {fileID: 4051697183857384} - {fileID: 4357585763226442} - {fileID: 4000010309613496} m_Father: {fileID: 4935261428968312} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114640871988961492 MonoBehaviour: @@ -2391,12 +2485,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1904018612120136} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4679028612336088} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &136268592603162008 CapsuleCollider: @@ -2406,8 +2501,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1904018612120136} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.25 m_Height: 1 m_Direction: 1 @@ -2454,25 +2558,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_ForceMultiplier: 5 m_MaxForce: 2000 ---- !u!95 &5481687305250822515 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2017772457620673855} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: ef223b135db6872498fe7fa549b32162, type: 3} - m_Controller: {fileID: 9100000, guid: 9ef58bba57336f744b10062f1991ebe0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8752517690227938056 GameObject: m_ObjectHideFlags: 0 @@ -2497,12 +2582,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8752517690227938056} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2017772459047828448} - m_RootOrder: 79 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3901908635471718057 MonoBehaviour: @@ -2527,6 +2613,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4000014130248298} m_Modifications: - target: {fileID: 6138482525648234678, guid: 6ba61a3420417b5498f70a8a82e94b4c, @@ -2614,6 +2701,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482525844940304, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482525847753050, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2639,6 +2731,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482525858215921, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482525863572357, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2649,6 +2746,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482525888061250, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482525893023320, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2669,11 +2771,21 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482525937842385, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482525960428388, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482525960428388, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482525983590352, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2684,6 +2796,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526001006707, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526014172184, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2739,6 +2856,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526120419662, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526122758224, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2759,6 +2881,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526134986132, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6138482526134989525, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2809,6 +2936,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526233635910, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6138482526250011644, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2846,13 +2978,13 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6138482526272820469, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} - propertyPath: m_IsActive - value: 1 + propertyPath: m_Layer + value: 27 objectReference: {fileID: 0} - target: {fileID: 6138482526272820469, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} - propertyPath: m_Layer - value: 27 + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - target: {fileID: 6138482526276413131, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} @@ -2879,6 +3011,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526336871988, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6138482526349556910, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2914,6 +3051,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526380085084, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526401891335, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2964,6 +3106,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526476915577, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526509061069, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -2974,6 +3121,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526515195802, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526519562177, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3059,15 +3211,30 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526786536230, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526805144447, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526805144447, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6138482526828395359, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_Layer + value: 27 + objectReference: {fileID: 0} - target: {fileID: 6138482526828395359, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} - propertyPath: m_Layer - value: 27 + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 6138482526830922225, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} @@ -3079,6 +3246,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_LocalPosition.x @@ -3094,6 +3266,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -0.25 objectReference: {fileID: 0} + - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_LocalRotation.x @@ -3109,16 +3286,6 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3149,6 +3316,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482526916838601, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482526943414307, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3189,6 +3361,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527020984057, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527024308006, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3204,6 +3381,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527043799587, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527062664135, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3259,6 +3441,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527167362275, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527174825273, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3299,6 +3486,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527300818325, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527325805116, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3329,6 +3521,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527352870097, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527357252899, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3354,6 +3551,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527417789028, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527418873466, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3374,11 +3576,21 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527450348624, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527458502503, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527458502503, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527464242968, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3439,6 +3651,11 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527660125653, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527665414231, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3464,11 +3681,21 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527753119303, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527756303197, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527756303197, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6138482527766600466, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} propertyPath: m_Layer @@ -3479,24 +3706,65 @@ PrefabInstance: propertyPath: m_Layer value: 27 objectReference: {fileID: 0} + - target: {fileID: 6138482527771661111, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 6138482526272820468, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3687394082740333181} + - targetCorrespondingSourceObject: {fileID: 6138482526067336316, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1604667017} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6138482526272820469, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5481687305250822515} m_SourcePrefab: {fileID: 100100000, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} ---- !u!4 &2017772459047828448 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, - type: 3} - m_PrefabInstance: {fileID: 5273948301595705802} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2017772458228884918 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6138482526067336316, guid: 6ba61a3420417b5498f70a8a82e94b4c, - type: 3} - m_PrefabInstance: {fileID: 5273948301595705802} - m_PrefabAsset: {fileID: 0} --- !u!1 &2017772457620673855 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6138482526272820469, guid: 6ba61a3420417b5498f70a8a82e94b4c, type: 3} m_PrefabInstance: {fileID: 5273948301595705802} m_PrefabAsset: {fileID: 0} +--- !u!95 &5481687305250822515 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2017772457620673855} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: ef223b135db6872498fe7fa549b32162, type: 3} + m_Controller: {fileID: 9100000, guid: 9ef58bba57336f744b10062f1991ebe0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!4 &2017772458228884918 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6138482526067336316, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + m_PrefabInstance: {fileID: 5273948301595705802} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2017772459047828448 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6138482526894668330, guid: 6ba61a3420417b5498f70a8a82e94b4c, + type: 3} + m_PrefabInstance: {fileID: 5273948301595705802} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Save.meta b/Assets/Save.meta new file mode 100644 index 00000000..dc41f949 --- /dev/null +++ b/Assets/Save.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d61d18c239646e24ea7563da992aedaf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test Scene Tony.unity b/Assets/Scenes/Test Scene Tony.unity index f19eef35..5b38e573 100644 --- a/Assets/Scenes/Test Scene Tony.unity +++ b/Assets/Scenes/Test Scene Tony.unity @@ -56707,6 +56707,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56917,6 +56922,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -56937,6 +56947,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605678039105, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326605768550993, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -57040,12 +57075,12 @@ PrefabInstance: - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2770326605807543573, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2770326605844417883, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -57067,6 +57102,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326605906428287, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606002374600, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -57112,6 +57172,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606127597624, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -57317,6 +57397,26 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606355317296, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606530529104, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -57342,6 +57442,56 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606580356017, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606610365227, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606660306585, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y @@ -57362,6 +57512,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2770326606716970977, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2770326606719424890, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMin.y diff --git a/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta b/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta new file mode 100644 index 00000000..d864551f --- /dev/null +++ b/Assets/Standard Assets/Asset Store Downloads/Basic Motions/Basic Motions Pack/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c310a300a0358f94f81e0eeb585d6cf4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta index 6ea86104..e7a35d34 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyCrouchSprite.png.meta @@ -66,7 +66,7 @@ TextureImporter: 213: 21300040 second: RobotBoyCrouch20 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -83,9 +83,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -94,9 +97,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -117,10 +120,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -132,6 +140,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -144,6 +153,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -156,6 +166,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -168,6 +179,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -180,6 +192,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -636,9 +675,30 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyCrouch00: 21300000 + RobotBoyCrouch01: 21300002 + RobotBoyCrouch02: 21300004 + RobotBoyCrouch03: 21300006 + RobotBoyCrouch04: 21300008 + RobotBoyCrouch05: 21300010 + RobotBoyCrouch06: 21300012 + RobotBoyCrouch07: 21300014 + RobotBoyCrouch08: 21300016 + RobotBoyCrouch09: 21300018 + RobotBoyCrouch10: 21300020 + RobotBoyCrouch11: 21300022 + RobotBoyCrouch12: 21300024 + RobotBoyCrouch13: 21300026 + RobotBoyCrouch14: 21300028 + RobotBoyCrouch15: 21300030 + RobotBoyCrouch16: 21300032 + RobotBoyCrouch17: 21300034 + RobotBoyCrouch18: 21300036 + RobotBoyCrouch19: 21300038 + RobotBoyCrouch20: 21300040 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta index a61db544..2ce390d3 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyDeathSprite.png.meta @@ -84,7 +84,7 @@ TextureImporter: 213: 21300052 second: RobotBoyDeath26 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -101,9 +101,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -112,9 +115,9 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -135,10 +138,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -150,6 +158,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -162,6 +171,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -174,6 +184,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -186,6 +197,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -198,6 +210,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -780,9 +819,36 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyDeath00: 21300000 + RobotBoyDeath01: 21300002 + RobotBoyDeath02: 21300004 + RobotBoyDeath03: 21300006 + RobotBoyDeath04: 21300008 + RobotBoyDeath05: 21300010 + RobotBoyDeath06: 21300012 + RobotBoyDeath07: 21300014 + RobotBoyDeath08: 21300016 + RobotBoyDeath09: 21300018 + RobotBoyDeath10: 21300020 + RobotBoyDeath11: 21300022 + RobotBoyDeath12: 21300024 + RobotBoyDeath13: 21300026 + RobotBoyDeath14: 21300028 + RobotBoyDeath15: 21300030 + RobotBoyDeath16: 21300032 + RobotBoyDeath17: 21300034 + RobotBoyDeath18: 21300036 + RobotBoyDeath19: 21300038 + RobotBoyDeath20: 21300040 + RobotBoyDeath21: 21300042 + RobotBoyDeath22: 21300044 + RobotBoyDeath23: 21300046 + RobotBoyDeath24: 21300048 + RobotBoyDeath25: 21300050 + RobotBoyDeath26: 21300052 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta index 59084725..83b3e99f 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyIdleSprite.png.meta @@ -93,7 +93,7 @@ TextureImporter: 213: 21300058 second: RobotBoyIdle29 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -110,9 +110,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -121,9 +124,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -144,10 +147,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -159,6 +167,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -171,6 +180,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -183,6 +193,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -195,6 +206,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -207,6 +219,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -852,9 +891,39 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyIdle00: 21300000 + RobotBoyIdle01: 21300002 + RobotBoyIdle02: 21300004 + RobotBoyIdle03: 21300006 + RobotBoyIdle04: 21300008 + RobotBoyIdle05: 21300010 + RobotBoyIdle06: 21300012 + RobotBoyIdle07: 21300014 + RobotBoyIdle08: 21300016 + RobotBoyIdle09: 21300018 + RobotBoyIdle10: 21300020 + RobotBoyIdle11: 21300022 + RobotBoyIdle12: 21300024 + RobotBoyIdle13: 21300026 + RobotBoyIdle14: 21300028 + RobotBoyIdle15: 21300030 + RobotBoyIdle16: 21300032 + RobotBoyIdle17: 21300034 + RobotBoyIdle18: 21300036 + RobotBoyIdle19: 21300038 + RobotBoyIdle20: 21300040 + RobotBoyIdle21: 21300042 + RobotBoyIdle22: 21300044 + RobotBoyIdle23: 21300046 + RobotBoyIdle24: 21300048 + RobotBoyIdle25: 21300050 + RobotBoyIdle26: 21300052 + RobotBoyIdle27: 21300054 + RobotBoyIdle28: 21300056 + RobotBoyIdle29: 21300058 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta index 8a3f3d5d..04d0f984 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyJumpSprite.png.meta @@ -81,7 +81,7 @@ TextureImporter: 213: 21300050 second: RobotBoyJump25 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -98,9 +98,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -109,9 +112,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -132,10 +135,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -147,6 +155,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -159,6 +168,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -171,6 +181,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -183,6 +194,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -195,6 +207,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -756,9 +795,35 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyJump00: 21300000 + RobotBoyJump01: 21300002 + RobotBoyJump02: 21300004 + RobotBoyJump03: 21300006 + RobotBoyJump04: 21300008 + RobotBoyJump05: 21300010 + RobotBoyJump06: 21300012 + RobotBoyJump07: 21300014 + RobotBoyJump08: 21300016 + RobotBoyJump09: 21300018 + RobotBoyJump10: 21300020 + RobotBoyJump11: 21300022 + RobotBoyJump12: 21300024 + RobotBoyJump13: 21300026 + RobotBoyJump14: 21300028 + RobotBoyJump15: 21300030 + RobotBoyJump16: 21300032 + RobotBoyJump17: 21300034 + RobotBoyJump18: 21300036 + RobotBoyJump19: 21300038 + RobotBoyJump20: 21300040 + RobotBoyJump21: 21300042 + RobotBoyJump22: 21300044 + RobotBoyJump23: 21300046 + RobotBoyJump24: 21300048 + RobotBoyJump25: 21300050 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta index f00ed27f..dd8068be 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRollSprite.png.meta @@ -75,7 +75,7 @@ TextureImporter: 213: 21300046 second: RobotBoyRoll23 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -92,9 +92,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -103,9 +106,9 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -126,10 +129,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -141,6 +149,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -153,6 +162,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -165,6 +175,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -177,6 +188,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -189,6 +201,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -708,9 +747,33 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyRoll00: 21300000 + RobotBoyRoll01: 21300002 + RobotBoyRoll02: 21300004 + RobotBoyRoll03: 21300006 + RobotBoyRoll04: 21300008 + RobotBoyRoll05: 21300010 + RobotBoyRoll06: 21300012 + RobotBoyRoll07: 21300014 + RobotBoyRoll08: 21300016 + RobotBoyRoll09: 21300018 + RobotBoyRoll10: 21300020 + RobotBoyRoll11: 21300022 + RobotBoyRoll12: 21300024 + RobotBoyRoll13: 21300026 + RobotBoyRoll14: 21300028 + RobotBoyRoll15: 21300030 + RobotBoyRoll16: 21300032 + RobotBoyRoll17: 21300034 + RobotBoyRoll18: 21300036 + RobotBoyRoll19: 21300038 + RobotBoyRoll20: 21300040 + RobotBoyRoll21: 21300042 + RobotBoyRoll22: 21300044 + RobotBoyRoll23: 21300046 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta index 66774ac2..49d5bde0 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyRunSprite.png.meta @@ -51,7 +51,7 @@ TextureImporter: 213: 21300030 second: RobotBoyRun15 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -68,9 +68,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -79,9 +82,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -102,10 +105,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -117,6 +125,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -129,6 +138,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -141,6 +151,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -153,6 +164,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -165,6 +177,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -516,9 +555,25 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyRun00: 21300000 + RobotBoyRun01: 21300002 + RobotBoyRun02: 21300004 + RobotBoyRun03: 21300006 + RobotBoyRun04: 21300008 + RobotBoyRun05: 21300010 + RobotBoyRun06: 21300012 + RobotBoyRun07: 21300014 + RobotBoyRun08: 21300016 + RobotBoyRun09: 21300018 + RobotBoyRun10: 21300020 + RobotBoyRun11: 21300022 + RobotBoyRun12: 21300024 + RobotBoyRun13: 21300026 + RobotBoyRun14: 21300028 + RobotBoyRun15: 21300030 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta index a59e3a76..d4cac56d 100644 --- a/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/2D/Sprites/RobotBoyWalkSprite.png.meta @@ -51,7 +51,7 @@ TextureImporter: 213: 21300030 second: RobotBoyWalk15 externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -68,9 +68,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -79,9 +82,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -102,10 +105,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -117,6 +125,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -129,6 +138,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -141,6 +151,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -153,6 +164,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 - serializedVersion: 3 @@ -165,6 +177,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -516,9 +555,25 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + RobotBoyWalk00: 21300000 + RobotBoyWalk01: 21300002 + RobotBoyWalk02: 21300004 + RobotBoyWalk03: 21300006 + RobotBoyWalk04: 21300008 + RobotBoyWalk05: 21300010 + RobotBoyWalk06: 21300012 + RobotBoyWalk07: 21300014 + RobotBoyWalk08: 21300016 + RobotBoyWalk09: 21300018 + RobotBoyWalk10: 21300020 + RobotBoyWalk11: 21300022 + RobotBoyWalk12: 21300024 + RobotBoyWalk13: 21300026 + RobotBoyWalk14: 21300028 + RobotBoyWalk15: 21300030 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Standard Assets/Standard Assets/SampleScenes/Menu/Sprites/MenuCornerTopRightSprite.png.meta b/Assets/Standard Assets/Standard Assets/SampleScenes/Menu/Sprites/MenuCornerTopRightSprite.png.meta index 1b36ac78..61862618 100644 --- a/Assets/Standard Assets/Standard Assets/SampleScenes/Menu/Sprites/MenuCornerTopRightSprite.png.meta +++ b/Assets/Standard Assets/Standard Assets/SampleScenes/Menu/Sprites/MenuCornerTopRightSprite.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 21300000 second: MenuCornerTopRightSprite externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,9 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,9 +37,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 16 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -57,10 +60,15 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -72,6 +80,33 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: @@ -108,9 +143,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - spritePackingTag: + nameFileIdTable: + MenuCornerTopRightSprite: 21300000 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 0830af22..cf499853 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,14 +1,16 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "1.2.16", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.2.1", - "com.unity.postprocessing": "3.0.3", - "com.unity.terrain-tools": "3.0.2-preview.3", - "com.unity.test-framework": "1.1.16", - "com.unity.textmeshpro": "2.1.6", - "com.unity.timeline": "1.2.16", + "com.unity.ai.navigation": "1.1.4", + "com.unity.collab-proxy": "2.0.7", + "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.vscode": "1.2.5", + "com.unity.postprocessing": "3.2.2", + "com.unity.terrain-tools": "5.0.1", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.7.5", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2d6f8a40..51ee9836 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,38 +6,56 @@ "source": "builtin", "dependencies": {} }, + "com.unity.ai.navigation": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { - "version": "1.2.16", + "version": "2.0.7", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.0", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "1.1.4", + "version": "3.0.24", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.18", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" }, "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.1", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.0.3", + "version": "3.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -46,25 +64,28 @@ "url": "https://packages.unity.com" }, "com.unity.terrain-tools": { - "version": "3.0.2-preview.3", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, - "com.unity.test-framework": { - "version": "1.1.16", + "version": "5.0.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.33", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.6", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -73,10 +94,15 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.16", + "version": "1.7.5", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ugui": { @@ -221,6 +247,7 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 00000000..5b5facec --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 9418901f..c0fd196d 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -2,17 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 MonoBehaviour: - m_ObjectHideFlags: 61 + m_ObjectHideFlags: 53 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 0} + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: - m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main @@ -20,19 +24,13 @@ MonoBehaviour: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -836 + m_OriginalInstanceId: -838 + m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ae9c8eb0..97852468 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.12f1 -m_EditorVersionWithRevision: 2019.4.12f1 (225e826a680e) +m_EditorVersion: 2022.3.8f1 +m_EditorVersionWithRevision: 2022.3.8f1 (b5eafc012955) diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000..dca28814 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/README.md b/README.md new file mode 100644 index 00000000..5556239f --- /dev/null +++ b/README.md @@ -0,0 +1,150 @@ +# Shores of Solara + +## Content + +- [Shores of Solara](#shores-of-solara) + - [Content](#content) + - [Story](#story) + - [Combat](#combat) + - [Starting out](#starting-out) + - [Inventory](#inventory) + - [Systems](#systems) + - [Inspirations](#inspirations) +*** +### Story + +In the heart of the Pacific Ocean lies a remote island known only as "Solara." It is a place that time forgot, a land untouched by the hands of any ruling government. But within its wild and untamed beauty, a fierce struggle for power, freedom, and salvation unfolds. + +For years, Solara has been a clandestine arena, a battleground where the world's nations send their unwanted prisoners, pawns in a dangerous game of survival. The island is an anarchic experiment, a petri dish of human nature left to simmer and evolve without the constraints of civilization. Beneath the lush canopy and amid the sprawling ruins, factions have risen and fallen, carving their own territories out of the untamed wilderness. + +Three cities, each embodying a distinct ideology, stand as the pillars of order amidst the chaos. + +- **Port Avalon**, a haven for the ruthless and cunning, is home to the "Ravens," a faction of scavengers and thieves who have mastered the art of survival. They are the shadowy puppet masters of the island's black market, fueling their ambitions with the promise of wealth and dominance. + +- In stark contrast, **Havenbrook** is a beacon of hope, led by the "Harmony Alliance." Comprised of former soldiers, healers, and idealists, they hold firm to their belief in a united, peaceful future. Their city is a sanctuary for those seeking refuge from the lawlessness beyond its walls, and they are willing to fight to protect their vision of a better world. + +- Between these two opposing forces stands the "Survivalists," a group of rugged individualists and survivors who prioritize their own survival above all else. They navigate the treacherous waters of Solara, adapting to its ever-changing landscape and forming tenuous alliances when necessary. + +At the very heart of the island, surrounded by towering peaks and concealed by dense jungle, lies the **Citadel**. Its walls are impregnable, its defenses formidable, and its leader, the enigmatic "Overlord," is an iron-fisted tyrant who rules with an iron grip. The Citadel's purpose is singular and sinister: to safeguard a dangerous relic, a weapon of unimaginable power. It is a viral agent capable of spreading destruction on a global scale, the key to unprecedented control. + +The factions' motivations for acquiring the deadly artifact diverge, creating a volatile dynamic. The Ravens seek to harness its power to cement their dominance and expand their rule beyond Solara's shores. The Harmony Alliance envisions using it as a force for good, to quell the darkness and restore order to a world plagued by chaos. The Nomads, however, see the artifact as the embodiment of Solara's malevolent essence and seek its destruction, no matter the cost. + +Amidst this turmoil and rivalry, you, a lone volunteer from a distant nation, find yourself on the shores of Solara. Determined to earn your freedom, you tread carefully, forming alliances and surviving the trials of each faction's city. As you navigate the political maelstrom and uncover the island's secrets, you realize that you hold the fate of not only your own redemption but also the world in your hands. + +The stage is set, and the clock is ticking. To bring peace to the island and liberate its inhabitants, you must face the perilous journey to the Citadel, where the Overlord resides. The ultimate challenge awaits: to defeat the tyrant and seize control of the artifact, deciding the fate of Solara and its potential impact on the world beyond. But the path to redemption is fraught with danger, and the line between hero and villain blurs in the crucible of chaos. + +In "Shores of Solara," survival is not enough; to shape history, you must become a force of nature, an agent of change in a world teetering on the edge. The battle for power, the quest for redemption, and the pursuit of salvation converge in a gripping tale of courage, sacrifice, and the unyielding human spirit. + +*** +### Combat +After entering the unprotected zone, which starts at Zone 1, a player becomes invisible to others for a duration of two minutes. + +As you venture closer to the center, the level difference of players you can engage in player-versus-player (PVP) combat with increases. For instance, in Zone 30, you can engage in PVP with players who have a level difference of up to 30 levels. + +To clarify, if you are in Zone 30 and your character is level 45, you can engage in combat with any player whose level falls within the range of 15 to 75. Players outside of this level range will not appear on your screen unless they are part of your party. In such cases, the level range is determined by the highest level player in your party. + +Initiating PVP action will give you a "WANTED" status. When you come within one mile of another player with a "WANTED" status, you will receive a radio call alerting you to be on the lookout for a wanted PMC (Private Military Contractor) in the vicinity. + +Players who acquire the "WANTED" status will retain it for a duration of 30 minutes from their last shot fired at another PMC. Being "WANTED" makes a player visible to anyone, regardless of the level difference. + +If a player dies while marked as "WANTED," they will drop all their possessions. However, if they die without the "WANTED" status, they will retain the items stored in their secure and medical pockets, along with their most valuable weapon. + +Additionally, when a player dies and drops their items, they have 30 minutes to return to the spot where they died to retrieve their items. However, during this time, these items can also be picked up by other players. If another player picks up these items, the original owner will not be able to retrieve them. If the items are not picked up by anyone within 30 minutes, they will despawn from the map. + +In the event that items despawn, the player can buy them back from an NPC for 3/4 of the base full value of the items. + +**add** +- If level difference for pvp is out of range for 2 players, then they will be invisable/ghost to eachother and can not damage one another. +- melee is 1 hit kill in back, 2 hit kill anywhere + +*** +### Starting out + +Welcome to "Shores of Solara," (SOS) where your journey begins with a crucial decision. As you step onto the untamed shores of this remote island, you must choose your path by aligning with one of three distinct factions, each closely tied to a safe city within Solara. + +Upon your selection, you'll be granted an initial loadout that reflects your chosen faction's identity. This gear will be your first line of defense as you embark on your adventure, beginning in the heart of your faction's city. + +As you step into the open world of Solara, you'll find yourself surrounded by a rich tapestry of life. Throughout the three safe cities, numerous NPCs await your interaction, offering tasks, quests, and engaging storylines that span multiple parts. These quests might lead you to specific locations, require you to retrieve valuable items, or beckon you to delve into the island's enigmatic mysteries. + +Before you set out on your journey, you'll receive an essential tutorial on the game's inventory system. Initially, your possessions will be limited to what you carry on your character. However, your very first task will be to visit an NPC who will grant you access to storage—a valuable resource indeed. + +This storage facility is no ordinary place; it's an instanced home, nestled safely within the walls of your chosen safe city. At first, it will offer only the bare necessities—a cost, a small storage bin, and not much else. You'll soon learn that if you wish to acquire better gear and equipment, you'll need to venture out into the treacherous wilderness of Solara. + +The journey beyond the safety of the city walls is not for the faint of heart. The closer you tread toward the enigmatic Citadel at the island's core, the more advanced weaponry you'll discover scattered throughout the unforgiving terrain. However, be mindful; danger lurks around every corner, and the risk of engaging in player-versus-player combat is ever-present. + +To prepare you for the challenges ahead, you'll be briefed on the mechanics of death in Solara. Your fate upon death depends on whether you are marked as "WANTED." Should you fall in battle while bearing this infamous status, you will forfeit all your possessions. However, if you meet your demise without this label, your most prized items will remain safe in your secure and medical pockets. + +The island of Solara is teeming with opportunities and secrets waiting to be uncovered. Should you find yourself unsure of your next steps, simply ask around. There are countless individuals on this island who are more than willing to trade favors for assistance, turning every interaction into a potential stepping stone on your path to redemption and power. The world of "Shores of Solara" is your oyster, and your choices will shape its destiny. + +*** +### Inventory + +- todo: a description of the inventory system + - right click hold drop one from stack per slot, left click drag to split stack evenly among slots + - + - make a dot crosshair when close to an item and pickup item comes up when the crosshair is within the pickup ranges looking at the item + - right click fill bag on containers like materials bag and tool belt + - while a stack or item is picked up: right click drops/equips one from the stack. left click drops the whole stack. if no stack is held right click brings up menu + - when loaading ammo: If you hold a stack of ammo and hover over a mag, right clicking will load one in the mag, - left click will load the whole stack one by one, (instantly in safe city) + - cells should all be measured in length width hieght LWH + - +*** +### Systems + +todo: oraganize these into their own sections + +- crafting + - weapon building + - reloading + - inventory + - money + - Character starts with 5,000,000 Sats + - weight + - 150Lbs is max lv 1 carry weight + - movement + - Headbob + - Sliding Down Slope + - Prone - x + - Adjust Speed with Scroll Wheel + - Adjust crouch height with c+scroll wheel + - open door + - climb ladder + - vaulting + - energy + - hydration +- progression +- death / combat? described above +- health +- tasks + - npc + - item retrieval + - investigate + - misc + - airdrops + - wanted contracts +- 1-10 prestiege system, + - once the last task is complete, players are given the option to restart, lose all progress and items and prestiege. +- time + - time is generally 16x faster than real life + - day 1 hour night 30 minutes +- Fast Travel + - To fast travel you have to call it in + - You can only call in a fast travel every 30 minutes real life time. + - Once called in, a vehicle with a driver spawns in out of sight of any players + - Player has 10 minutes to get to the fast travel point + - His location will determine where he can fast travel to from there (see map) + - when spawning into an area, you spawn out of sight from any other players you and everything else is invisible for 10 second timer + + +*** + +| Weight | Status | Effect | +| -------- | -------- | -------- | +| 60-79.99 | Heavy Load | you make more noise `25%`, reduced jump height `50cm`, stamina drain increased `50%`, fall damage increased `5%`, movement speed decreased `25%` , walking drains your stamina.| +| 80-109.99 |Overweight | Cannot sprint, prone movement drains stamina, energy drain increased when moving, movement speed decreased `50%` | +| 110-150 |Critical Overweight | movement speed decreased `75%` ; energy drain increased ; turn speed reduced, max stance height reduced | + +*** +##### Inspirations +- Havenbrook based on Fallador, Survivalists safe city based on ardougne, Ravens safe city based on varrock. +- various towns and villages roughly scaled from rs towns barb village, draynor ... \ No newline at end of file