Merge branch 'Pasha'

This commit is contained in:
Pasha Bibko
2026-01-22 13:51:29 +00:00
21 changed files with 320 additions and 558 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 MiB

View File

@@ -1,15 +1,12 @@
fileFormatVersion: 2
guid: 5c9183bcbaab3044f837c5746be20281
guid: f9a6ec29ec4af324081d28b88e210880
TextureImporter:
internalIDToNameTable:
- first:
213: 7482667652216324306
second: Square
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -40,9 +37,9 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
@@ -51,12 +48,12 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 256
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
@@ -68,7 +65,7 @@ TextureImporter:
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 1
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@@ -96,32 +93,6 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
@@ -137,34 +108,9 @@ TextureImporter:
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: Square
rect:
serializedVersion: 2
x: 0
y: 0
width: 256
height: 256
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 2d009a6b596c7d760800000000000000
internalID: 7482667652216324306
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape:
- - {x: -128, y: 128}
- {x: -128, y: -128}
- {x: 128, y: -128}
- {x: 128, y: 128}
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
@@ -173,8 +119,7 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
Square: 7482667652216324306
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 MiB

View File

@@ -1,12 +1,12 @@
fileFormatVersion: 2
guid: de466a5880e03354eab329c737ba7a03
guid: b0758035586dfba4caa189fe21fff581
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -52,7 +52,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
@@ -93,108 +93,33 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
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:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: clowns_0
rect:
serializedVersion: 2
x: 0
y: 445
width: 430
height: 445
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 87a5a4eca766a61478793827af19fe94
internalID: -1157003741
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: clowns_1
rect:
serializedVersion: 2
x: 430
y: 445
width: 430
height: 445
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c9b4445b29814d5419acc5a9df466eb2
internalID: -415541002
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: clowns_2
rect:
serializedVersion: 2
x: 0
y: 0
width: 430
height: 445
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8dcb59a6ba2654540b76f3e8eb72d7ba
internalID: -1072752027
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: clowns_3
rect:
serializedVersion: 2
x: 430
y: 0
width: 430
height: 445
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 752f400ed403baf409fbc6ea9e556b48
internalID: -1031824881
vertices: []
indices:
edges: []
weights: []
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 608f1e13e8361a34689f98ec70bbac8b
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
clowns_0: -1157003741
clowns_1: -415541002
clowns_2: -1072752027
clowns_3: -1031824881
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 KiB

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0a3345be1f4bf77488a64ce0d8ea336c
guid: 838c1faa084f71540937333fda902ea0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -93,17 +93,30 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
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:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: chains_0
name: Enemy stand_0
rect:
serializedVersion: 2
x: 0
y: 75
width: 75
height: 75
x: 250
y: 1288
width: 600
height: 850
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -111,20 +124,20 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3244612283365174794570bfd8d58549
internalID: 1904163225
spriteID: d1220b47a1680d4479fb72804774d9cb
internalID: 2010649892
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: chains_1
name: Enemy stand_1
rect:
serializedVersion: 2
x: 75
y: 75
width: 75
height: 75
x: 850
y: 1288
width: 600
height: 850
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -132,20 +145,20 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c03d0d8bfb760254cafba80b5b0e4975
internalID: -1747164198
spriteID: 08c3467e03044d44a801599d39b1f23e
internalID: -160627551
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: chains_2
name: Enemy stand_2
rect:
serializedVersion: 2
x: 0
y: 0
width: 75
height: 75
x: 250
y: 438
width: 600
height: 850
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -153,20 +166,20 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 027abeec8ae19d64c926381a6f60fdc9
internalID: 1194449042
spriteID: 24ef7f6a74debd147bd3f70c2b8a60dc
internalID: -2118867900
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: chains_3
name: Enemy stand_3
rect:
serializedVersion: 2
x: 75
y: 0
width: 75
height: 75
x: 850
y: 438
width: 600
height: 850
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -174,8 +187,8 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: c879ffa89302a2d45a36104f45259962
internalID: -163735648
spriteID: 12409018d92633f41959c76652793ae0
internalID: -303719096
vertices: []
indices:
edges: []
@@ -183,7 +196,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 8c5244d387cd2f145819cf370a58c42b
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
@@ -191,10 +204,10 @@ TextureImporter:
weights: []
secondaryTextures: []
nameFileIdTable:
chains_0: 1904163225
chains_1: -1747164198
chains_2: 1194449042
chains_3: -163735648
Enemy stand_0: 2010649892
Enemy stand_1: -160627551
Enemy stand_2: -2118867900
Enemy stand_3: -303719096
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e8246fe9d659340459bd9a5c324564c5
guid: db83dab4db991c04da3fec5f3f549674
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -93,17 +93,30 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
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:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: dog_0
name: Fe Male_0
rect:
serializedVersion: 2
x: 0
y: 430
width: 430
height: 430
y: 1024
width: 1024
height: 1024
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -111,20 +124,20 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 68828b02c9b8b8244b9053d3260efa1a
internalID: 1071730532
spriteID: 9eb7a6b4428eb5447b3a25afa6e3a2ea
internalID: -56882072
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: dog_1
name: Fe Male_1
rect:
serializedVersion: 2
x: 430
y: 430
width: 430
height: 430
x: 1024
y: 1024
width: 1024
height: 1024
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -132,20 +145,20 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 044ef7cd24b26a148aeda78ea18e8750
internalID: -1695598320
spriteID: d57241491c8873b40b004700af3c8786
internalID: 1926363890
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: dog_2
name: Fe Male_2
rect:
serializedVersion: 2
x: 0
y: 0
width: 430
height: 430
width: 1024
height: 1024
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -153,20 +166,20 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 6abaf20e6fe186b46a46e7a787376a27
internalID: 2078473470
spriteID: 9a444aa01673ef645b1e6cf82a83de1a
internalID: 184806975
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: dog_3
name: Fe Male_3
rect:
serializedVersion: 2
x: 430
x: 1024
y: 0
width: 430
height: 430
width: 1024
height: 1024
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
@@ -174,8 +187,8 @@ TextureImporter:
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 996d9449a0f64834b91fca739717a52d
internalID: -2122143423
spriteID: 20a21f35398a26e439ebfc690d68350a
internalID: -1614525058
vertices: []
indices:
edges: []
@@ -183,7 +196,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 3ba1a16dab83c3d43b88caa6a05a7599
spriteID: 8aec8f52d27caf6478d7095e1b8db5b6
internalID: 0
vertices: []
indices:
@@ -191,10 +204,10 @@ TextureImporter:
weights: []
secondaryTextures: []
nameFileIdTable:
dog_0: 1071730532
dog_1: -1695598320
dog_2: 2078473470
dog_3: -2122143423
Fe Male_0: -56882072
Fe Male_1: 1926363890
Fe Male_2: 184806975
Fe Male_3: -1614525058
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 407 KiB

