86 Commits
1.6.2 ... 1.8.1

Author SHA1 Message Date
b5a5cdc890 Fix default color thing 2025-09-12 10:01:47 -07:00
f932fe3aeb Fix accounts menu 2025-09-12 09:13:54 -07:00
9aea0c0a7f 1.8.1 2025-09-12 09:06:18 -07:00
b696532a51 Remove unused imports and sort imports 2025-09-11 21:25:09 -07:00
e93b34b116 Fixes to account menu 2025-09-11 21:18:01 -07:00
bd1b02236b Format scripts 2025-09-11 20:59:11 -07:00
ff2acc233e Add button content setting and fix other issues with custom color settings 2025-09-11 20:57:31 -07:00
970a2be8e1 Ok actually fixed the mobile issues 2025-09-11 20:02:47 -07:00
b005b5d805 oops 2025-09-11 19:48:22 -07:00
46b1b45ed4 Hide unavailable settings on mobile 2025-09-11 19:45:31 -07:00
0f2ef8aa61 Fix not being able to use custom mode on mobile 2025-09-11 19:28:32 -07:00
59ef9551f9 Fix colors not syncing when loading account data 2025-09-11 19:19:38 -07:00
bca9dab5ff Fix main menu song not stopping when in custom mode 2025-09-11 19:09:17 -07:00
5b19965304 1.8 2025-09-11 14:43:19 -07:00
f6f648dd5d Custom mode finished 2025-09-11 14:31:37 -07:00
158c584f0a Fix update button not working 2025-09-11 14:03:59 -07:00
01454cce1f Skip saving and loading savefile if no save encryption keys are present 2025-09-11 14:02:18 -07:00
6ea64d3be9 Fix people who aren't logged in being able to "ghost vote" on a post 2025-09-10 14:29:48 -07:00
7e7e43f6f4 Fix a bug with disliking a post with 0 likes 2025-09-10 14:13:39 -07:00
750ce7123a Update unity 2025-09-10 13:50:14 -07:00
7c8c419c6e Fix issues after compiling 2025-09-10 11:32:19 -07:00
c9f20f3c47 Fix a typo from coin to coins in marketplace 2025-09-10 09:59:23 -07:00
8d3b443760 Make leaderboards player icon go to profiles 2025-09-09 23:22:31 -07:00
2c49d6078a Make chatroom icon go to profile 2025-09-09 23:17:22 -07:00
79e37ac98b Make the profile prefab work with other profiles 2025-09-09 23:17:13 -07:00
0c3021decb Add profiles button to main menu 2025-09-09 22:47:08 -07:00
e2569f04c6 Profiles prefab and scripts 2025-09-09 22:46:20 -07:00
61a6025b9c Fix alpha value not being respected with custom object color object script, and also add a new type 2025-09-09 22:45:58 -07:00
c3e24be551 Fix background bird in icon marketplace and fix berry leaderboards dropdown 2025-09-09 22:43:38 -07:00
f52341ab43 Fix chatroom report input box not having correct input validation 2025-09-09 22:43:02 -07:00
19c6255aad Remove unused package 2025-09-09 20:26:43 -07:00
363ae63b64 Update packages 2025-09-08 21:22:26 -07:00
dc48de0d1f Finish color changing UIS 2025-09-07 10:34:01 -07:00
9485f65f16 Fix background for exit and social buttons 2025-09-06 21:44:43 -07:00
4fc3c7d9eb Fix iconkit sprites 2025-09-06 21:44:43 -07:00
8422026dd0 Add igbg, mbg, bc, tc color options in settings menu 2025-09-05 21:20:36 -07:00
7a5cc54d35 Reuse scripts instead of copypaste code 2025-09-05 20:24:44 -07:00
a426a26f09 Format 2025-09-05 16:51:06 -07:00
c16185e1de Remove unused music asset 2025-09-05 14:08:40 -07:00
e781b3138d Fix audio pitch 2025-09-05 14:08:34 -07:00
7f092dc977 Add a option for randomized music 2025-09-05 13:52:36 -07:00
5eee7e69f1 Fix berries never going off screen 2025-09-05 13:52:12 -07:00
6a40dfcbb4 Total berries leaderboard 2025-09-05 13:01:07 -07:00
1b9ed6770d Fixes with random berry and anti berry 2025-09-05 12:39:35 -07:00
251b518ac5 Fix legacy leaderboards not clearing objects when going to another leaderboard 2025-09-05 12:16:52 -07:00
952ec1cba3 1.7 2025-09-04 19:49:38 -07:00
ab5052781a Clamp all berries to screen when resizing window 2025-09-04 19:41:58 -07:00
36078293ae Fix issue with berries going off screen when using anti berry 2025-09-04 19:30:23 -07:00
0d754b9af9 Fix new berries not despawning on reset 2025-09-04 19:28:05 -07:00
2c091f444b Make audio get faster when speedy berry is active 2025-09-04 19:26:43 -07:00
7fdba6d071 Add the new berries to stats menu 2025-09-04 19:04:19 -07:00
e7f345d78f Forgot to remove this 2025-09-04 18:58:33 -07:00
fc25abc528 OnlyShow filter fix 2025-09-04 18:19:46 -07:00
2dcdafaf69 Improve icon marketplace download code and also add a Only Show dropdown filter 2025-09-04 17:47:26 -07:00
a836550206 Random Berry and Anti Berry, along with many asset changes 2025-09-04 17:25:56 -07:00
e4d95bbf3d Change anti berry texture 2025-09-04 16:58:14 -07:00
29af8817a7 Randomized music 2025-09-04 15:59:58 -07:00
3332c12711 Add rainbow image scripts 2025-09-04 15:47:40 -07:00
1910170ae7 Add sound tracks for the game 2025-09-04 15:45:05 -07:00
7bf47e897e Disable compression for audio 2025-09-04 15:44:48 -07:00
56d40a2b1d Swap wall berry for RandomBerry textures 2025-09-02 19:11:19 -07:00
51ca5ea736 Add AntiBerry and WallBerry assets 2025-09-02 18:21:40 -07:00
7d814e3b3c Make high score text highlighted 2025-09-02 18:21:24 -07:00
f270f55f1e Build Linux on Mac 2025-09-02 17:48:55 -07:00
fec42fb4e6 New KS path 2025-09-02 17:48:17 -07:00
91866a87fe Fix iOS (new appleid) and gitignore 2025-09-01 11:14:51 -07:00
a03c9a178f Fix edit ui on mobile weirdness 2025-08-31 09:23:29 -07:00
fc849318a2 Fix a bug 2025-08-31 09:09:07 -07:00
ad1e14b54c Reset options menu data when exiting download menu 2025-08-31 09:08:20 -07:00
862026e760 Reset button for options menu 2025-08-31 09:07:06 -07:00
f18a6fe7f9 Sort from Newest to oldest instead of Oldest to newest by default 2025-08-31 09:02:23 -07:00
8b60cb1798 Fixes to loading and account data loading 2025-08-30 23:17:06 -07:00
67ed1fe25e Makmake the icon purchase sound be used 2025-08-30 19:49:52 -07:00
a5f24db4c5 Use extended version of main menu music 2025-08-29 15:25:39 -07:00
1cdc2cb230 Update unity 2025-08-29 13:48:02 -07:00
015de48e34 Legacy leaderboards 2025-08-28 12:19:13 -07:00
3999f810a3 1.6.3 2025-08-27 22:31:59 -07:00
22c7e2f570 Improvements & fixing potential bugs 2025-08-27 22:29:55 -07:00
077f5c324c Forgot to add this 2025-08-27 22:11:50 -07:00
cf3c5388c5 Forgot to add sort by support 2025-08-27 22:02:29 -07:00
42c1d2d48c Fix a bug where you get stuck in options menu 2025-08-27 21:40:57 -07:00
d62ea4d09b Marketplace download options and refresh button 2025-08-27 21:31:55 -07:00
98782c8ce9 Fix slider text not disappearing when editing the UI 2025-08-27 20:42:35 -07:00
64836dbe4b Update readme 2025-08-27 19:50:34 -07:00
dec3995449 Readonly thing 2025-08-27 19:28:45 -07:00
f9231e568f Fix input for custom bird name 2025-08-27 00:39:50 -07:00
148 changed files with 45021 additions and 1682 deletions

2
.gitignore vendored
View File

