diff --git a/Assets/Atlas.spriteatlas b/Assets/Atlas.spriteatlas index c9eb114..75dc52d 100644 --- a/Assets/Atlas.spriteatlas +++ b/Assets/Atlas.spriteatlas @@ -28,11 +28,11 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 2800000, guid: 252e73463dc5649eca48720230253e81, type: 3} - totalSpriteSurfaceArea: 921600 bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} diff --git a/Assets/SpriteSheetRenderer/EmojiOne 1.png.meta b/Assets/SpriteSheetRenderer/EmojiOne 1.png.meta index f571930..c3304db 100644 --- a/Assets/SpriteSheetRenderer/EmojiOne 1.png.meta +++ b/Assets/SpriteSheetRenderer/EmojiOne 1.png.meta @@ -96,7 +96,7 @@ TextureImporter: 213: 6956787895621405797 second: EmojiOne 1_15 externalObjects: {} - serializedVersion: 10 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -116,6 +116,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -124,9 +126,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -147,11 +149,16 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 512 resizeAlgorithm: 0 @@ -162,7 +169,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 512 resizeAlgorithm: 0 @@ -173,7 +181,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 512 resizeAlgorithm: 0 @@ -184,7 +193,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 512 resizeAlgorithm: 0 @@ -195,6 +205,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -544,6 +567,23 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + EmojiOne 1_12: -3866680687824494963 + EmojiOne 1_1: 6191509826233423226 + EmojiOne 1_7: -6555101948311811443 + EmojiOne 1_4: 7333718747592911931 + EmojiOne 1_2: -3382597266031040065 + EmojiOne 1_5: -7576364691294958848 + EmojiOne 1_14: -2068372742122556654 + EmojiOne 1_15: 6956787895621405797 + EmojiOne 1_6: 8679332757349637653 + EmojiOne 1_11: 1598121676810280834 + EmojiOne 1_8: -4022401434188806707 + EmojiOne 1_9: 7082230791884041763 + EmojiOne 1_13: -1362501629173164557 + EmojiOne 1_10: 6733292874893715752 + EmojiOne 1_3: -532575279437139693 + EmojiOne 1_0: -654221344278647648 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/SpawnSpritesTest.unity b/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/SpawnSpritesTest.unity index 1565be4..a0d1709 100644 --- a/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/SpawnSpritesTest.unity +++ b/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/SpawnSpritesTest.unity @@ -202,6 +202,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.68, y: -12.18, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -249,7 +250,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c87523ccd27b5014a8ecc87d4d3692a5, type: 3} m_Name: m_EditorClassIdentifier: - spriteCount: 10 + spriteCount: 120000 sprites: - {fileID: -654221344278647648, guid: a1ffe2230b9de4eb98a84c30452fa8d5, type: 3} - {fileID: 6191509826233423226, guid: a1ffe2230b9de4eb98a84c30452fa8d5, type: 3} @@ -280,6 +281,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.96, y: -12.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -291,7 +293,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 3 + serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -304,7 +306,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -345,3 +347,4 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 diff --git a/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/Spritesheet/1bit-kennynl.png.meta b/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/Spritesheet/1bit-kennynl.png.meta index 80e6a19..5cc51a7 100644 --- a/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/Spritesheet/1bit-kennynl.png.meta +++ b/Assets/SpriteSheetRenderer/Examples/BulkSpawnSprites[DEMO]/Spritesheet/1bit-kennynl.png.meta @@ -3078,7 +3078,7 @@ TextureImporter: 213: 6348646232723148048 second: 1bit-kennynl_1024 externalObjects: {} - serializedVersion: 10 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -3098,6 +3098,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -3107,8 +3109,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -3129,11 +3131,16 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -3144,7 +3151,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -3155,6 +3163,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -4512,6 +4533,71 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + 1bit-kennynl_52: 2660087518270875073 + 1bit-kennynl_21: 6756441452203483074 + 1bit-kennynl_41: -8727176764571603312 + 1bit-kennynl_49: 2339193378089995211 + 1bit-kennynl_51: -7490600887629441901 + 1bit-kennynl_5: -2896342936669345622 + 1bit-kennynl_55: -5729265941571839772 + 1bit-kennynl_16: -6269534642481279281 + 1bit-kennynl_18: 7088985554447517081 + 1bit-kennynl_30: -1958468124865806112 + 1bit-kennynl_0: 6797741591340832258 + 1bit-kennynl_33: 6799226711921067709 + 1bit-kennynl_8: -6818893673047856951 + 1bit-kennynl_34: -6884711162074360425 + 1bit-kennynl_6: -6238104163968224529 + 1bit-kennynl_2: -4336377058555009779 + 1bit-kennynl_3: -2837347343044443318 + 1bit-kennynl_47: 2428582260365127044 + 1bit-kennynl_14: -1410373012541814305 + 1bit-kennynl_62: -3705341209193386819 + 1bit-kennynl_37: -6738849949099080586 + 1bit-kennynl_54: 8063653764807198947 + 1bit-kennynl_26: -1771780831898250090 + 1bit-kennynl_45: -4403442885131873971 + 1bit-kennynl_23: -6117280402061736007 + 1bit-kennynl_58: -3389567563577405277 + 1bit-kennynl_25: 8025793818648318321 + 1bit-kennynl_36: -5216995752355833947 + 1bit-kennynl_53: 6786102940563048334 + 1bit-kennynl_10: 2818965227934204182 + 1bit-kennynl_29: 6791405237003153178 + 1bit-kennynl_59: 718860864409648831 + 1bit-kennynl_31: -3665135733888953531 + 1bit-kennynl_46: 649678570077151341 + 1bit-kennynl_19: 3247448951452964749 + 1bit-kennynl_50: -6988868838696795927 + 1bit-kennynl_40: -6459390945945824665 + 1bit-kennynl_48: 8903181891100446877 + 1bit-kennynl_39: -4057731185872585317 + 1bit-kennynl_44: -5749357725757923580 + 1bit-kennynl_56: 6337327798681595081 + 1bit-kennynl_22: -3531768925929642157 + 1bit-kennynl_4: -1397973447338208431 + 1bit-kennynl_11: 1815313514622129468 + 1bit-kennynl_60: -5993218037647462456 + 1bit-kennynl_20: 3589981998501679386 + 1bit-kennynl_9: 1716920232066283920 + 1bit-kennynl_12: -2955994032907614642 + 1bit-kennynl_43: -8273803566698016722 + 1bit-kennynl_7: -4568812497173000395 + 1bit-kennynl_32: -812302957183085187 + 1bit-kennynl_28: -2543030247687566151 + 1bit-kennynl_24: 3961146165064710134 + 1bit-kennynl_17: 5681039558445236949 + 1bit-kennynl_42: 3414398267711066780 + 1bit-kennynl_63: -8532015669230584892 + 1bit-kennynl_13: 6004062526164164904 + 1bit-kennynl_35: 2623390479499570972 + 1bit-kennynl_1: -5592356013027741539 + 1bit-kennynl_61: -3930993700769348557 + 1bit-kennynl_38: 6597087958334735949 + 1bit-kennynl_57: -8145348381112612642 + 1bit-kennynl_15: 7081480758791880447 + 1bit-kennynl_27: 7237196526971645207 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/SpriteSheetRenderer/Systems/ColorBufferSystem.cs b/Assets/SpriteSheetRenderer/Systems/ColorBufferSystem.cs index f09622c..83b5c2b 100644 --- a/Assets/SpriteSheetRenderer/Systems/ColorBufferSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/ColorBufferSystem.cs @@ -3,7 +3,7 @@ using Unity.Jobs; using UnityEngine; -public class ColorBufferSystem : SystemBase { +public partial class ColorBufferSystem : SystemBase { EntityQuery query; protected override void OnCreate(){ diff --git a/Assets/SpriteSheetRenderer/Systems/MatrixBufferSystem.cs b/Assets/SpriteSheetRenderer/Systems/MatrixBufferSystem.cs index 6f7c588..c7bfc76 100644 --- a/Assets/SpriteSheetRenderer/Systems/MatrixBufferSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/MatrixBufferSystem.cs @@ -2,7 +2,7 @@ using Unity.Entities; using Unity.Jobs; -public class MatrixBufferSystem : SystemBase { +public partial class MatrixBufferSystem : SystemBase { EntityQuery query; protected override void OnCreate(){ diff --git a/Assets/SpriteSheetRenderer/Systems/SpriteSheetAnimationSystem.cs b/Assets/SpriteSheetRenderer/Systems/SpriteSheetAnimationSystem.cs index 92c8573..098243d 100644 --- a/Assets/SpriteSheetRenderer/Systems/SpriteSheetAnimationSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/SpriteSheetAnimationSystem.cs @@ -3,9 +3,9 @@ using Unity.Jobs; using UnityEngine; -public class SpriteSheetAnimationSystem : JobComponentSystem { +public partial class SpriteSheetAnimationSystem : SystemBase { [BurstCompile] - struct SpriteSheetAnimationJob : IJobForEach { + partial struct SpriteSheetAnimationJob : IJobEntity { public void Execute(ref SpriteSheetAnimation AnimCmp, ref SpriteIndex spriteSheetCmp) { if(AnimCmp.play && AnimCmp.elapsedFrames % AnimCmp.samples == 0 && AnimCmp.elapsedFrames != 0) { @@ -37,9 +37,10 @@ public bool NextWillReachEnd(SpriteSheetAnimation anim, SpriteIndex sprite) { } } - protected override JobHandle OnUpdate(JobHandle inputDeps) { - var job = new SpriteSheetAnimationJob(); - return job.Schedule(this, inputDeps); - } + protected override void OnUpdate() + { + var job = new SpriteSheetAnimationJob(); + job.Schedule(); + } } diff --git a/Assets/SpriteSheetRenderer/Systems/SpriteSheetPositionSystem.cs b/Assets/SpriteSheetRenderer/Systems/SpriteSheetPositionSystem.cs index 48ceade..3ae4d5c 100644 --- a/Assets/SpriteSheetRenderer/Systems/SpriteSheetPositionSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/SpriteSheetPositionSystem.cs @@ -4,7 +4,7 @@ using Unity.Jobs; using Unity.Collections; -public class SpriteSheetPositionSystem : SystemBase { +public partial class SpriteSheetPositionSystem : SystemBase { protected override void OnUpdate(){ Entities.WithName("SpriteSheetPositionSystem").WithChangeFilter().ForEach( (ref SpriteMatrix renderData, in Position2D translation) => { diff --git a/Assets/SpriteSheetRenderer/Systems/SpriteSheetRotationSystem.cs b/Assets/SpriteSheetRenderer/Systems/SpriteSheetRotationSystem.cs index a76013d..71f88b6 100644 --- a/Assets/SpriteSheetRenderer/Systems/SpriteSheetRotationSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/SpriteSheetRotationSystem.cs @@ -3,7 +3,7 @@ using Unity.Jobs; using Unity.Collections; -public class SpriteSheetRotationSystem : SystemBase { +public partial class SpriteSheetRotationSystem : SystemBase { protected override void OnUpdate(){ Entities.WithName("SpriteSheetRotationSystem").WithChangeFilter().ForEach( (ref SpriteMatrix renderData, in Rotation2D rotation) => { diff --git a/Assets/SpriteSheetRenderer/Systems/SpriteSheetScaleSystem.cs b/Assets/SpriteSheetRenderer/Systems/SpriteSheetScaleSystem.cs index 7870247..8b7182c 100644 --- a/Assets/SpriteSheetRenderer/Systems/SpriteSheetScaleSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/SpriteSheetScaleSystem.cs @@ -4,7 +4,7 @@ using Unity.Collections; using Unity.Transforms; -public class SpriteSheetScaleSystem : SystemBase { +public partial class SpriteSheetScaleSystem : SystemBase { protected override void OnUpdate(){ Entities.WithName("SpriteSheetScaleSystem").WithChangeFilter().ForEach( (ref SpriteMatrix renderData, in Scale scale) => { diff --git a/Assets/SpriteSheetRenderer/Systems/UVBufferSystem.cs b/Assets/SpriteSheetRenderer/Systems/UVBufferSystem.cs index bccd034..1241b89 100644 --- a/Assets/SpriteSheetRenderer/Systems/UVBufferSystem.cs +++ b/Assets/SpriteSheetRenderer/Systems/UVBufferSystem.cs @@ -2,7 +2,7 @@ using Unity.Entities; using Unity.Jobs; -public class UVBufferSystem : SystemBase { +public partial class UVBufferSystem : SystemBase { EntityQuery query; protected override void OnCreate(){ diff --git a/Assets/atlas.png.meta b/Assets/atlas.png.meta index 8c37fdf..3095fb8 100644 --- a/Assets/atlas.png.meta +++ b/Assets/atlas.png.meta @@ -303,7 +303,7 @@ TextureImporter: 213: 6943231030475362594 second: atlas_99 externalObjects: {} - serializedVersion: 10 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -323,6 +323,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -331,9 +333,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -354,11 +356,16 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -369,7 +376,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -380,6 +388,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -2493,6 +2514,107 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + atlas_7: 3150387745278999259 + atlas_60: -4238977252898700841 + atlas_94: 6033737138109490461 + atlas_74: 373023108217249310 + atlas_13: 1404248521807868572 + atlas_63: 6213591174740266156 + atlas_26: 6114706908185900674 + atlas_71: -7833081434177963002 + atlas_91: 3810031670109917275 + atlas_10: -7690861461720601230 + atlas_50: -5784155197273736402 + atlas_99: 6943231030475362594 + atlas_24: -480281958130896327 + atlas_35: -837451798449247853 + atlas_42: 5955329061760485876 + atlas_33: -1824652076595972009 + atlas_17: -8942817527115040722 + atlas_37: -7379956545844754435 + atlas_56: 4415742582785795081 + atlas_14: 5680673976619871293 + atlas_22: 237255737888612096 + atlas_25: -1158871858569825772 + atlas_90: -6421342941834215713 + atlas_92: -8865204830857710685 + atlas_29: 1724232623091690329 + atlas_39: 3167565764150125117 + atlas_53: 7141514654658448321 + atlas_23: -7773183333426011814 + atlas_72: 4074407266735321226 + atlas_86: -2782481716524008934 + atlas_58: -6418576252928775879 + atlas_59: 106039607451161387 + atlas_84: 444169483211416405 + atlas_96: 4977522122861270358 + atlas_43: 1892149534724688357 + atlas_48: -789513127050621798 + atlas_31: 277801872691154187 + atlas_12: 9170327630243124144 + atlas_8: 3210994475073176143 + atlas_80: -7416569314015058995 + atlas_55: 5127364165165817451 + atlas_65: -4863655150505270587 + atlas_27: 7286500777932155457 + atlas_52: 3751969408998419161 + atlas_79: 8248424065920207790 + atlas_32: -9105464366904032908 + atlas_40: -6857628880456039979 + atlas_6: 9093825842685103111 + atlas_81: -533251081174709349 + atlas_98: -841763303989154121 + atlas_69: 2085833354151652078 + atlas_83: -5192769841606136664 + atlas_64: 3840866019966617334 + atlas_67: 2495720034389870840 + atlas_89: -2042735401903261840 + atlas_87: -1424663173998816566 + atlas_34: -6540885550996791055 + atlas_46: 7433812123843982230 + atlas_54: 1647805384965423937 + atlas_2: -217455086581007235 + atlas_62: 1219087599862815547 + atlas_85: 7348000187133436936 + atlas_36: 1645464791298931044 + atlas_45: 5537369306379580553 + atlas_28: 1608028697691039176 + atlas_57: 7893001046947803066 + atlas_47: -8966928487586442866 + atlas_95: -4696056256175845265 + atlas_76: 4795072817625350032 + atlas_66: -1424352229175844325 + atlas_49: -2463003161872905370 + atlas_77: 229282781760922701 + atlas_61: -8452988735644794075 + atlas_68: -2508680716189495012 + atlas_73: 4122923815760860928 + atlas_30: 3568587909782029186 + atlas_75: 9155170950087369235 + atlas_5: -2850093654693141264 + atlas_15: -7969225410775572928 + atlas_70: 8079169831653568495 + atlas_51: -3133911186128049476 + atlas_93: 1100954520525533228 + atlas_16: -1613414928997637167 + atlas_9: -6596105612730252187 + atlas_88: 527225685031725846 + atlas_82: 3997552598037002181 + atlas_41: 772051552652778550 + atlas_3: 4335250483284255847 + atlas_20: 5821839773869540889 + atlas_19: 920200401680159811 + atlas_78: 7939007698562716213 + atlas_11: -6684475192863260856 + atlas_38: -4562572758038259349 + atlas_4: -983156657889264743 + atlas_0: -997972493423046422 + atlas_97: 8574936772832377797 + atlas_18: -7883866192385575364 + atlas_44: -2037528262120853220 + atlas_1: -199644854353079308 + atlas_21: -78570060565829106 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/characters.png.meta b/Assets/characters.png.meta index 31c7c91..a481503 100644 --- a/Assets/characters.png.meta +++ b/Assets/characters.png.meta @@ -222,7 +222,7 @@ TextureImporter: 213: -6056688053818895493 second: characters_72 externalObjects: {} - serializedVersion: 10 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -242,6 +242,8 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -250,9 +252,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -273,9 +275,14 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -313,6 +320,18 @@ TextureImporter: overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -1859,6 +1878,80 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + characters_23: -4031619653288768660 + characters_18: 4306828662039877052 + characters_34: -6603193462306882315 + characters_47: -1981437635880020547 + characters_2: 7755224123621818408 + characters_11: -3102994270238535240 + characters_36: 2093188768341758965 + characters_62: -6764882747809796459 + characters_51: -3501350889093356843 + characters_68: 6299452940519449263 + characters_7: -5691007311618604778 + characters_44: -1509298647979629103 + characters_3: -3557554893070573299 + characters_1: -517894308114096243 + characters_4: -4256427906160430202 + characters_69: -4365678376696325385 + characters_65: -2390135654043814455 + characters_27: 2860487071760280893 + characters_5: -6066236442320969475 + characters_6: 1893670189769602202 + characters_21: 7565877224362775616 + characters_0: 3083089168873209362 + characters_50: -6626920692342517838 + characters_24: 442113960596436644 + characters_72: -6056688053818895493 + characters_16: 8901077990765384427 + characters_26: -7676043117880224163 + characters_60: 3721987491355019842 + characters_9: -7232779301871914677 + characters_38: 2231020222837286545 + characters_22: 2243496752862105744 + characters_29: 5731562298934000515 + characters_12: -4572274602858593414 + characters_41: 8262985221905841761 + characters_39: 7609787605624061525 + characters_19: 3538125613680756451 + characters_40: -8879491853263213150 + characters_63: 4728118799374588956 + characters_59: -6249355941540749095 + characters_71: 2924033600936126985 + characters_48: -7365091535247084893 + characters_10: 7729768860333772239 + characters_13: 1189779305756619486 + characters_25: -3284978671773823301 + characters_43: -6878064802024223989 + characters_31: 9158924008245724444 + characters_66: 4496391894325732752 + characters_61: 3510613755944070091 + characters_45: -3889344650559148656 + characters_56: -4309814623186541336 + characters_42: 2011002775766109113 + characters_70: 3696329424477584276 + characters_49: 1820790034032967366 + characters_28: 939489211220940695 + characters_53: 6432319930159689466 + characters_37: 7744072722613937420 + characters_46: 1062266681453288945 + characters_64: -3148958741520818204 + characters_30: 1569994384330951894 + characters_8: -417436994572597314 + characters_17: -919312135990662955 + characters_54: 8544167053749469260 + characters_58: 7042348869349113295 + characters_55: 5386867447942924094 + characters_14: -1975635887328401948 + characters_15: 4367732871754573918 + characters_35: 7033315285397903179 + characters_32: -5465283732883496055 + characters_67: -7672714760311331509 + characters_20: -2976837118148077081 + characters_57: 4485183727095702631 + characters_33: -2093133780709834730 + characters_52: -7409678193281308084 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 228a4a4..f117ca9 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,15 +1,15 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.burst": "1.4.11", - "com.unity.collab-proxy": "1.5.7", - "com.unity.entities": "0.17.0-preview.42", - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.9", - "com.unity.ide.vscode": "1.2.3", - "com.unity.test-framework": "1.1.26", + "com.unity.burst": "1.6.6", + "com.unity.collab-proxy": "1.17.7", + "com.unity.entities": "0.51.1-preview.21", + "com.unity.ide.rider": "3.0.16", + "com.unity.ide.visualstudio": "2.0.16", + "com.unity.ide.vscode": "1.2.5", + "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.4.8", + "com.unity.timeline": "1.6.4", "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 d67144f..4cc33f5 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.4.11", + "version": "1.6.6", "depth": 0, "source": "registry", "dependencies": { @@ -16,40 +16,45 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.5.7", + "version": "1.17.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0" + "com.unity.services.core": "1.0.1" }, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "0.15.0-preview.21", + "version": "1.4.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.test-framework.performance": "2.3.1-preview", - "com.unity.burst": "1.4.1" + "com.unity.burst": "1.6.6", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework": "1.1.31" }, "url": "https://packages.unity.com" }, "com.unity.entities": { - "version": "0.17.0-preview.42", + "version": "0.51.1-preview.21", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.4.1", - "com.unity.properties": "1.5.0-preview", - "com.unity.serialization": "1.5.0-preview", - "com.unity.collections": "0.15.0-preview.21", - "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.6.6", + "com.unity.properties": "1.7.0-preview", + "com.unity.properties.ui": "1.7.0-preview", + "com.unity.serialization": "1.7.0-preview.1", + "com.unity.collections": "1.4.0", + "com.unity.jobs": "0.70.0-preview.7", + "com.unity.mathematics": "1.2.6", "com.unity.modules.assetbundle": "1.0.0", - "com.unity.test-framework.performance": "2.3.1-preview", - "com.unity.nuget.mono-cecil": "0.1.6-preview.2", - "com.unity.jobs": "0.8.0-preview.23", - "com.unity.scriptablebuildpipeline": "1.9.0", - "com.unity.platforms": "0.10.0-preview.10" + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.test-framework.performance": "2.8.0-preview", + "com.unity.nuget.mono-cecil": "1.10.1", + "com.unity.scriptablebuildpipeline": "1.19.2", + "com.unity.platforms": "0.51.1-preview.21", + "com.unity.roslyn": "0.2.2-preview", + "com.unity.profiling.core": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -61,16 +66,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.16", "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.9", + "version": "2.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -79,60 +84,64 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.3", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.jobs": { - "version": "0.8.0-preview.23", + "version": "0.70.0-preview.7", "depth": 1, "source": "registry", "dependencies": { - "com.unity.collections": "0.15.0-preview.21", - "com.unity.mathematics": "1.2.1" + "com.unity.collections": "1.4.0" }, "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.1", + "version": "1.2.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { - "version": "0.1.6-preview.2", - "depth": 1, + "version": "1.11.4", + "depth": 2, "source": "registry", - "dependencies": { - "nuget.mono-cecil": "0.1.6-preview" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", - "depth": 1, + "version": "3.0.2", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.platforms": { - "version": "0.10.0-preview.10", + "version": "0.51.1-preview.21", "depth": 1, "source": "registry", "dependencies": { - "com.unity.properties": "1.6.0-preview", - "com.unity.properties.ui": "1.6.2-preview.1", - "com.unity.scriptablebuildpipeline": "1.6.4-preview", - "com.unity.serialization": "1.6.2-preview" + "com.unity.properties": "1.7.0-preview", + "com.unity.properties.ui": "1.7.0-preview", + "com.unity.scriptablebuildpipeline": "1.19.2", + "com.unity.serialization": "1.7.0-preview.1" }, "url": "https://packages.unity.com" }, + "com.unity.profiling.core": { + "version": "1.0.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.properties": { - "version": "1.6.0-preview", - "depth": 2, + "version": "1.7.0-preview", + "depth": 1, "source": "registry", "dependencies": { "com.unity.nuget.mono-cecil": "0.1.6-preview.2", @@ -141,38 +150,57 @@ "url": "https://packages.unity.com" }, "com.unity.properties.ui": { - "version": "1.6.2-preview.1", - "depth": 2, + "version": "1.7.0-preview", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.properties": "1.6.0-preview", - "com.unity.serialization": "1.6.1-preview", - "com.unity.modules.uielements": "1.0.0" + "com.unity.properties": "1.7.0-preview", + "com.unity.serialization": "1.7.0-preview.1", + "com.unity.modules.uielements": "1.0.0", + "com.unity.test-framework.performance": "2.3.1-preview" }, "url": "https://packages.unity.com" }, + "com.unity.roslyn": { + "version": "0.2.2-preview", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.scriptablebuildpipeline": { - "version": "1.9.0", + "version": "1.20.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.serialization": { - "version": "1.6.2-preview", - "depth": 2, + "version": "1.7.0-preview.1", + "depth": 1, "source": "registry", "dependencies": { "com.unity.collections": "0.12.0-preview.13", "com.unity.burst": "1.3.5", "com.unity.jobs": "0.5.0-preview.14", - "com.unity.properties": "1.6.0-preview", + "com.unity.properties": "1.7.0-preview", "com.unity.test-framework.performance": "2.3.1-preview" }, "url": "https://packages.unity.com" }, + "com.unity.services.core": { + "version": "1.6.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { - "version": "1.1.26", + "version": "1.1.31", "depth": 0, "source": "registry", "dependencies": { @@ -183,12 +211,12 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework.performance": { - "version": "2.3.1-preview", + "version": "2.8.0-preview", "depth": 1, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.0", - "com.unity.nuget.newtonsoft-json": "2.0.0-preview" + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -202,7 +230,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.8", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { @@ -222,13 +250,6 @@ "com.unity.modules.imgui": "1.0.0" } }, - "nuget.mono-cecil": { - "version": "0.1.6-preview", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0,