View File

@@ -1,303 +0,0 @@
fileFormatVersion: 2
guid: 04614744e166b5f4b8b0621ad8c3f362
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
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:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: mqdefault_6s_0
rect:
serializedVersion: 2
x: 0
y: 90
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 169eb47570f383140b54a6663c27987a
internalID: -1064862615
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_1
rect:
serializedVersion: 2
x: 80
y: 90
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: eab46054ae242b84792a1af5478a0051
internalID: -2102979285
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_2
rect:
serializedVersion: 2
x: 160
y: 90
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1ed5777a02c2db44ca521c3a2482dc5e
internalID: 1651142211
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_3
rect:
serializedVersion: 2
x: 240
y: 90
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d456289421115ab439c3ada8028d7ae7
internalID: 1723850524
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_4
rect:
serializedVersion: 2
x: 0
y: 0
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: d88650c7aea07ef44a30a97808dfa9a1
internalID: -948625817
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_5
rect:
serializedVersion: 2
x: 80
y: 0
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 1a0cdba45492f5a4398d782a62f6b955
internalID: 2061557561
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_6
rect:
serializedVersion: 2
x: 160
y: 0
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 27c294f8132cecf4c82d8909213b8a4a
internalID: -2110342779
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: mqdefault_6s_7
rect:
serializedVersion: 2
x: 240
y: 0
width: 80
height: 90
alignment: 9
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 3674e0eee7ce5174289c4b6626e97a12
internalID: -1484945511
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable:
mqdefault_6s_0: -1064862615
mqdefault_6s_1: -2102979285
mqdefault_6s_2: 1651142211
mqdefault_6s_3: 1723850524
mqdefault_6s_4: -948625817
mqdefault_6s_5: 2061557561
mqdefault_6s_6: -2110342779
mqdefault_6s_7: -1484945511
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -74,6 +74,8 @@ GameObject:
- component: {fileID: 1013965729963872153}
- component: {fileID: 7220179918976106526}
- component: {fileID: 9011244016352067911}
- component: {fileID: 5849392838882679854}
- component: {fileID: 582799264655932961}
m_Layer: 0
m_Name: PlayerReplayer
m_TagString: Untagged
@@ -118,7 +120,8 @@ MonoBehaviour:
BulletTracerEnd: {fileID: 8852994287323472227}
<FrameIndex>k__BackingField: 0
DeathIndices: be000000f8000000eb0100005a0200008f020000
ShieldBarTransform: {fileID: 0}
ExternalCamera: {fileID: 0}
FrontLayerImage: {fileID: 0}
--- !u!20 &7220179918976106526
Camera:
m_ObjectHideFlags: 0
@@ -214,6 +217,56 @@ MonoBehaviour:
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
--- !u!136 &5849392838882679854
CapsuleCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5082956827802089079}
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.2
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: -0.3, z: 0}
--- !u!54 &582799264655932961
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5082956827802089079}
serializedVersion: 4
m_Mass: 1
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: 1
m_IsKinematic: 0
m_Interpolate: 1
m_Constraints: 0
m_CollisionDetection: 1
--- !u!1 &6013909295272487250
GameObject:
m_ObjectHideFlags: 0

View File