@@ -83,3 +83,5 @@ crashlytics-build.properties
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta /[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers /[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta /[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
.DS_STORE

8
Assets/Prefabs.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 376f6bb5924654b88badd308efb7db34
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ed502784d1f0b48ee8e614eb6d09f2fb
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@@ -0,0 +1,169 @@
fileFormatVersion: 2
guid: 5448703480e4f4b58825a5b300150dba
TextureImporter:
internalIDToNameTable:
- first:
213: 1120944292977241905
second: AntiBerry_0
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: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
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: 4
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: 4
buildTarget: iOS
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: AntiBerry_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: 13fe8eb35e46e8f00800000000000000
internalID: 1120944292977241905
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: c6f1ee0bcf05d4bdf8b2997575eca0b5
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
AntiBerry_0: 1120944292977241905
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -0,0 +1,169 @@
fileFormatVersion: 2
guid: 7b3886d91158d45c5a254ea85e772e16
TextureImporter:
internalIDToNameTable:
- first:
213: 3416250205567451098
second: BerryNoColor_0
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: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
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: 4
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: 4
buildTarget: iOS
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: BerryNoColor_0
rect:
serializedVersion: 2
x: 7
y: 3
width: 114
height: 122
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: adff3be3675f86f20800000000000000
internalID: 3416250205567451098
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable:
BerryNoColor_0: 3416250205567451098
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:
@@ -138,7 +151,7 @@ TextureImporter:
customData: customData:
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID: 5e97eb03825dee720800000000000000
internalID: 0 internalID: 0
vertices: [] vertices: []
indices: indices:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
f111,f024,f0c5 f111,f024,f0c5,f075

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
f309,f111,f141,f04c,f0e2,f077,f061,f060,f0c8,f00c,f00d,f303,f2ed f309,f111,f141,f04c,f0e2,f077,f061,f060,f0c8,f00c,f00d,f303,f2ed,f0b0,f2bd,f164,f165

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -46,7 +46,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 2 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@@ -109,6 +109,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: iOS
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 99cb5320fee003746a29683a53dd3337 guid: 11f39136092887eaba9c2afa55dfbc16
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

View File

@@ -8,7 +8,7 @@ AudioImporter:
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 1 compressionFormat: 0
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0

Binary file not shown.

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5f59ed3599d5096e2a37719634154c5a guid: ee2d4248f8eab426087b9c595f0441ea
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4cf484b3219024e628ea4c0b6b8f13d4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c026057eb42f941f98a7e171ef0b2435
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 0e89a6f887c07452aae4a602586ec917
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: ea648a173226047439e18c96ebe3c1bb
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: f9fc94c25bdee4c0d9f5774720bd4cfc
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: bdf9c412cfb2642209d10186296c0782
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a34b74c5a1fc341178b14476e39597b3
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -340,6 +340,7 @@ GameObject:
- component: {fileID: 72292952} - component: {fileID: 72292952}
- component: {fileID: 72292954} - component: {fileID: 72292954}
- component: {fileID: 72292953} - component: {fileID: 72292953}
- component: {fileID: 72292955}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -465,6 +466,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 72292951} m_GameObject: {fileID: 72292951}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &72292955
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 72292951}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &83812369 --- !u!1 &83812369
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -478,6 +495,7 @@ GameObject:
- component: {fileID: 83812371} - component: {fileID: 83812371}
- component: {fileID: 83812373} - component: {fileID: 83812373}
- component: {fileID: 83812374} - component: {fileID: 83812374}
- component: {fileID: 83812375}
m_Layer: 5 m_Layer: 5
m_Name: FPSCounter m_Name: FPSCounter
m_TagString: Untagged m_TagString: Untagged
@@ -629,6 +647,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3} m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &83812375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83812369}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &129477182 --- !u!1 &129477182
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -640,6 +674,7 @@ GameObject:
- component: {fileID: 129477183} - component: {fileID: 129477183}
- component: {fileID: 129477185} - component: {fileID: 129477185}
- component: {fileID: 129477184} - component: {fileID: 129477184}
- component: {fileID: 129477186}
m_Layer: 5 m_Layer: 5
m_Name: Circle m_Name: Circle
m_TagString: Untagged m_TagString: Untagged
@@ -765,6 +800,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129477182} m_GameObject: {fileID: 129477182}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &129477186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129477182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &157540890 --- !u!1 &157540890
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -933,6 +984,7 @@ GameObject:
- component: {fileID: 211523164} - component: {fileID: 211523164}
- component: {fileID: 211523166} - component: {fileID: 211523166}
- component: {fileID: 211523165} - component: {fileID: 211523165}
- component: {fileID: 211523167}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -1058,6 +1110,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 211523163} m_GameObject: {fileID: 211523163}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &211523167
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 211523163}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &281292294 --- !u!1 &281292294
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1069,6 +1137,7 @@ GameObject:
- component: {fileID: 281292295} - component: {fileID: 281292295}
- component: {fileID: 281292297} - component: {fileID: 281292297}
- component: {fileID: 281292296} - component: {fileID: 281292296}
- component: {fileID: 281292298}
m_Layer: 5 m_Layer: 5
m_Name: Circle m_Name: Circle
m_TagString: Untagged m_TagString: Untagged
@@ -1194,6 +1263,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 281292294} m_GameObject: {fileID: 281292294}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &281292298
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 281292294}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &293594127 --- !u!1 &293594127
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1432,6 +1517,8 @@ MonoBehaviour:
songLoop: {fileID: 1625416039} songLoop: {fileID: 1625416039}
musicSlider: {fileID: 208042169} musicSlider: {fileID: 208042169}
sfxSlider: {fileID: 604620478} sfxSlider: {fileID: 604620478}
musicSliderText: {fileID: 1859415099}
sfxSliderText: {fileID: 699129040}
fpsText: {fileID: 83812371} fpsText: {fileID: 83812371}
scoreText: {fileID: 432923591} scoreText: {fileID: 432923591}
highScoreText: {fileID: 1606868532} highScoreText: {fileID: 1606868532}
@@ -1489,6 +1576,7 @@ GameObject:
- component: {fileID: 349314675} - component: {fileID: 349314675}
- component: {fileID: 349314677} - component: {fileID: 349314677}
- component: {fileID: 349314676} - component: {fileID: 349314676}
- component: {fileID: 349314678}
m_Layer: 5 m_Layer: 5
m_Name: Texture m_Name: Texture
m_TagString: Untagged m_TagString: Untagged
@@ -1614,6 +1702,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 349314674} m_GameObject: {fileID: 349314674}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &349314678
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 349314674}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &432923589 --- !u!1 &432923589
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1627,6 +1731,7 @@ GameObject:
- component: {fileID: 432923591} - component: {fileID: 432923591}
- component: {fileID: 432923593} - component: {fileID: 432923593}
- component: {fileID: 432923594} - component: {fileID: 432923594}
- component: {fileID: 432923595}
m_Layer: 5 m_Layer: 5
m_Name: ScoreText m_Name: ScoreText
m_TagString: Untagged m_TagString: Untagged
@@ -1778,6 +1883,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3} m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &432923595
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 432923589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &444807887 --- !u!1 &444807887
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1955,6 +2076,7 @@ GameObject:
- component: {fileID: 477875209} - component: {fileID: 477875209}
- component: {fileID: 477875208} - component: {fileID: 477875208}
- component: {fileID: 477875207} - component: {fileID: 477875207}
- component: {fileID: 477875210}
m_Layer: 5 m_Layer: 5
m_Name: ResetUIButton m_Name: ResetUIButton
m_TagString: Untagged m_TagString: Untagged
@@ -2064,6 +2186,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 477875205} m_GameObject: {fileID: 477875205}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &477875210
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 477875205}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &497996345 --- !u!1 &497996345
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2077,6 +2215,7 @@ GameObject:
- component: {fileID: 497996347} - component: {fileID: 497996347}
- component: {fileID: 497996349} - component: {fileID: 497996349}
- component: {fileID: 497996350} - component: {fileID: 497996350}
- component: {fileID: 497996351}
m_Layer: 5 m_Layer: 5
m_Name: BoostText m_Name: BoostText
m_TagString: Untagged m_TagString: Untagged
@@ -2228,6 +2367,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3} m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &497996351
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 497996345}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &519420028 --- !u!1 &519420028
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2406,6 +2561,7 @@ GameObject:
- component: {fileID: 527090676} - component: {fileID: 527090676}
- component: {fileID: 527090678} - component: {fileID: 527090678}
- component: {fileID: 527090677} - component: {fileID: 527090677}
- component: {fileID: 527090679}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -2531,6 +2687,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 527090675} m_GameObject: {fileID: 527090675}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &527090679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 527090675}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &570442662 --- !u!1 &570442662
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2542,6 +2714,7 @@ GameObject:
- component: {fileID: 570442663} - component: {fileID: 570442663}
- component: {fileID: 570442665} - component: {fileID: 570442665}
- component: {fileID: 570442664} - component: {fileID: 570442664}
- component: {fileID: 570442666}
m_Layer: 5 m_Layer: 5
m_Name: Texture m_Name: Texture
m_TagString: Untagged m_TagString: Untagged
@@ -2667,6 +2840,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 570442662} m_GameObject: {fileID: 570442662}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &570442666
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 570442662}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &604620476 --- !u!1 &604620476
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2769,6 +2958,7 @@ GameObject:
- component: {fileID: 650845197} - component: {fileID: 650845197}
- component: {fileID: 650845196} - component: {fileID: 650845196}
- component: {fileID: 650845195} - component: {fileID: 650845195}
- component: {fileID: 650845198}
m_Layer: 5 m_Layer: 5
m_Name: ContinueButton m_Name: ContinueButton
m_TagString: Untagged m_TagString: Untagged
@@ -2878,6 +3068,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 650845193} m_GameObject: {fileID: 650845193}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &650845198
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 650845193}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &659310343 --- !u!1 &659310343
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2889,6 +3095,7 @@ GameObject:
- component: {fileID: 659310344} - component: {fileID: 659310344}
- component: {fileID: 659310346} - component: {fileID: 659310346}
- component: {fileID: 659310345} - component: {fileID: 659310345}
- component: {fileID: 659310347}
m_Layer: 5 m_Layer: 5
m_Name: Texture m_Name: Texture
m_TagString: Untagged m_TagString: Untagged
@@ -3014,6 +3221,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659310343} m_GameObject: {fileID: 659310343}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &659310347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659310343}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &695529176 --- !u!1 &695529176
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3025,6 +3248,7 @@ GameObject:
- component: {fileID: 695529177} - component: {fileID: 695529177}
- component: {fileID: 695529179} - component: {fileID: 695529179}
- component: {fileID: 695529178} - component: {fileID: 695529178}
- component: {fileID: 695529180}
m_Layer: 5 m_Layer: 5
m_Name: Handle m_Name: Handle
m_TagString: Untagged m_TagString: Untagged
@@ -3150,6 +3374,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695529176} m_GameObject: {fileID: 695529176}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &695529180
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 695529176}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &699129038 --- !u!1 &699129038
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3161,6 +3401,7 @@ GameObject:
- component: {fileID: 699129039} - component: {fileID: 699129039}
- component: {fileID: 699129041} - component: {fileID: 699129041}
- component: {fileID: 699129040} - component: {fileID: 699129040}
- component: {fileID: 699129042}
m_Layer: 5 m_Layer: 5
m_Name: SliderText m_Name: SliderText
m_TagString: Untagged m_TagString: Untagged
@@ -3286,6 +3527,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 699129038} m_GameObject: {fileID: 699129038}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &699129042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 699129038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &700530370 --- !u!1 &700530370
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3461,7 +3718,7 @@ SpriteRenderer:
m_Size: {x: 1.28, y: 1.28} m_Size: {x: 1.28, y: 1.28}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 0
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!4 &808236451 --- !u!4 &808236451
@@ -3531,6 +3788,7 @@ GameObject:
- component: {fileID: 919249736} - component: {fileID: 919249736}
- component: {fileID: 919249738} - component: {fileID: 919249738}
- component: {fileID: 919249737} - component: {fileID: 919249737}
- component: {fileID: 919249739}
m_Layer: 5 m_Layer: 5
m_Name: Texture m_Name: Texture
m_TagString: Untagged m_TagString: Untagged
@@ -3656,6 +3914,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919249735} m_GameObject: {fileID: 919249735}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &919249739
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919249735}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &998688894 --- !u!1 &998688894
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3917,6 +4191,7 @@ GameObject:
- component: {fileID: 1129928587} - component: {fileID: 1129928587}
- component: {fileID: 1129928589} - component: {fileID: 1129928589}
- component: {fileID: 1129928588} - component: {fileID: 1129928588}
- component: {fileID: 1129928590}
m_Layer: 5 m_Layer: 5
m_Name: Circle m_Name: Circle
m_TagString: Untagged m_TagString: Untagged
@@ -4042,6 +4317,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1129928586} m_GameObject: {fileID: 1129928586}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1129928590
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1129928586}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1238966491 --- !u!1 &1238966491
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4089,6 +4380,7 @@ GameObject:
- component: {fileID: 1249678634} - component: {fileID: 1249678634}
- component: {fileID: 1249678636} - component: {fileID: 1249678636}
- component: {fileID: 1249678635} - component: {fileID: 1249678635}
- component: {fileID: 1249678637}
m_Layer: 5 m_Layer: 5
m_Name: Texture m_Name: Texture
m_TagString: Untagged m_TagString: Untagged
@@ -4214,6 +4506,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249678633} m_GameObject: {fileID: 1249678633}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1249678637
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249678633}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1261483214 --- !u!1 &1261483214
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4271,6 +4579,7 @@ GameObject:
- component: {fileID: 1346770910} - component: {fileID: 1346770910}
- component: {fileID: 1346770912} - component: {fileID: 1346770912}
- component: {fileID: 1346770911} - component: {fileID: 1346770911}
- component: {fileID: 1346770913}
m_Layer: 5 m_Layer: 5
m_Name: Handle m_Name: Handle
m_TagString: Untagged m_TagString: Untagged
@@ -4396,6 +4705,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346770909} m_GameObject: {fileID: 1346770909}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1346770913
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1346770909}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1527994348 --- !u!1 &1527994348
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4408,6 +4733,7 @@ GameObject:
- component: {fileID: 1527994351} - component: {fileID: 1527994351}
- component: {fileID: 1527994350} - component: {fileID: 1527994350}
- component: {fileID: 1527994352} - component: {fileID: 1527994352}
- component: {fileID: 1527994353}
m_Layer: 5 m_Layer: 5
m_Name: CoinsText m_Name: CoinsText
m_TagString: Untagged m_TagString: Untagged
@@ -4547,6 +4873,22 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
uiName: CoinsText uiName: CoinsText
canDrag: 0 canDrag: 0
--- !u!114 &1527994353
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527994348}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1539199159 --- !u!1 &1539199159
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4559,6 +4901,8 @@ GameObject:
- component: {fileID: 1539199163} - component: {fileID: 1539199163}
- component: {fileID: 1539199162} - component: {fileID: 1539199162}
- component: {fileID: 1539199161} - component: {fileID: 1539199161}
- component: {fileID: 1539199164}
- component: {fileID: 1539199165}
m_Layer: 5 m_Layer: 5
m_Name: BackButton m_Name: BackButton
m_TagString: Untagged m_TagString: Untagged
@@ -4668,6 +5012,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1539199159} m_GameObject: {fileID: 1539199159}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1539199164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1539199159}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene
sceneName: MainMenu
--- !u!114 &1539199165
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1539199159}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1577031225 --- !u!1 &1577031225
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4816,6 +5189,7 @@ GameObject:
- component: {fileID: 1606868532} - component: {fileID: 1606868532}
- component: {fileID: 1606868534} - component: {fileID: 1606868534}
- component: {fileID: 1606868535} - component: {fileID: 1606868535}
- component: {fileID: 1606868536}
m_Layer: 5 m_Layer: 5
m_Name: HighScoreText m_Name: HighScoreText
m_TagString: Untagged m_TagString: Untagged
@@ -4967,6 +5341,22 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3} m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &1606868536
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1606868530}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1625416038 --- !u!1 &1625416038
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4977,6 +5367,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1625416040} - component: {fileID: 1625416040}
- component: {fileID: 1625416039} - component: {fileID: 1625416039}
- component: {fileID: 1625416041}
m_Layer: 0 m_Layer: 0
m_Name: SongLoop m_Name: SongLoop
m_TagString: Untagged m_TagString: Untagged
@@ -4995,11 +5386,11 @@ AudioSource:
serializedVersion: 4 serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0} OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0} m_audioClip: {fileID: 0}
m_Resource: {fileID: 8300000, guid: 99cb5320fee003746a29683a53dd3337, type: 3} m_Resource: {fileID: 0}
m_PlayOnAwake: 1 m_PlayOnAwake: 0
m_Volume: 1 m_Volume: 1
m_Pitch: 1 m_Pitch: 1
Loop: 1 Loop: 0
Mute: 0 Mute: 0
Spatialize: 0 Spatialize: 0
SpatializePostEffects: 0 SpatializePostEffects: 0
@@ -5096,6 +5487,23 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1625416041
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1625416038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 81a98a63df08841c4b3fdc71ceecda4c, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
audioClips:
- {fileID: 8300000, guid: ea648a173226047439e18c96ebe3c1bb, type: 3}
- {fileID: 8300000, guid: bdf9c412cfb2642209d10186296c0782, type: 3}
- {fileID: 8300000, guid: f9fc94c25bdee4c0d9f5774720bd4cfc, type: 3}
- {fileID: 8300000, guid: 0e89a6f887c07452aae4a602586ec917, type: 3}
--- !u!1 &1639562819 --- !u!1 &1639562819
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5108,6 +5516,7 @@ GameObject:
- component: {fileID: 1639562823} - component: {fileID: 1639562823}
- component: {fileID: 1639562822} - component: {fileID: 1639562822}
- component: {fileID: 1639562821} - component: {fileID: 1639562821}
- component: {fileID: 1639562824}
m_Layer: 5 m_Layer: 5
m_Name: EditUIButton m_Name: EditUIButton
m_TagString: Untagged m_TagString: Untagged
@@ -5217,6 +5626,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1639562819} m_GameObject: {fileID: 1639562819}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1639562824
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1639562819}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1664477612 --- !u!1 &1664477612
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5411,6 +5836,7 @@ GameObject:
- component: {fileID: 1845861144} - component: {fileID: 1845861144}
- component: {fileID: 1845861146} - component: {fileID: 1845861146}
- component: {fileID: 1845861145} - component: {fileID: 1845861145}
- component: {fileID: 1845861147}
m_Layer: 5 m_Layer: 5
m_Name: Circle m_Name: Circle
m_TagString: Untagged m_TagString: Untagged
@@ -5536,6 +5962,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1845861143} m_GameObject: {fileID: 1845861143}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1845861147
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1845861143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1859415097 --- !u!1 &1859415097
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5547,6 +5989,7 @@ GameObject:
- component: {fileID: 1859415098} - component: {fileID: 1859415098}
- component: {fileID: 1859415100} - component: {fileID: 1859415100}
- component: {fileID: 1859415099} - component: {fileID: 1859415099}
- component: {fileID: 1859415101}
m_Layer: 5 m_Layer: 5
m_Name: SliderText m_Name: SliderText
m_TagString: Untagged m_TagString: Untagged
@@ -5672,6 +6115,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1859415097} m_GameObject: {fileID: 1859415097}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1859415101
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1859415097}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1931111987 --- !u!1 &1931111987
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5727,6 +6186,7 @@ GameObject:
- component: {fileID: 1960803694} - component: {fileID: 1960803694}
- component: {fileID: 1960803696} - component: {fileID: 1960803696}
- component: {fileID: 1960803695} - component: {fileID: 1960803695}
- component: {fileID: 1960803697}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -5852,6 +6312,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1960803693} m_GameObject: {fileID: 1960803693}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1960803697
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1960803693}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &2040852829 --- !u!1 &2040852829
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5863,6 +6339,7 @@ GameObject:
- component: {fileID: 2040852830} - component: {fileID: 2040852830}
- component: {fileID: 2040852832} - component: {fileID: 2040852832}
- component: {fileID: 2040852831} - component: {fileID: 2040852831}
- component: {fileID: 2040852833}
m_Layer: 5 m_Layer: 5
m_Name: Circle m_Name: Circle
m_TagString: Untagged m_TagString: Untagged
@@ -5988,6 +6465,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2040852829} m_GameObject: {fileID: 2040852829}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &2040852833
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2040852829}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 3
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &2069651266 --- !u!1 &2069651266
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -130,6 +130,7 @@ GameObject:
- component: {fileID: 58320439} - component: {fileID: 58320439}
- component: {fileID: 58320441} - component: {fileID: 58320441}
- component: {fileID: 58320440} - component: {fileID: 58320440}
- component: {fileID: 58320442}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -255,6 +256,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 58320438} m_GameObject: {fileID: 58320438}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &58320442
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 58320438}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &705564542 --- !u!1 &705564542
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -268,6 +285,7 @@ GameObject:
- component: {fileID: 705564543} - component: {fileID: 705564543}
- component: {fileID: 705564546} - component: {fileID: 705564546}
- component: {fileID: 705564547} - component: {fileID: 705564547}
- component: {fileID: 705564548}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@@ -385,7 +403,6 @@ MonoBehaviour:
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0 m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0 m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings: m_TaaSettings:
m_Quality: 3 m_Quality: 3
m_FrameInfluence: 0.1 m_FrameInfluence: 0.1
@@ -393,6 +410,7 @@ MonoBehaviour:
m_MipBias: 0 m_MipBias: 0
m_VarianceClampScale: 0.9 m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0 m_ContrastAdaptiveSharpening: 0
m_Version: 2
--- !u!114 &705564547 --- !u!114 &705564547
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -408,6 +426,22 @@ MonoBehaviour:
text: {fileID: 1201615242} text: {fileID: 1201615242}
updateButton: {fileID: 1024664078} updateButton: {fileID: 1024664078}
continueButton: {fileID: 798394520} continueButton: {fileID: 798394520}
--- !u!114 &705564548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705564542}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 1
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &734849806 --- !u!1 &734849806
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -603,6 +637,8 @@ GameObject:
- component: {fileID: 798394522} - component: {fileID: 798394522}
- component: {fileID: 798394521} - component: {fileID: 798394521}
- component: {fileID: 798394520} - component: {fileID: 798394520}
- component: {fileID: 798394523}
- component: {fileID: 798394524}
m_Layer: 5 m_Layer: 5
m_Name: ContinueButton m_Name: ContinueButton
m_TagString: Untagged m_TagString: Untagged
@@ -712,6 +748,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798394518} m_GameObject: {fileID: 798394518}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &798394523
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798394518}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene
sceneName: MainMenu
--- !u!114 &798394524
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 798394518}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &842325108 --- !u!1 &842325108
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -770,6 +835,7 @@ GameObject:
- component: {fileID: 1024664080} - component: {fileID: 1024664080}
- component: {fileID: 1024664079} - component: {fileID: 1024664079}
- component: {fileID: 1024664078} - component: {fileID: 1024664078}
- component: {fileID: 1024664081}
m_Layer: 5 m_Layer: 5
m_Name: UpdateButton m_Name: UpdateButton
m_TagString: Untagged m_TagString: Untagged
@@ -879,6 +945,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024664076} m_GameObject: {fileID: 1024664076}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1024664081
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024664076}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1053201553 --- !u!1 &1053201553
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -890,6 +972,7 @@ GameObject:
- component: {fileID: 1053201554} - component: {fileID: 1053201554}
- component: {fileID: 1053201556} - component: {fileID: 1053201556}
- component: {fileID: 1053201555} - component: {fileID: 1053201555}
- component: {fileID: 1053201557}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -1015,6 +1098,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1053201553} m_GameObject: {fileID: 1053201553}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1053201557
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1053201553}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1201615240 --- !u!1 &1201615240
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1026,6 +1125,7 @@ GameObject:
- component: {fileID: 1201615241} - component: {fileID: 1201615241}
- component: {fileID: 1201615243} - component: {fileID: 1201615243}
- component: {fileID: 1201615242} - component: {fileID: 1201615242}
- component: {fileID: 1201615244}
m_Layer: 5 m_Layer: 5
m_Name: Text m_Name: Text
m_TagString: Untagged m_TagString: Untagged
@@ -1151,6 +1251,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1201615240} m_GameObject: {fileID: 1201615240}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1201615244
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1201615240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1547097372 --- !u!1 &1547097372
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

6647
Assets/Scenes/PlayMenu.unity Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0d0c0e097b9d840f4b43c29611fc27e1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -130,6 +130,7 @@ GameObject:
- component: {fileID: 120748979} - component: {fileID: 120748979}
- component: {fileID: 120748981} - component: {fileID: 120748981}
- component: {fileID: 120748980} - component: {fileID: 120748980}
- component: {fileID: 120748982}
m_Layer: 5 m_Layer: 5
m_Name: Text (TMP) m_Name: Text (TMP)
m_TagString: Untagged m_TagString: Untagged
@@ -255,6 +256,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120748978} m_GameObject: {fileID: 120748978}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &120748982
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120748978}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 9
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &485090444 --- !u!1 &485090444
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -313,6 +330,7 @@ GameObject:
- component: {fileID: 592298613} - component: {fileID: 592298613}
- component: {fileID: 592298612} - component: {fileID: 592298612}
- component: {fileID: 592298611} - component: {fileID: 592298611}
- component: {fileID: 592298615}
m_Layer: 5 m_Layer: 5
m_Name: BackButton m_Name: BackButton
m_TagString: Untagged m_TagString: Untagged
@@ -435,6 +453,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 592298609} m_GameObject: {fileID: 592298609}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &592298615
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 592298609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 2
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &947116172 --- !u!1 &947116172
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -446,6 +480,7 @@ GameObject:
- component: {fileID: 947116173} - component: {fileID: 947116173}
- component: {fileID: 947116175} - component: {fileID: 947116175}
- component: {fileID: 947116174} - component: {fileID: 947116174}
- component: {fileID: 947116176}
m_Layer: 5 m_Layer: 5
m_Name: Panel m_Name: Panel
m_TagString: Untagged m_TagString: Untagged
@@ -512,6 +547,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947116172} m_GameObject: {fileID: 947116172}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &947116176
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 947116172}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 6
invert: 0
addMore: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 0}
reverseAdd: 0
--- !u!1 &985211373 --- !u!1 &985211373
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -523,6 +574,7 @@ GameObject:
- component: {fileID: 985211374} - component: {fileID: 985211374}
- component: {fileID: 985211376} - component: {fileID: 985211376}
- component: {fileID: 985211375} - component: {fileID: 985211375}
- component: {fileID: 985211377}
m_Layer: 5 m_Layer: 5
m_Name: StatText m_Name: StatText
m_TagString: Untagged m_TagString: Untagged
@@ -648,6 +700,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 985211373} m_GameObject: {fileID: 985211373}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &985211377
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 985211373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 4
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1179446525 --- !u!1 &1179446525
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -739,6 +807,7 @@ GameObject:
- component: {fileID: 1347726370} - component: {fileID: 1347726370}
- component: {fileID: 1347726369} - component: {fileID: 1347726369}
- component: {fileID: 1347726372} - component: {fileID: 1347726372}
- component: {fileID: 1347726373}
m_Layer: 0 m_Layer: 0
m_Name: Main Camera m_Name: Main Camera
m_TagString: MainCamera m_TagString: MainCamera
@@ -856,7 +925,6 @@ MonoBehaviour:
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0 m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0 m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings: m_TaaSettings:
m_Quality: 3 m_Quality: 3
m_FrameInfluence: 0.1 m_FrameInfluence: 0.1
@@ -864,6 +932,23 @@ MonoBehaviour:
m_MipBias: 0 m_MipBias: 0
m_VarianceClampScale: 0.9 m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0 m_ContrastAdaptiveSharpening: 0
m_Version: 2
--- !u!114 &1347726373
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1347726368}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73b30df2b3a7144b99b75ce70168fd50, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CustomColorObject
type: 1
invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0
--- !u!1 &1691624354 --- !u!1 &1691624354
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -29,13 +29,13 @@ public class AccountChangePassword : MonoBehaviour
async void ChangePassword() async void ChangePassword()
{ {
changePasswordBackButton.interactable = false;
if (changePasswordNewPasswordInput.text != changePasswordRetypeNewPasswordInput.text) if (changePasswordNewPasswordInput.text != changePasswordRetypeNewPasswordInput.text)
{ {
changePasswordBackButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
return; return;
} }
changePasswordBackButton.interactable = false;
changePasswordSubmitButton.interactable = false;
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("oldpassword", changePasswordCurrentPasswordInput.text); dataForm.AddField("oldpassword", changePasswordCurrentPasswordInput.text);
dataForm.AddField("newpassword", changePasswordNewPasswordInput.text); dataForm.AddField("newpassword", changePasswordNewPasswordInput.text);
@@ -49,33 +49,26 @@ public class AccountChangePassword : MonoBehaviour
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
changePasswordBackButton.interactable = true; changePasswordBackButton.interactable = true;
changePasswordSubmitButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
changePasswordBackButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
changePasswordBackButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
changePasswordBackButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
changePasswordBackButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -92,5 +85,6 @@ public class AccountChangePassword : MonoBehaviour
} }
} }
changePasswordBackButton.interactable = true; changePasswordBackButton.interactable = true;
changePasswordSubmitButton.interactable = true;
} }
} }