@@ -31,3 +31,9 @@ MonoBehaviour:
- <Name>k__BackingField: The codfather
<Image>k__BackingField: {fileID: 21300000, guid: 96c0dcfbf5358154aa8077a5909739ac,
type: 3}
- <Name>k__BackingField: Silk Sung
<Image>k__BackingField: {fileID: 21300000, guid: 96c0dcfbf5358154aa8077a5909739ac,
type: 3}
- <Name>k__BackingField: Tiny Huge Earth
<Image>k__BackingField: {fileID: 21300000, guid: b0758035586dfba4caa189fe21fff581,
type: 3}

View File

@@ -13,21 +13,6 @@ MonoBehaviour:
m_Name: ImageRegistry
m_EditorClassIdentifier:
m_Registered:
- <Images>k__BackingField:
- {fileID: 1904163225, guid: 0a3345be1f4bf77488a64ce0d8ea336c, type: 3}
- {fileID: -1747164198, guid: 0a3345be1f4bf77488a64ce0d8ea336c, type: 3}
- {fileID: 1194449042, guid: 0a3345be1f4bf77488a64ce0d8ea336c, type: 3}
- {fileID: -163735648, guid: 0a3345be1f4bf77488a64ce0d8ea336c, type: 3}
- <Images>k__BackingField:
- {fileID: -1157003741, guid: de466a5880e03354eab329c737ba7a03, type: 3}
- {fileID: -415541002, guid: de466a5880e03354eab329c737ba7a03, type: 3}
- {fileID: -1072752027, guid: de466a5880e03354eab329c737ba7a03, type: 3}
- {fileID: -1031824881, guid: de466a5880e03354eab329c737ba7a03, type: 3}
- <Images>k__BackingField:
- {fileID: 1071730532, guid: e8246fe9d659340459bd9a5c324564c5, type: 3}
- {fileID: -1695598320, guid: e8246fe9d659340459bd9a5c324564c5, type: 3}
- {fileID: 2078473470, guid: e8246fe9d659340459bd9a5c324564c5, type: 3}
- {fileID: -2122143423, guid: e8246fe9d659340459bd9a5c324564c5, type: 3}
- <Images>k__BackingField:
- {fileID: -796603773, guid: 4b6722dc74c1c8941a937c866dfaf401, type: 3}
- {fileID: -752713691, guid: 4b6722dc74c1c8941a937c866dfaf401, type: 3}
@@ -44,7 +29,12 @@ MonoBehaviour:
- {fileID: 1661635705, guid: 802abcc8090cc884c85eee10e5e86668, type: 3}
- {fileID: -1825452829, guid: 802abcc8090cc884c85eee10e5e86668, type: 3}
- <Images>k__BackingField:
- {fileID: -2102979285, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3}
- {fileID: 1651142211, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3}
- {fileID: 2061557561, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3}
- {fileID: -2110342779, guid: 04614744e166b5f4b8b0621ad8c3f362, type: 3}
- {fileID: 2010649892, guid: 838c1faa084f71540937333fda902ea0, type: 3}
- {fileID: -160627551, guid: 838c1faa084f71540937333fda902ea0, type: 3}
- {fileID: -2118867900, guid: 838c1faa084f71540937333fda902ea0, type: 3}
- {fileID: -303719096, guid: 838c1faa084f71540937333fda902ea0, type: 3}
- <Images>k__BackingField:
- {fileID: -56882072, guid: db83dab4db991c04da3fec5f3f549674, type: 3}
- {fileID: 1926363890, guid: db83dab4db991c04da3fec5f3f549674, type: 3}
- {fileID: 184806975, guid: db83dab4db991c04da3fec5f3f549674, type: 3}
- {fileID: -1614525058, guid: db83dab4db991c04da3fec5f3f549674, type: 3}

View File

@@ -1023,6 +1023,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.9
objectReference: {fileID: 0}
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.45
objectReference: {fileID: 0}
- target: {fileID: 7563216493506774349, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_Name
@@ -1047,16 +1062,67 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 833602854707986350, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.a
value: 0.6666667
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: fe05722d1c0421046b275859905cc71e,
type: 3}
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Name
value: GameCanvas
objectReference: {fileID: 0}
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2058749420242249500, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_MinSize
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 40
objectReference: {fileID: 0}
- target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_LocalPosition.x
@@ -1107,8 +1173,49 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4017024745020146958, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_SizeDelta.y
value: 275
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 7960376733688604242, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -79.5
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0.46226418
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 3563736642392842882, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3}

View File

@@ -18,10 +18,23 @@ namespace InterfaceOff.WorldScene
[field: SerializeField] private WindowSpawner Spawner { get; set; }
private static List<PlayerScore> PlayerScores { get; } = new();
private static ScoreTracker Instance { get; set; }
private bool StoredScore = false;
private float Score = 0f;
public static float CurrentScore()
{
if (DebugUtils.IsNull(Instance))
{
return 0;
}
return Instance.Score;
}
private void Awake() => Instance = this;
private void Update()
{
if (Spawner.AutoSpawn)
@@ -32,7 +45,7 @@ namespace InterfaceOff.WorldScene
else
{
FinalScoreText.text = $"Your final score is: {Score:F1}";
FinalScoreText.text = $"Your final score is: {Score:F1}, Press SPACE to continue";
ScoreText.text = null;
}
}