View File

@@ -28,6 +28,7 @@ public class AccountChangeUsername : MonoBehaviour
async void ChangeUsername() async void ChangeUsername()
{ {
changeUsernameBackButton.interactable = false; changeUsernameBackButton.interactable = false;
changeUsernameSubmitButton.interactable = false;
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("oldusername", changeUsernameCurrentUsernameInput.text); dataForm.AddField("oldusername", changeUsernameCurrentUsernameInput.text);
dataForm.AddField("newusername", changeUsernameNewUsernameInput.text); dataForm.AddField("newusername", changeUsernameNewUsernameInput.text);
@@ -41,33 +42,26 @@ public class AccountChangeUsername : MonoBehaviour
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
changeUsernameBackButton.interactable = true; changeUsernameBackButton.interactable = true;
changeUsernameSubmitButton.interactable = true;
Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
changeUsernameBackButton.interactable = true;
Tools.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
changeUsernameBackButton.interactable = true;
Tools.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
changeUsernameBackButton.interactable = true;
Tools.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
changeUsernameBackButton.interactable = true;
Tools.UpdateStatusText(changeUsernameStatusText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(changeUsernameStatusText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -84,5 +78,6 @@ public class AccountChangeUsername : MonoBehaviour
} }
} }
changeUsernameBackButton.interactable = true; changeUsernameBackButton.interactable = true;
changeUsernameSubmitButton.interactable = true;
} }
} }

View File

@@ -96,5 +96,6 @@ public class AccountHandler : MonoBehaviour
accountRefreshLogin.gameObject.SetActive(true); accountRefreshLogin.gameObject.SetActive(true);
break; break;
} }
foreach (CustomColorObject customColorObject in FindObjectsByType<CustomColorObject>(FindObjectsSortMode.None)) customColorObject.SetColor();
} }
} }

View File

@@ -5,7 +5,6 @@ using Newtonsoft.Json.Linq;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine.SceneManagement;
using UnityEngine.UI; using UnityEngine.UI;
public class AccountLoggedIn : MonoBehaviour public class AccountLoggedIn : MonoBehaviour
@@ -32,7 +31,6 @@ public class AccountLoggedIn : MonoBehaviour
BazookaManager.Instance.ResetSave(); BazookaManager.Instance.ResetSave();
AccountHandler.instance.SwitchPanel(1); AccountHandler.instance.SwitchPanel(1);
}); });
loggedInBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
} }
void OnEnable() void OnEnable()
@@ -44,8 +42,12 @@ public class AccountLoggedIn : MonoBehaviour
async void SaveAccount() async void SaveAccount()
{ {
loggedInLoadButton.interactable = false; loggedInChangeUsernameButton.interactable = false;
loggedInChangePasswordButton.interactable = false;
loggedInSaveButton.interactable = false; loggedInSaveButton.interactable = false;
loggedInLoadButton.interactable = false;
loggedInRefreshLoginButton.interactable = false;
loggedInLogoutButton.interactable = false;
loggedInBackButton.interactable = false; loggedInBackButton.interactable = false;
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("username", BazookaManager.Instance.GetAccountName()); dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
@@ -58,8 +60,12 @@ public class AccountLoggedIn : MonoBehaviour
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
loggedInLoadButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true;
loggedInSaveButton.interactable = true; loggedInSaveButton.interactable = true;
loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true;
loggedInBackButton.interactable = true; loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return; return;
@@ -67,35 +73,19 @@ public class AccountLoggedIn : MonoBehaviour
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -109,15 +99,23 @@ public class AccountLoggedIn : MonoBehaviour
Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
} }
} }
loggedInLoadButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true;
loggedInSaveButton.interactable = true; loggedInSaveButton.interactable = true;
loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true;
loggedInBackButton.interactable = true; loggedInBackButton.interactable = true;
} }
async void LoadAccount() async void LoadAccount()
{ {
loggedInLoadButton.interactable = false; loggedInChangeUsernameButton.interactable = false;
loggedInChangePasswordButton.interactable = false;
loggedInSaveButton.interactable = false; loggedInSaveButton.interactable = false;
loggedInLoadButton.interactable = false;
loggedInRefreshLoginButton.interactable = false;
loggedInLogoutButton.interactable = false;
loggedInBackButton.interactable = false; loggedInBackButton.interactable = false;
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("token", BazookaManager.Instance.GetAccountSession()); dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
@@ -129,8 +127,12 @@ public class AccountLoggedIn : MonoBehaviour
await request.SendWebRequest(); await request.SendWebRequest();
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
loggedInLoadButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true;
loggedInSaveButton.interactable = true; loggedInSaveButton.interactable = true;
loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true;
loggedInBackButton.interactable = true; loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return; return;
@@ -138,35 +140,19 @@ public class AccountLoggedIn : MonoBehaviour
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
loggedInLoadButton.interactable = true;
loggedInSaveButton.interactable = true;
loggedInBackButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -174,6 +160,20 @@ public class AccountLoggedIn : MonoBehaviour
if ((bool)jsonResponse["success"]) if ((bool)jsonResponse["success"])
{ {
BazookaManager.Instance.saveFile = JObject.FromObject(jsonResponse["data"]); BazookaManager.Instance.saveFile = JObject.FromObject(jsonResponse["data"]);
if (!Application.isMobilePlatform)
{
var width = Display.main.systemWidth;
var height = Display.main.systemHeight;
Screen.SetResolution(width, height, BazookaManager.Instance.GetSettingFullScreen());
QualitySettings.vSyncCount = BazookaManager.Instance.GetSettingVsync() ? 1 : -1;
}
else
{
Application.targetFrameRate = 360;
QualitySettings.vSyncCount = 0;
}
MenuMusic.Instance.GetComponent<AudioSource>().volume = BazookaManager.Instance.GetSettingMusicVolume();
foreach (CustomColorObject customColorObject in FindObjectsByType<CustomColorObject>(FindObjectsSortMode.None)) customColorObject.SetColor();
Tools.UpdateStatusText(loggedInText, "Loaded account data", Color.green); Tools.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
} }
else else
@@ -181,8 +181,12 @@ public class AccountLoggedIn : MonoBehaviour
Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
} }
} }
loggedInLoadButton.interactable = true; loggedInChangeUsernameButton.interactable = true;
loggedInChangePasswordButton.interactable = true;
loggedInSaveButton.interactable = true; loggedInSaveButton.interactable = true;
loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true;
loggedInBackButton.interactable = true; loggedInBackButton.interactable = true;
} }
} }

View File

@@ -1,17 +1,14 @@
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI; using UnityEngine.UI;
public class AccountLoggedOut : MonoBehaviour public class AccountLoggedOut : MonoBehaviour
{ {
public Button loggedOutLoginButton; public Button loggedOutLoginButton;
public Button loggedOutRegisterButton; public Button loggedOutRegisterButton;
public Button loggedOutBackButton;
void Awake() void Awake()
{ {
loggedOutLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(2)); loggedOutLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(2));
loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3)); loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3));
loggedOutBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
} }
} }

View File

@@ -1,5 +1,4 @@
using System.Numerics; using System.Numerics;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
@@ -30,6 +29,7 @@ public class AccountLogin : MonoBehaviour
async void SubmitLogin() async void SubmitLogin()
{ {
loginBackButton.interactable = false; loginBackButton.interactable = false;
loginSubmitButton.interactable = false;
if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty) if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty)
{ {
Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red);
@@ -47,33 +47,26 @@ public class AccountLogin : MonoBehaviour
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
loginBackButton.interactable = true; loginBackButton.interactable = true;
loginSubmitButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
loginBackButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
loginBackButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
loginBackButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
loginBackButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -92,5 +85,6 @@ public class AccountLogin : MonoBehaviour
} }
} }
loginBackButton.interactable = true; loginBackButton.interactable = true;
loginSubmitButton.interactable = true;
} }
} }

View File

@@ -28,6 +28,7 @@ public class AccountRefreshLogin : MonoBehaviour
async void RefreshLogin() async void RefreshLogin()
{ {
refreshLoginBackButton.interactable = false; refreshLoginBackButton.interactable = false;
refreshLoginSubmitButton.interactable = false;
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("username", refreshLoginUsernameInput.text); dataForm.AddField("username", refreshLoginUsernameInput.text);
dataForm.AddField("password", refreshLoginPasswordInput.text); dataForm.AddField("password", refreshLoginPasswordInput.text);
@@ -39,33 +40,26 @@ public class AccountRefreshLogin : MonoBehaviour
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
refreshLoginBackButton.interactable = true; refreshLoginBackButton.interactable = true;
refreshLoginSubmitButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
refreshLoginBackButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
refreshLoginBackButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
refreshLoginBackButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
refreshLoginBackButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -84,5 +78,6 @@ public class AccountRefreshLogin : MonoBehaviour
} }
} }
refreshLoginBackButton.interactable = true; refreshLoginBackButton.interactable = true;
refreshLoginSubmitButton.interactable = true;
} }
} }

View File

@@ -33,7 +33,6 @@ public class AccountRegister : MonoBehaviour
async void SubmitRegister() async void SubmitRegister()
{ {
registerBackButton.interactable = false;
if ( if (
registerUsernameInput.text == string.Empty || registerUsernameInput.text == string.Empty ||
registerEmailInput.text == string.Empty || registerEmailInput.text == string.Empty ||
@@ -42,22 +41,21 @@ public class AccountRegister : MonoBehaviour
registerRetypePasswordInput.text == string.Empty registerRetypePasswordInput.text == string.Empty
) )
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "All input fields must be filled", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "All input fields must be filled", Color.red);
return; return;
} }
if (registerEmailInput.text != registerRetypeEmailInput.text) if (registerEmailInput.text != registerRetypeEmailInput.text)
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Emails don't match", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Emails don't match", Color.red);
return; return;
} }
if (registerPasswordInput.text != registerRetypePasswordInput.text) if (registerPasswordInput.text != registerRetypePasswordInput.text)
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red);
return; return;
} }
registerBackButton.interactable = false;
registerSubmitButton.interactable = false;
EncryptedWWWForm dataForm = new(); EncryptedWWWForm dataForm = new();
dataForm.AddField("username", registerUsernameInput.text); dataForm.AddField("username", registerUsernameInput.text);
dataForm.AddField("email", registerEmailInput.text); dataForm.AddField("email", registerEmailInput.text);
@@ -70,33 +68,26 @@ public class AccountRegister : MonoBehaviour
if (request.result != UnityWebRequest.Result.Success) if (request.result != UnityWebRequest.Result.Success)
{ {
registerBackButton.interactable = true; registerBackButton.interactable = true;
registerSubmitButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999") if (response == "-999")
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red);
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red);
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red);
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
registerBackButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red);
return;
} }
else else
{ {
@@ -111,5 +102,6 @@ public class AccountRegister : MonoBehaviour
} }
} }
registerBackButton.interactable = true; registerBackButton.interactable = true;
registerSubmitButton.interactable = true;
} }
} }

View File

@@ -45,6 +45,7 @@ public class BazookaManager : MonoBehaviour
public void Load() public void Load()
{ {
if (SensitiveInfo.BAZOOKA_MANAGER_KEY.Trim().Length == 0 || SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY.Trim().Length == 0) return;
string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat"); string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat");
if (!File.Exists(path)) if (!File.Exists(path))
{ {
@@ -386,6 +387,7 @@ public class BazookaManager : MonoBehaviour
#if UNITY_EDITOR #if UNITY_EDITOR
return; return;
#else #else
if (SensitiveInfo.BAZOOKA_MANAGER_KEY.Trim().Length == 0 || SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY.Trim().Length == 0) return;
string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat"); string path = Path.Join(Application.persistentDataPath, SensitiveInfo.BAZOOKA_MANAGER_FILE_KEY + ".dat");
var encoded = SensitiveInfo.EncryptRaw(saveFile.ToString(Newtonsoft.Json.Formatting.None), SensitiveInfo.BAZOOKA_MANAGER_KEY); var encoded = SensitiveInfo.EncryptRaw(saveFile.ToString(Newtonsoft.Json.Formatting.None), SensitiveInfo.BAZOOKA_MANAGER_KEY);
if (encoded == null) return; if (encoded == null) return;
@@ -404,6 +406,19 @@ public class BazookaManager : MonoBehaviour
Save(); Save();
} }
//Random stuff
public void SetLikedPosts(JArray value)
{
saveFile["likedPosts"] = value;
}
public JArray GetLikedPosts()
{
if (saveFile["likedPosts"] == null) return new JArray();
return JArray.Parse(saveFile["likedPosts"].ToString());
}
//Bird stuff //Bird stuff
public void SetBirdIcon(int value) public void SetBirdIcon(int value)
@@ -520,6 +535,19 @@ public class BazookaManager : MonoBehaviour
return bool.Parse(saveFile["settings"]["hideSocials"].ToString()); return bool.Parse(saveFile["settings"]["hideSocials"].ToString());
} }
public void SetSettingRandomMusic(bool value)
{
if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
saveFile["settings"]["randomMusic"] = value;
}
public bool GetSettingRandomMusic()
{
if (saveFile["settings"] == null) return true;
if (saveFile["settings"]["randomMusic"] == null) return true;
return bool.Parse(saveFile["settings"]["randomMusic"].ToString());
}
public void SetSettingMusicVolume(float value) public void SetSettingMusicVolume(float value)
{ {
if (saveFile["settings"] == null) saveFile["settings"] = new JObject(); if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
@@ -561,6 +589,66 @@ public class BazookaManager : MonoBehaviour
return JArray.Parse(saveFile["settings"]["colors"]["background"].ToString()); return JArray.Parse(saveFile["settings"]["colors"]["background"].ToString());
} }
public void SetColorSettingMenuBackground(JArray value)
{
if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
saveFile["settings"]["colors"]["menuBackground"] = value;
}
public JArray GetColorSettingMenuBackground()
{
if (saveFile["settings"] == null) return new JArray(24, 24, 24);
if (saveFile["settings"]["colors"] == null) return new JArray(24, 24, 24);
if (saveFile["settings"]["colors"]["menuBackground"] == null) return new JArray(24, 24, 24);
return JArray.Parse(saveFile["settings"]["colors"]["menuBackground"].ToString());
}
public void SetColorSettingButton(JArray value)
{
if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
saveFile["settings"]["colors"]["button"] = value;
}
public JArray GetColorSettingButton()
{
if (saveFile["settings"] == null) return new JArray(255, 255, 255);
if (saveFile["settings"]["colors"] == null) return new JArray(255, 255, 255);
if (saveFile["settings"]["colors"]["button"] == null) return new JArray(255, 255, 255);
return JArray.Parse(saveFile["settings"]["colors"]["button"].ToString());
}
public void SetColorSettingText(JArray value)
{
if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
saveFile["settings"]["colors"]["text"] = value;
}
public JArray GetColorSettingText()
{
if (saveFile["settings"] == null) return new JArray(255, 255, 255);
if (saveFile["settings"]["colors"] == null) return new JArray(255, 255, 255);
if (saveFile["settings"]["colors"]["text"] == null) return new JArray(255, 255, 255);
return JArray.Parse(saveFile["settings"]["colors"]["text"].ToString());
}
public void SetColorSettingButtonContent(JArray value)
{
if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
if (saveFile["settings"]["colors"] == null) saveFile["settings"]["colors"] = new JObject();
saveFile["settings"]["colors"]["buttonColor"] = value;
}
public JArray GetColorSettingButtonContent()
{
if (saveFile["settings"] == null) return new JArray(0, 0, 0);
if (saveFile["settings"]["colors"] == null) return new JArray(0, 0, 0);
if (saveFile["settings"]["colors"]["buttonColor"] == null) return new JArray(0, 0, 0);
return JArray.Parse(saveFile["settings"]["colors"]["buttonColor"].ToString());
}
public void SetColorSettingIcon(JArray value) public void SetColorSettingIcon(JArray value)
{ {
if (saveFile["settings"] == null) saveFile["settings"] = new JObject(); if (saveFile["settings"] == null) saveFile["settings"] = new JObject();
@@ -819,4 +907,42 @@ public class BazookaManager : MonoBehaviour
if (saveFile["gameStore"] == null) return; if (saveFile["gameStore"] == null) return;
(saveFile["gameStore"] as JObject)?.Remove("totalCoinBerries"); (saveFile["gameStore"] as JObject)?.Remove("totalCoinBerries");
} }
public void SetGameStoreTotalRandomBerries(BigInteger value)
{
if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
saveFile["gameStore"]["totalRandomBerries"] = value.ToString();
}
public BigInteger GetGameStoreTotalRandomBerries()
{
if (saveFile["gameStore"] == null) return 0;
if (saveFile["gameStore"]["totalRandomBerries"] == null) return 0;
return BigInteger.Parse(saveFile["gameStore"]["totalRandomBerries"].ToString());
}
public void UnsetGameStoreTotalRandomBerries()
{
if (saveFile["gameStore"] == null) return;
(saveFile["gameStore"] as JObject)?.Remove("totalRandomBerries");
}
public void SetGameStoreTotalAntiBerries(BigInteger value)
{
if (saveFile["gameStore"] == null) saveFile["gameStore"] = new JObject();
saveFile["gameStore"]["totalAntiBerries"] = value.ToString();
}
public BigInteger GetGameStoreTotalAntiBerries()
{
if (saveFile["gameStore"] == null) return 0;
if (saveFile["gameStore"]["totalAntiBerries"] == null) return 0;
return BigInteger.Parse(saveFile["gameStore"]["totalAntiBerries"].ToString());
}
public void UnsetGameStoreTotalAntiBerries()
{
if (saveFile["gameStore"] == null) return;
(saveFile["gameStore"] as JObject)?.Remove("totalAntiBerries");
}
} }

View File

@@ -1,5 +1,5 @@
using UnityEngine;
using TMPro; using TMPro;
using UnityEngine;
public class BouncyText : MonoBehaviour public class BouncyText : MonoBehaviour
{ {

View File

@@ -1,5 +1,5 @@
using UnityEngine;
using TMPro; using TMPro;
using UnityEngine;
public class ImageColorSync : MonoBehaviour public class ImageColorSync : MonoBehaviour
{ {

View File

@@ -9,7 +9,6 @@ using Newtonsoft.Json.Linq;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine.SceneManagement;
using UnityEngine.UI; using UnityEngine.UI;
public class ChatroomMenu : MonoBehaviour public class ChatroomMenu : MonoBehaviour
@@ -28,6 +27,7 @@ public class ChatroomMenu : MonoBehaviour
private bool shouldScrollToBottom = true; private bool shouldScrollToBottom = true;
public Button downButton; public Button downButton;
private bool isPaused; private bool isPaused;
public ProfileMenu profilePrefab;
public GameObject optionsPanel; public GameObject optionsPanel;
public Button optionsPanelExitButton; public Button optionsPanelExitButton;
@@ -55,7 +55,6 @@ public class ChatroomMenu : MonoBehaviour
messageInputField.interactable = false; messageInputField.interactable = false;
ShowStatus("Warning: You are not logged in. Please log in to send messages."); ShowStatus("Warning: You are not logged in. Please log in to send messages.");
} }
backButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu"));
sendButton.onClick.AddListener(async () => await HandleMessageSubmit()); sendButton.onClick.AddListener(async () => await HandleMessageSubmit());
downButton.onClick.AddListener(() => StartCoroutine(ScrollToBottom())); downButton.onClick.AddListener(() => StartCoroutine(ScrollToBottom()));
messageInputField.textComponent.textWrappingMode = TextWrappingModes.Normal; messageInputField.textComponent.textWrappingMode = TextWrappingModes.Normal;
@@ -201,7 +200,8 @@ public class ChatroomMenu : MonoBehaviour
optionsPanel.SetActive(false); optionsPanel.SetActive(false);
editMessage.SetActive(true); editMessage.SetActive(true);
}); });
optionsPanelReportButton.onClick.AddListener(() => { optionsPanelReportButton.onClick.AddListener(() =>
{
reportMessagePanelReportReason.text = ""; reportMessagePanelReportReason.text = "";
optionsPanel.SetActive(false); optionsPanel.SetActive(false);
reportMessagePanel.SetActive(true); reportMessagePanel.SetActive(true);
@@ -419,6 +419,7 @@ public class ChatroomMenu : MonoBehaviour
var bgImg = rowInfo.transform.GetChild(0).GetComponent<Image>(); var bgImg = rowInfo.transform.GetChild(0).GetComponent<Image>();
var usernameText = rowInfo.transform.GetChild(1).GetComponent<TMP_Text>(); var usernameText = rowInfo.transform.GetChild(1).GetComponent<TMP_Text>();
var playerIcon = rowInfo.transform.GetChild(2).GetComponent<Image>(); var playerIcon = rowInfo.transform.GetChild(2).GetComponent<Image>();
var playerIconButton = rowInfo.transform.GetChild(2).GetComponent<Button>();
var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>(); var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>();
var messageText = rowInfo.transform.GetChild(3).GetComponent<TMP_Text>(); var messageText = rowInfo.transform.GetChild(3).GetComponent<TMP_Text>();
var optionsButton = rowInfo.transform.GetChild(4).GetComponent<Button>(); var optionsButton = rowInfo.transform.GetChild(4).GetComponent<Button>();
@@ -465,6 +466,12 @@ public class ChatroomMenu : MonoBehaviour
Tools.RenderFromBase64(customIcons[message.CustomIcon], playerIcon); Tools.RenderFromBase64(customIcons[message.CustomIcon], playerIcon);
playerOverlayIcon.gameObject.SetActive(false); playerOverlayIcon.gameObject.SetActive(false);
} }
playerIconButton.onClick.AddListener(async () =>
{
var clone = Instantiate(profilePrefab.gameObject, profilePrefab.gameObject.transform.parent);
clone.SetActive(true);
await clone.GetComponent<ProfileMenu>().Init(message.UserID);
});
optionsButton.onClick.AddListener(() => OptionsButtonClick(message, localUserId ?? 0)); optionsButton.onClick.AddListener(() => OptionsButtonClick(message, localUserId ?? 0));
rowInfo.name = "ChatroomRow_" + message.ID; rowInfo.name = "ChatroomRow_" + message.ID;
var entryComponet = rowInfo.AddComponent<ChatroomMenuEntry>(); var entryComponet = rowInfo.AddComponent<ChatroomMenuEntry>();

View File

@@ -12,7 +12,8 @@ public class ChatroomMenuEntry : MonoBehaviour, IPointerEnterHandler, IPointerEx
{ {
bgImg = bgImgArg; bgImg = bgImgArg;
optionsButton = optionsButtonArg; optionsButton = optionsButtonArg;
bgImg.color = new Color(50f / 255f, 50f / 255f, 50f / 255f); var color = BazookaManager.Instance.GetColorSettingMenuBackground();
bgImg.color = new Color((((float)color[0]) + 26f) / 255f, (((float)color[1]) + 26f) / 255f, (((float)color[2]) + 26f) / 255f);
optionsButton.gameObject.SetActive(false); optionsButton.gameObject.SetActive(false);
} }
@@ -72,13 +73,15 @@ public class ChatroomMenuEntry : MonoBehaviour, IPointerEnterHandler, IPointerEx
private void Activate() private void Activate()
{ {
activeEntry = this; activeEntry = this;
bgImg.color = new Color(60f / 255f, 60f / 255f, 60f / 255f); var color = BazookaManager.Instance.GetColorSettingMenuBackground();
bgImg.color = new Color((((float)color[0]) + 36f) / 255f, (((float)color[1]) + 36f) / 255f, (((float)color[2]) + 36f) / 255f);
optionsButton.gameObject.SetActive(true); optionsButton.gameObject.SetActive(true);
} }
private void Deactivate() private void Deactivate()
{ {
bgImg.color = new Color(50f / 255f, 50f / 255f, 50f / 255f); var color = BazookaManager.Instance.GetColorSettingMenuBackground();
bgImg.color = new Color((((float)color[0]) + 26f) / 255f, (((float)color[1]) + 26f) / 255f, (((float)color[2]) + 26f) / 255f);
optionsButton.gameObject.SetActive(false); optionsButton.gameObject.SetActive(false);
if (activeEntry == this) activeEntry = null; if (activeEntry == this) activeEntry = null;
} }

View File

@@ -16,12 +16,14 @@ public class ColorPanel : MonoBehaviour
public Button resetButton; public Button resetButton;
public Button switchModeButton; public Button switchModeButton;
public event Action<JArray> OnColorChanged; public event Action<JArray> OnColorChanged;
public Color defaultColor;
public void Init(JArray color, Color defaultColor) public void Init(Color color, Color defaultColorArg)
{ {
rSlider.value = (int)color[0]; defaultColor = defaultColorArg;
gSlider.value = (int)color[1]; rSlider.value = color.r * 255f;
bSlider.value = (int)color[2]; gSlider.value = color.g * 255f;
bSlider.value = color.b * 255f;
SyncAll(); SyncAll();
@@ -64,6 +66,12 @@ public class ColorPanel : MonoBehaviour
}; };
} }
public void Init(JArray color, Color defaultColorArg)
{
Init(new Color((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f), defaultColorArg);
}
void SyncAll(bool fromPicker = false) void SyncAll(bool fromPicker = false)
{ {
var col = new Color(rSlider.value / 255f, gSlider.value / 255f, bSlider.value / 255f); var col = new Color(rSlider.value / 255f, gSlider.value / 255f, bSlider.value / 255f);

View File

@@ -1,7 +1,7 @@
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.InputSystem;
using System; using System;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.UI;
public class ColorPickerUI : MonoBehaviour public class ColorPickerUI : MonoBehaviour
{ {

View File

@@ -0,0 +1,158 @@
using Newtonsoft.Json.Linq;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class CustomColorObject : MonoBehaviour
{
public ColorObjectType type;
public bool invert;
public Color addMore;
public bool reverseAdd;
Color ApplyModifiers(Color baseColor)
{
if (invert) baseColor = new(1f - baseColor.r, 1f - baseColor.g, 1f - baseColor.b);
if (reverseAdd)
{
baseColor.r = Mathf.Clamp01(baseColor.r - addMore.r);
baseColor.g = Mathf.Clamp01(baseColor.g - addMore.g);
baseColor.b = Mathf.Clamp01(baseColor.b - addMore.b);
}
else
{
baseColor.r = Mathf.Clamp01(baseColor.r + addMore.r);
baseColor.g = Mathf.Clamp01(baseColor.g + addMore.g);
baseColor.b = Mathf.Clamp01(baseColor.b + addMore.b);
}
return baseColor;
}
public void SetColor()
{
JArray color = null;
Color colorType = Color.white;
Color currentColor = Color.white;
switch (type)
{
case ColorObjectType.InGameBackgroundColor:
color = BazookaManager.Instance.GetColorSettingBackground();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
var obj = gameObject.GetComponent<Camera>();
currentColor = obj.backgroundColor;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj.backgroundColor = currentColor;
break;
case ColorObjectType.MenuBackgroundColor:
color = BazookaManager.Instance.GetColorSettingMenuBackground();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj = gameObject.GetComponent<Camera>();
currentColor = obj.backgroundColor;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj.backgroundColor = currentColor;
break;
case ColorObjectType.MenuBackgroundColorImage:
color = BazookaManager.Instance.GetColorSettingMenuBackground();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
var obj2 = gameObject.GetComponent<Image>();
currentColor = obj2.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj2.color = currentColor;
break;
case ColorObjectType.MenuBackgroundColorText:
color = BazookaManager.Instance.GetColorSettingMenuBackground();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
var obj3 = gameObject.GetComponent<TMP_Text>();
currentColor = obj3.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj3.color = currentColor;
break;
case ColorObjectType.ButtonColor:
color = BazookaManager.Instance.GetColorSettingButton();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj2 = gameObject.GetComponent<Image>();
currentColor = obj2.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj2.color = currentColor;
break;
case ColorObjectType.ButtonColorText:
color = BazookaManager.Instance.GetColorSettingButton();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj3 = gameObject.GetComponent<TMP_Text>();
currentColor = obj3.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj3.color = currentColor;
break;
case ColorObjectType.TextColor:
color = BazookaManager.Instance.GetColorSettingText();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj3 = gameObject.GetComponent<TMP_Text>();
currentColor = obj3.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj3.color = currentColor;
break;
case ColorObjectType.TextColorImage:
color = BazookaManager.Instance.GetColorSettingText();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj2 = gameObject.GetComponent<Image>();
currentColor = obj2.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj2.color = currentColor;
break;
case ColorObjectType.ButtonContentColorImage:
color = BazookaManager.Instance.GetColorSettingButtonContent();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj2 = gameObject.GetComponent<Image>();
currentColor = obj2.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj2.color = currentColor;
break;
case ColorObjectType.ButtonContentColorText:
color = BazookaManager.Instance.GetColorSettingButtonContent();
colorType = new((int)color[0] / 255f, (int)color[1] / 255f, (int)color[2] / 255f);
colorType = ApplyModifiers(colorType);
obj3 = gameObject.GetComponent<TMP_Text>();
currentColor = obj3.color;
currentColor.r = colorType.r;
currentColor.g = colorType.g;
currentColor.b = colorType.b;
obj3.color = currentColor;
break;
}
}
void Start()
{
SetColor();
}
}

Some files were not shown because too many files have changed in this diff Show More