53 Commits
1.8.1 ... 1.8.2

Author SHA1 Message Date
5496a0615d Fix discord rpc still being here 2025-10-07 13:47:56 -07:00
96d927b101 1.8.2 2025-10-07 13:30:23 -07:00
c45b14fb0c Remove Discord RPC (for 1.8.2 only) 2025-10-07 13:16:57 -07:00
efef5f70cc Merge pull request #7 from BerryDash/feat/custom-menu-normalization
Custom Mode Normalization
2025-10-07 12:52:02 -07:00
65c065b375 Improve code 2025-10-07 12:51:48 -07:00
5d9fbcbad7 Fixed normalization
There are some issues but they are really rare so this is good enough
for now.
2025-10-07 12:08:13 -07:00
546858b576 Made it work a bit better
if the amount of berries that are above 0 is an odd amount then it
doesnt work but this is the closest I have gotten to it working.
2025-10-06 20:29:47 -07:00
f1043effbb Made the normalize button kinda work
It removes the percentage signs and sometimes values can be negative but
I'll fix those issues.
2025-10-06 19:39:28 -07:00
7d8e85b159 Fix a error with music volume slider in custom mode 2025-10-06 18:40:44 -07:00
b0e2fcd557 oops 2025-10-06 18:32:57 -07:00
012a67b48c Fix back button not being clickable ever and also fix normalize button being interactable by default 2025-10-06 18:32:14 -07:00
09605c9f50 Disable this, left on by accident 2025-10-06 18:24:10 -07:00
51bf19b02e Add normalization button 2025-10-06 18:23:39 -07:00
e0568cbdde Improve PlayMenu.cs 2025-10-06 18:19:00 -07:00
d38e98c4b3 Oops 2025-10-06 16:08:24 -07:00
2c392271a1 Add some compression for mobile 2025-10-06 16:05:40 -07:00
d7795ba1c3 Remove spookyness 2025-10-06 16:04:37 -07:00
e2f9cecf81 Merge pull request #6 from Thepuppetqueen57/custom-mode-decimal-fix
Made it so you can type decimals in the custom mode menu
2025-10-06 14:16:47 -07:00
011547dbde Made it so you can type decimals in the custom mode menu
Fix was easy af idk why it wasnt already fixed
2025-10-06 14:15:04 -07:00
6b5f3f7159 Update unity 2025-10-03 09:34:42 -07:00
00f6f84e49 Compression for spesific platforms 2025-10-02 21:14:29 -07:00
48483ef2cf Custom menu new pause menu (forgot to add it before) 2025-10-02 09:32:12 -07:00
528f856bf0 Add the pause menu stuff from lite to here 2025-10-02 09:19:10 -07:00
3a474d5bee Update unity 2025-10-02 09:07:08 -07:00
7f057129fc wtf? 2025-09-29 13:18:36 -07:00
1a193f017a Make rpc show that the user is idle when they are idle 2025-09-28 20:43:22 -07:00
2a9e16aeaf And this... 2025-09-28 15:31:42 -07:00
2919aa025f Oops, probably should have committed this lol 2025-09-28 15:29:25 -07:00
02141e09ad Discord RPC
Settings menu does have a rpc but I have changes there and I don't want
to deal with that
2025-09-28 15:29:06 -07:00
6e6c0ad6e5 Fix global fps text being under other objects 2025-09-20 14:01:59 -07:00
32207089b0 Fix icon marketplace purchase/sell sound effect volume not respecting sfx volume 2025-09-20 13:56:23 -07:00
391b082a1b Fix pause edit ui button 2025-09-20 13:51:04 -07:00
55d2e5dbce New unity thing idk what this is 2025-09-20 13:45:41 -07:00
35533e50e3 Fix global fps not respecting show fps setting properly 2025-09-20 13:45:09 -07:00
8f41451bcb Global FPS 2025-09-20 13:30:48 -07:00
f3bf3b694b Update unity 2025-09-20 12:35:19 -07:00
e8baafcca4 Update dependencies 2025-09-18 19:02:07 -07:00
e30d267551 Many more sound tracks! 2025-09-16 19:13:27 -07:00
a8aff4ba4e Disable compression for spooky button 2025-09-16 18:52:35 -07:00
4875ecbcea Add a new soundtrack 2025-09-16 18:52:29 -07:00
cf0c326ba9 Round color picker 2025-09-14 15:42:45 -07:00
f5b60c4cd8 Fix more of scenes not fully using color customization 2025-09-14 15:39:55 -07:00
34c3288c4c Fix profiles having 2 text that isnt linked to color customization 2025-09-14 13:58:52 -07:00
fec6654736 Fix weirdness with icon marketplace still 2025-09-14 07:16:18 -07:00
57227670cd Increase spacing between buttons on icon marketplace menu 2025-09-14 07:11:33 -07:00
601e6bb174 Make icon marketplace options menu use the color customization options 2025-09-14 07:10:48 -07:00
995f5d743b Fix icon not deselecting on sell (if it's selected) 2025-09-14 04:07:51 -07:00
8c6f5f7720 Sell button in icon marketplace 2025-09-14 04:00:55 -07:00
cdfb017156 Update unity 2025-09-14 03:33:19 -07:00
a7c4275fcc Fix a bug where send button gets disabled 2025-09-14 03:33:13 -07:00
f8254f1099 Merge pull request #5 from Thepuppetqueen57/blank-berry
Added a berry that does nothing
2025-09-12 12:55:58 -07:00
d7b6bbd0ab Finish nothing berry 2025-09-12 12:55:18 -07:00
b40e4a5279 Added a berry that does nothing to the custom mode menu
No logic yet but all the logic will be is playing a sound effect. Also
this berry wont be in normal mode.
2025-09-12 12:43:52 -07:00
65 changed files with 12510 additions and 2613 deletions

View File

@@ -3694,6 +3694,7 @@ GameObject:
- component: {fileID: 1167622997025620291} - component: {fileID: 1167622997025620291}
- component: {fileID: 876882204967782266} - component: {fileID: 876882204967782266}
- component: {fileID: 118765789125065141} - component: {fileID: 118765789125065141}
- component: {fileID: 1955232290864071812}
m_Layer: 5 m_Layer: 5
m_Name: LIkes m_Name: LIkes
m_TagString: Untagged m_TagString: Untagged
@@ -3819,6 +3820,22 @@ MonoBehaviour:
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &1955232290864071812
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4105238451168315710}
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 &4168860247108222946 --- !u!1 &4168860247108222946
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5000,6 +5017,7 @@ GameObject:
- component: {fileID: 5216178806115369658} - component: {fileID: 5216178806115369658}
- component: {fileID: 1863013486653065372} - component: {fileID: 1863013486653065372}
- component: {fileID: 8050023119449250430} - component: {fileID: 8050023119449250430}
- component: {fileID: 195419763636993482}
m_Layer: 5 m_Layer: 5
m_Name: VoteText m_Name: VoteText
m_TagString: Untagged m_TagString: Untagged
@@ -5125,6 +5143,22 @@ MonoBehaviour:
m_hasFontAssetChanged: 0 m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0} m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!114 &195419763636993482
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5129944208511820950}
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 &5155218897310535000 --- !u!1 &5155218897310535000
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -75,7 +75,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@@ -122,6 +122,19 @@ TextureImporter:
ignorePlatformSupport: 0 ignorePlatformSupport: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
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

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

Binary file not shown.

View File

@@ -1,23 +0,0 @@
fileFormatVersion: 2
guid: ee2d4248f8eab426087b9c595f0441ea
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
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,41 @@
fileFormatVersion: 2
guid: 9f9fdb72bfef54955a2422ab19db9147
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

Binary file not shown.

View File

@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: 169ad7ab4b30248658ff2476f82c1ccf
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: 35fdbb71c12014b5daa134c85e657f9d
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: 67ffd85c89ca04ee4a03b3f8e585b6d1
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: 2ea90856f6f7748e49eeb7dca4ce4483
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: 0659cf39b39414101be304aeae2ea88f
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -4,6 +4,16 @@ AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 8
defaultSettings: defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2 serializedVersion: 2
loadType: 2 loadType: 2
sampleRateSetting: 0 sampleRateSetting: 0
@@ -12,7 +22,15 @@ AudioImporter:
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
preloadAudioData: 0 preloadAudioData: 0
platformSettingOverrides: {} WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0 forceToMono: 0
normalize: 1 normalize: 1
loadInBackground: 0 loadInBackground: 0

View File

@@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: f3d76631d25024fcba08acfd3576bcd6
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 2
sampleRateSetting: 1
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.79999995
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides:
Standalone:
serializedVersion: 2
loadType: 2
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
preloadAudioData: 0
WebGL:
serializedVersion: 2
loadType: 2
sampleRateSetting: 2
sampleRateOverride: 44100
compressionFormat: 7
quality: 0.59999996
conversionMode: 0
preloadAudioData: 0
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1177,47 +1177,6 @@ MonoBehaviour:
invert: 0 invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0} addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0 reverseAdd: 0
--- !u!21 &109645057
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!1 &112776868 --- !u!1 &112776868
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4076,47 +4035,6 @@ MonoBehaviour:
invert: 0 invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0} addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0 reverseAdd: 0
--- !u!21 &418665077
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!1 &420273259 --- !u!1 &420273259
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -6792,7 +6710,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 919782387} m_Material: {fileID: 1353225702}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -6970,47 +6888,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 912383778} m_GameObject: {fileID: 912383778}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!21 &919782387
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!1 &928270038 --- !u!1 &928270038
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -7152,7 +7029,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 418665077} m_Material: {fileID: 1770507503}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -7936,7 +7813,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 109645057} m_Material: {fileID: 1360333635}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -8076,6 +7953,88 @@ MonoBehaviour:
invert: 0 invert: 0
addMore: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 0} addMore: {r: 0.09411765, g: 0.09411765, b: 0.09411765, a: 0}
reverseAdd: 0 reverseAdd: 0
--- !u!21 &1353225702
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!21 &1360333635
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!1 &1375884349 --- !u!1 &1375884349
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -10421,6 +10380,47 @@ MonoBehaviour:
invert: 0 invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0} addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0 reverseAdd: 0
--- !u!21 &1770507503
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI/RoundedCorners/RoundedCorners
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _OuterUV: {r: 0, g: 0, b: 1, a: 1}
- _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!1 &1784509948 --- !u!1 &1784509948
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

File diff suppressed because it is too large Load Diff

View File

@@ -777,6 +777,168 @@ MonoBehaviour:
invert: 0 invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0} addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0 reverseAdd: 0
--- !u!1 &803467629
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 803467630}
- component: {fileID: 803467634}
- component: {fileID: 803467633}
- component: {fileID: 803467632}
- component: {fileID: 803467631}
m_Layer: 5
m_Name: GlobalFPS
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &803467630
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803467629}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1527575525}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 210, y: -32.5}
m_SizeDelta: {x: 400, y: 45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &803467631
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803467629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 703a7c60af3394e688f2e2bdec342176, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::GlobalFPSText
--- !u!114 &803467632
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803467629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9213dca44899f70ffb449db66c6d1764, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::IgnoreRaycast
--- !u!114 &803467633
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803467629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 3238002687
m_fontColor: {r: 1, g: 1, b: 1, a: 0.7529412}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &803467634
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 803467629}
m_CullTransparentMesh: 1
--- !u!1 &842325108 --- !u!1 &842325108
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1267,6 +1429,108 @@ MonoBehaviour:
invert: 0 invert: 0
addMore: {r: 0, g: 0, b: 0, a: 0} addMore: {r: 0, g: 0, b: 0, a: 0}
reverseAdd: 0 reverseAdd: 0
--- !u!1 &1527575521
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1527575525}
- component: {fileID: 1527575524}
- component: {fileID: 1527575523}
- component: {fileID: 1527575522}
m_Layer: 5
m_Name: GlobalFPSCanvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1527575522
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527575521}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &1527575523
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527575521}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1280, y: 720}
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 1
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1527575524
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527575521}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 9999
m_TargetDisplay: 0
--- !u!224 &1527575525
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1527575521}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 803467630}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1 &1547097372 --- !u!1 &1547097372
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1319,4 +1583,5 @@ SceneRoots:
- {fileID: 842325110} - {fileID: 842325110}
- {fileID: 1547097374} - {fileID: 1547097374}
- {fileID: 734849810} - {fileID: 734849810}
- {fileID: 1527575525}
- {fileID: 759356942} - {fileID: 759356942}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -237,7 +237,7 @@ public class ChatroomMenu : MonoBehaviour
async Task HandleMessageSubmit() async Task HandleMessageSubmit()
{ {
if (!sendButton.interactable) return; if (!sendButton.interactable || messageInputField.text.Trim().Length == 0) return;
backButton.interactable = false; backButton.interactable = false;
var text = messageInputField.text.Clone() as string; var text = messageInputField.text.Clone() as string;
messageInputField.text = string.Empty; messageInputField.text = string.Empty;
@@ -263,27 +263,19 @@ public class ChatroomMenu : 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")
{ {
backButton.interactable = true;
ShowStatus("Server error while fetching data"); ShowStatus("Server error while fetching data");
return;
} }
else if (response == "-998") else if (response == "-998")
{ {
backButton.interactable = true;
ShowStatus("Client version too outdated to access servers"); ShowStatus("Client version too outdated to access servers");
return;
} }
else if (response == "-997") else if (response == "-997")
{ {
backButton.interactable = true;
ShowStatus("Encryption/decryption issues"); ShowStatus("Encryption/decryption issues");
return;
} }
else if (response == "-996") else if (response == "-996")
{ {
backButton.interactable = true;
ShowStatus("Can't send requests on self-built instance"); ShowStatus("Can't send requests on self-built instance");
return;
} }
else else
{ {

View File

@@ -24,9 +24,7 @@ public class CustomGamePlayer : MonoBehaviour
public GameObject pausePanel; public GameObject pausePanel;
public Rigidbody2D rb; public Rigidbody2D rb;
public AudioSource backgroundMusic; public AudioSource backgroundMusic;
public TMP_Text fpsCounter;
private float nextUpdate; private float nextUpdate;
private float fps;
public SpriteRenderer overlayRender; public SpriteRenderer overlayRender;
private float lastMoveTime; private float lastMoveTime;
public GameObject berryParent; public GameObject berryParent;
@@ -45,6 +43,7 @@ public class CustomGamePlayer : MonoBehaviour
private float speedyBerryChance; private float speedyBerryChance;
private float randomBerryChance; private float randomBerryChance;
private float antiBerryChance; private float antiBerryChance;
private float nothingBerryChance;
void Start() void Start()
{ {
@@ -61,6 +60,7 @@ public class CustomGamePlayer : MonoBehaviour
speedyBerryChance = customGameTempData.speedyBerryChance; speedyBerryChance = customGameTempData.speedyBerryChance;
randomBerryChance = customGameTempData.randomBerryChance; randomBerryChance = customGameTempData.randomBerryChance;
antiBerryChance = customGameTempData.antiBerryChance; antiBerryChance = customGameTempData.antiBerryChance;
nothingBerryChance = customGameTempData.nothingBerryChance;
Destroy(customGameTempData.gameObject); Destroy(customGameTempData.gameObject);
var backgroundColor = BazookaManager.Instance.GetColorSettingBackground(); var backgroundColor = BazookaManager.Instance.GetColorSettingBackground();
@@ -389,6 +389,13 @@ public class CustomGamePlayer : MonoBehaviour
newBerry.tag = "AntiBerry"; newBerry.tag = "AntiBerry";
goto finish; goto finish;
} }
cumulative += nothingBerryChance / 100f;
if (spawnProbability <= cumulative)
{
spriteRenderer.sprite = Resources.Load<Sprite>("Berries/BerryNoColor");
newBerry.tag = "NothingBerry";
goto finish;
}
finish: finish:
spriteRenderer.sortingOrder = -5; spriteRenderer.sortingOrder = -5;
@@ -408,12 +415,6 @@ public class CustomGamePlayer : MonoBehaviour
{ {
audio.pitch = speedyLeft > 0f ? 1.3f : 1f; audio.pitch = speedyLeft > 0f ? 1.3f : 1f;
} }
if (BazookaManager.Instance.GetSettingShowFPS() && Time.time > nextUpdate)
{
fps = 1f / Time.deltaTime;
fpsCounter.text = "FPS: " + Mathf.Round(fps);
nextUpdate = Time.time + 0.25f;
}
if (screenWidth != Camera.main.orthographicSize * 2f * Camera.main.aspect) if (screenWidth != Camera.main.orthographicSize * 2f * Camera.main.aspect)
{ {
screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect; screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect;
@@ -438,6 +439,7 @@ public class CustomGamePlayer : MonoBehaviour
GameObject[] speedyBerries = GameObject.FindGameObjectsWithTag("SpeedyBerry"); GameObject[] speedyBerries = GameObject.FindGameObjectsWithTag("SpeedyBerry");
GameObject[] randomBerries = GameObject.FindGameObjectsWithTag("RandomBerry"); GameObject[] randomBerries = GameObject.FindGameObjectsWithTag("RandomBerry");
GameObject[] antiBerries = GameObject.FindGameObjectsWithTag("AntiBerry"); GameObject[] antiBerries = GameObject.FindGameObjectsWithTag("AntiBerry");
GameObject[] nothingBerries = GameObject.FindGameObjectsWithTag("NothingBerry");
if (!pausePanel.activeSelf) if (!pausePanel.activeSelf)
{ {
@@ -587,6 +589,25 @@ public class CustomGamePlayer : MonoBehaviour
antiBerry.GetComponent<Rigidbody2D>().linearVelocity = new UnityEngine.Vector2(0f, -4f); antiBerry.GetComponent<Rigidbody2D>().linearVelocity = new UnityEngine.Vector2(0f, -4f);
} }
} }
foreach (GameObject nothingBerry in nothingBerries)
{
if (nothingBerry.transform.position.y < 0f - Camera.main.orthographicSize - 1f)
{
Destroy(nothingBerry);
}
else if (UnityEngine.Vector3.Distance(bird.transform.position, nothingBerry.transform.position) < 1.5f)
{
DoNothingBerry(nothingBerry);
}
if (speedyLeft > 0)
{
nothingBerry.GetComponent<Rigidbody2D>().linearVelocity = new UnityEngine.Vector2(0f, -7.5f);
}
else
{
nothingBerry.GetComponent<Rigidbody2D>().linearVelocity = new UnityEngine.Vector2(0f, -4f);
}
}
} }
else else
{ {
@@ -599,6 +620,7 @@ public class CustomGamePlayer : MonoBehaviour
.Concat(speedyBerries) .Concat(speedyBerries)
.Concat(randomBerries) .Concat(randomBerries)
.Concat(antiBerries) .Concat(antiBerries)
.Concat(nothingBerries)
.ToArray(); .ToArray();
foreach (GameObject berry in allberries) foreach (GameObject berry in allberries)
{ {
@@ -628,6 +650,7 @@ public class CustomGamePlayer : MonoBehaviour
.Concat(GameObject.FindGameObjectsWithTag("SpeedyBerry")) .Concat(GameObject.FindGameObjectsWithTag("SpeedyBerry"))
.Concat(GameObject.FindGameObjectsWithTag("RandomBerry")) .Concat(GameObject.FindGameObjectsWithTag("RandomBerry"))
.Concat(GameObject.FindGameObjectsWithTag("AntiBerry")) .Concat(GameObject.FindGameObjectsWithTag("AntiBerry"))
.Concat(GameObject.FindGameObjectsWithTag("NothingBerry"))
.ToArray(); .ToArray();
foreach (GameObject berry in allberries) foreach (GameObject berry in allberries)
{ {
@@ -764,4 +787,10 @@ public class CustomGamePlayer : MonoBehaviour
antiLeft = 10f; antiLeft = 10f;
UpdateStats(0, 0); UpdateStats(0, 0);
} }
void DoNothingBerry(GameObject berry)
{
AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume());
Destroy(berry);
}
} }

View File

@@ -1,3 +1,4 @@
using System.Text;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -7,14 +8,10 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
public static CustomGamePlayerPauseMenu Instance; public static CustomGamePlayerPauseMenu Instance;
public Button backButton; public Button backButton;
public Button continueButton; public Button continueButton;
public Button statsButton;
public Button editUiButton; public Button editUiButton;
public Button resetUiButton; public Button resetUiButton;
public AudioSource songLoop; public AudioSource songLoop;
public Slider musicSlider;
public Slider sfxSlider;
public TMP_Text musicSliderText;
public TMP_Text sfxSliderText;
public TMP_Text fpsText;
public TMP_Text scoreText; public TMP_Text scoreText;
public TMP_Text boostText; public TMP_Text boostText;
public Button pauseButton; public Button pauseButton;
@@ -24,11 +21,21 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
public Button leftButton; public Button leftButton;
internal bool editingUI = false; internal bool editingUI = false;
public GameObject statsMenu;
public Button statsMenuExitButton;
public TMP_Text statsText;
public Toggle settingFullscreenToggle;
public Toggle settingVSyncToggle;
public Toggle settingRandomMusicToggle;
public Slider musicSlider;
public Slider sfxSlider;
public TMP_Text musicSliderText;
public TMP_Text sfxSliderText;
void Awake() void Awake()
{ {
Instance = this; Instance = this;
musicSlider.value = BazookaManager.Instance.GetSettingMusicVolume();
sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume();
continueButton.onClick.AddListener(CustomGamePlayer.instance.DisablePause); continueButton.onClick.AddListener(CustomGamePlayer.instance.DisablePause);
musicSlider.onValueChanged.AddListener(value => musicSlider.onValueChanged.AddListener(value =>
{ {
@@ -45,10 +52,8 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
}); });
resetUiButton.onClick.AddListener(() => resetUiButton.onClick.AddListener(() =>
{ {
((RectTransform)fpsText.transform).anchoredPosition = new Vector2(210f, -35f);
((RectTransform)scoreText.transform).anchoredPosition = new Vector2(0f, -70f); ((RectTransform)scoreText.transform).anchoredPosition = new Vector2(0f, -70f);
((RectTransform)boostText.transform).anchoredPosition = new Vector2(0f, -190f); ((RectTransform)boostText.transform).anchoredPosition = new Vector2(0f, -190f);
PlayerPrefs.DeleteKey("DraggedUIFPSText");
PlayerPrefs.DeleteKey("DraggedUIScoreText"); PlayerPrefs.DeleteKey("DraggedUIScoreText");
PlayerPrefs.DeleteKey("DraggedUIBoostTextCustom"); PlayerPrefs.DeleteKey("DraggedUIBoostTextCustom");
if (Application.isMobilePlatform) if (Application.isMobilePlatform)
@@ -65,6 +70,60 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
PlayerPrefs.DeleteKey("DraggedUILeftButton"); PlayerPrefs.DeleteKey("DraggedUILeftButton");
} }
}); });
statsButton.onClick.AddListener(() =>
{
statsMenu.SetActive(true);
var text = new StringBuilder();
text.AppendLine("High Score: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreHighScore()));
text.AppendLine("Total Normal Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalNormalBerries()));
text.AppendLine("Total Poison Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalPoisonBerries()));
text.AppendLine("Total Slow Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSlowBerries()));
text.AppendLine("Total Ultra Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalUltraBerries()));
text.AppendLine("Total Speedy Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSpeedyBerries()));
text.AppendLine("Total Random Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalRandomBerries()));
text.AppendLine("Total Anti Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAntiBerries()));
text.AppendLine("Total Attempts: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAttepts()));
statsText.text = text.ToString();
});
statsMenuExitButton.onClick.AddListener(() =>
{
statsMenu.SetActive(false);
statsText.text = string.Empty;
});
musicSlider.value = BazookaManager.Instance.GetSettingMusicVolume();
sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume();
if (!Application.isMobilePlatform)
{
settingFullscreenToggle.isOn = BazookaManager.Instance.GetSettingFullScreen() == true;
settingVSyncToggle.isOn = BazookaManager.Instance.GetSettingVsync() == true;
settingRandomMusicToggle.isOn = BazookaManager.Instance.GetSettingRandomMusic() == true;
settingFullscreenToggle.onValueChanged.AddListener(value =>
{
BazookaManager.Instance.SetSettingFullScreen(value);
var width = Display.main.systemWidth;
var height = Display.main.systemHeight;
Screen.SetResolution(width, height, value);
});
settingVSyncToggle.onValueChanged.AddListener(value =>
{
BazookaManager.Instance.SetSettingVsync(value);
QualitySettings.vSyncCount = value ? 1 : -1;
});
}
else
{
settingFullscreenToggle.interactable = false;
settingVSyncToggle.interactable = false;
settingRandomMusicToggle.isOn = BazookaManager.Instance.GetSettingRandomMusic() == true;
}
settingRandomMusicToggle.onValueChanged.AddListener(value => BazookaManager.Instance.SetSettingRandomMusic(value));
musicSlider.onValueChanged.AddListener(value =>
{
BazookaManager.Instance.SetSettingMusicVolume(value);
CustomGamePlayer.instance.backgroundMusic.volume = value;
});
sfxSlider.onValueChanged.AddListener(value => BazookaManager.Instance.SetSettingSFXVolume(value));
} }
public void ToggleEditingUI() public void ToggleEditingUI()
@@ -72,13 +131,16 @@ public class CustomGamePlayerPauseMenu : MonoBehaviour
editingUI = !editingUI; editingUI = !editingUI;
musicSlider.gameObject.SetActive(!musicSlider.gameObject.activeSelf); musicSlider.gameObject.SetActive(!musicSlider.gameObject.activeSelf);
sfxSlider.gameObject.SetActive(!sfxSlider.gameObject.activeSelf); sfxSlider.gameObject.SetActive(!sfxSlider.gameObject.activeSelf);
musicSliderText.gameObject.SetActive(musicSlider.gameObject.activeSelf); musicSliderText.gameObject.SetActive(!musicSliderText.gameObject.activeSelf);
sfxSliderText.gameObject.SetActive(sfxSlider.gameObject.activeSelf); sfxSliderText.gameObject.SetActive(!sfxSliderText.gameObject.activeSelf);
settingFullscreenToggle.gameObject.SetActive(!settingFullscreenToggle.gameObject.activeSelf);
settingVSyncToggle.gameObject.SetActive(!settingVSyncToggle.gameObject.activeSelf);
settingRandomMusicToggle.gameObject.SetActive(!settingRandomMusicToggle.gameObject.activeSelf);
backButton.gameObject.SetActive(!backButton.gameObject.activeSelf); backButton.gameObject.SetActive(!backButton.gameObject.activeSelf);
continueButton.gameObject.SetActive(!continueButton.gameObject.activeSelf); continueButton.gameObject.SetActive(!continueButton.gameObject.activeSelf);
statsButton.gameObject.SetActive(!statsButton.gameObject.activeSelf);
editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text = editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text == "Edit UI" ? "Done" : "Edit UI"; editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text = editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text == "Edit UI" ? "Done" : "Edit UI";
resetUiButton.gameObject.SetActive(!resetUiButton.gameObject.activeSelf); resetUiButton.gameObject.SetActive(!resetUiButton.gameObject.activeSelf);
fpsText.GetComponent<DraggableUI>().canDrag = !fpsText.GetComponent<DraggableUI>().canDrag;
scoreText.GetComponent<DraggableUI>().canDrag = !scoreText.GetComponent<DraggableUI>().canDrag; scoreText.GetComponent<DraggableUI>().canDrag = !scoreText.GetComponent<DraggableUI>().canDrag;
boostText.GetComponent<DraggableUI>().canDrag = !boostText.GetComponent<DraggableUI>().canDrag; boostText.GetComponent<DraggableUI>().canDrag = !boostText.GetComponent<DraggableUI>().canDrag;
if (Application.isMobilePlatform) if (Application.isMobilePlatform)

View File

@@ -9,6 +9,7 @@ public class CustomGameTempData : MonoBehaviour
public float speedyBerryChance; public float speedyBerryChance;
public float randomBerryChance; public float randomBerryChance;
public float antiBerryChance; public float antiBerryChance;
public float nothingBerryChance;
void Awake() void Awake()
{ {

View File

@@ -37,9 +37,7 @@ public class GamePlayer : MonoBehaviour
public GameObject pausePanel; public GameObject pausePanel;
public Rigidbody2D rb; public Rigidbody2D rb;
public AudioSource backgroundMusic; public AudioSource backgroundMusic;
public TMP_Text fpsCounter;
private float nextUpdate; private float nextUpdate;
private float fps;
public SpriteRenderer overlayRender; public SpriteRenderer overlayRender;
private float lastMoveTime; private float lastMoveTime;
public GameObject berryParent; public GameObject berryParent;
@@ -398,12 +396,6 @@ public class GamePlayer : MonoBehaviour
{ {
audio.pitch = speedyLeft > 0f ? 1.3f : 1f; audio.pitch = speedyLeft > 0f ? 1.3f : 1f;
} }
if (BazookaManager.Instance.GetSettingShowFPS() && Time.time > nextUpdate)
{
fps = 1f / Time.deltaTime;
fpsCounter.text = "FPS: " + Mathf.Round(fps);
nextUpdate = Time.time + 0.25f;
}
if (screenWidth != Camera.main.orthographicSize * 2f * Camera.main.aspect) if (screenWidth != Camera.main.orthographicSize * 2f * Camera.main.aspect)
{ {
screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect; screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect;

View File

@@ -1,3 +1,4 @@
using System.Text;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -7,14 +8,10 @@ public class GamePlayerPauseMenu : MonoBehaviour
public static GamePlayerPauseMenu Instance; public static GamePlayerPauseMenu Instance;
public Button backButton; public Button backButton;
public Button continueButton; public Button continueButton;
public Button statsButton;
public Button editUiButton; public Button editUiButton;
public Button resetUiButton; public Button resetUiButton;
public AudioSource songLoop; public AudioSource songLoop;
public Slider musicSlider;
public Slider sfxSlider;
public TMP_Text musicSliderText;
public TMP_Text sfxSliderText;
public TMP_Text fpsText;
public TMP_Text scoreText; public TMP_Text scoreText;
public TMP_Text highScoreText; public TMP_Text highScoreText;
public TMP_Text boostText; public TMP_Text boostText;
@@ -26,11 +23,21 @@ public class GamePlayerPauseMenu : MonoBehaviour
public Button leftButton; public Button leftButton;
internal bool editingUI = false; internal bool editingUI = false;
public GameObject statsMenu;
public Button statsMenuExitButton;
public TMP_Text statsText;
public Toggle settingFullscreenToggle;
public Toggle settingVSyncToggle;
public Toggle settingRandomMusicToggle;
public Slider musicSlider;
public Slider sfxSlider;
public TMP_Text musicSliderText;
public TMP_Text sfxSliderText;
void Awake() void Awake()
{ {
Instance = this; Instance = this;
musicSlider.value = BazookaManager.Instance.GetSettingMusicVolume();
sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume();
continueButton.onClick.AddListener(GamePlayer.instance.DisablePause); continueButton.onClick.AddListener(GamePlayer.instance.DisablePause);
musicSlider.onValueChanged.AddListener(value => musicSlider.onValueChanged.AddListener(value =>
{ {
@@ -47,12 +54,10 @@ public class GamePlayerPauseMenu : MonoBehaviour
}); });
resetUiButton.onClick.AddListener(() => resetUiButton.onClick.AddListener(() =>
{ {
((RectTransform)fpsText.transform).anchoredPosition = new Vector2(210f, -35f);
((RectTransform)scoreText.transform).anchoredPosition = new Vector2(0f, -70f); ((RectTransform)scoreText.transform).anchoredPosition = new Vector2(0f, -70f);
((RectTransform)highScoreText.transform).anchoredPosition = new Vector2(0f, -140f); ((RectTransform)highScoreText.transform).anchoredPosition = new Vector2(0f, -140f);
((RectTransform)boostText.transform).anchoredPosition = new Vector2(0f, -190f); ((RectTransform)boostText.transform).anchoredPosition = new Vector2(0f, -190f);
((RectTransform)coinsText.transform).anchoredPosition = new Vector2(260f, 47.5f); ((RectTransform)coinsText.transform).anchoredPosition = new Vector2(260f, 47.5f);
PlayerPrefs.DeleteKey("DraggedUIFPSText");
PlayerPrefs.DeleteKey("DraggedUIScoreText"); PlayerPrefs.DeleteKey("DraggedUIScoreText");
PlayerPrefs.DeleteKey("DraggedUIHighScoreText"); PlayerPrefs.DeleteKey("DraggedUIHighScoreText");
PlayerPrefs.DeleteKey("DraggedUIBoostText"); PlayerPrefs.DeleteKey("DraggedUIBoostText");
@@ -71,6 +76,60 @@ public class GamePlayerPauseMenu : MonoBehaviour
PlayerPrefs.DeleteKey("DraggedUILeftButton"); PlayerPrefs.DeleteKey("DraggedUILeftButton");
} }
}); });
statsButton.onClick.AddListener(() =>
{
statsMenu.SetActive(true);
var text = new StringBuilder();
text.AppendLine("High Score: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreHighScore()));
text.AppendLine("Total Normal Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalNormalBerries()));
text.AppendLine("Total Poison Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalPoisonBerries()));
text.AppendLine("Total Slow Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSlowBerries()));
text.AppendLine("Total Ultra Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalUltraBerries()));
text.AppendLine("Total Speedy Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalSpeedyBerries()));
text.AppendLine("Total Random Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalRandomBerries()));
text.AppendLine("Total Anti Berries: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAntiBerries()));
text.AppendLine("Total Attempts: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAttepts()));
statsText.text = text.ToString();
});
statsMenuExitButton.onClick.AddListener(() =>
{
statsMenu.SetActive(false);
statsText.text = string.Empty;
});
musicSlider.value = BazookaManager.Instance.GetSettingMusicVolume();
sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume();
if (!Application.isMobilePlatform)
{
settingFullscreenToggle.isOn = BazookaManager.Instance.GetSettingFullScreen() == true;
settingVSyncToggle.isOn = BazookaManager.Instance.GetSettingVsync() == true;
settingRandomMusicToggle.isOn = BazookaManager.Instance.GetSettingRandomMusic() == true;
settingFullscreenToggle.onValueChanged.AddListener(value =>
{
BazookaManager.Instance.SetSettingFullScreen(value);
var width = Display.main.systemWidth;
var height = Display.main.systemHeight;
Screen.SetResolution(width, height, value);
});
settingVSyncToggle.onValueChanged.AddListener(value =>
{
BazookaManager.Instance.SetSettingVsync(value);
QualitySettings.vSyncCount = value ? 1 : -1;
});
}
else
{
settingFullscreenToggle.interactable = false;
settingVSyncToggle.interactable = false;
settingRandomMusicToggle.isOn = BazookaManager.Instance.GetSettingRandomMusic() == true;
}
settingRandomMusicToggle.onValueChanged.AddListener(value => BazookaManager.Instance.SetSettingRandomMusic(value));
musicSlider.onValueChanged.AddListener(value =>
{
BazookaManager.Instance.SetSettingMusicVolume(value);
GamePlayer.instance.backgroundMusic.volume = value;
});
sfxSlider.onValueChanged.AddListener(value => BazookaManager.Instance.SetSettingSFXVolume(value));
} }
public void ToggleEditingUI() public void ToggleEditingUI()
@@ -78,13 +137,16 @@ public class GamePlayerPauseMenu : MonoBehaviour
editingUI = !editingUI; editingUI = !editingUI;
musicSlider.gameObject.SetActive(!musicSlider.gameObject.activeSelf); musicSlider.gameObject.SetActive(!musicSlider.gameObject.activeSelf);
sfxSlider.gameObject.SetActive(!sfxSlider.gameObject.activeSelf); sfxSlider.gameObject.SetActive(!sfxSlider.gameObject.activeSelf);
musicSliderText.gameObject.SetActive(musicSlider.gameObject.activeSelf); musicSliderText.gameObject.SetActive(!musicSliderText.gameObject.activeSelf);
sfxSliderText.gameObject.SetActive(sfxSlider.gameObject.activeSelf); sfxSliderText.gameObject.SetActive(!sfxSliderText.gameObject.activeSelf);
settingFullscreenToggle.gameObject.SetActive(!settingFullscreenToggle.gameObject.activeSelf);
settingVSyncToggle.gameObject.SetActive(!settingVSyncToggle.gameObject.activeSelf);
settingRandomMusicToggle.gameObject.SetActive(!settingRandomMusicToggle.gameObject.activeSelf);
backButton.gameObject.SetActive(!backButton.gameObject.activeSelf); backButton.gameObject.SetActive(!backButton.gameObject.activeSelf);
continueButton.gameObject.SetActive(!continueButton.gameObject.activeSelf); continueButton.gameObject.SetActive(!continueButton.gameObject.activeSelf);
statsButton.gameObject.SetActive(!statsButton.gameObject.activeSelf);
editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text = editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text == "Edit UI" ? "Done" : "Edit UI"; editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text = editUiButton.transform.GetChild(0).GetComponent<TMP_Text>().text == "Edit UI" ? "Done" : "Edit UI";
resetUiButton.gameObject.SetActive(!resetUiButton.gameObject.activeSelf); resetUiButton.gameObject.SetActive(!resetUiButton.gameObject.activeSelf);
fpsText.GetComponent<DraggableUI>().canDrag = !fpsText.GetComponent<DraggableUI>().canDrag;
scoreText.GetComponent<DraggableUI>().canDrag = !scoreText.GetComponent<DraggableUI>().canDrag; scoreText.GetComponent<DraggableUI>().canDrag = !scoreText.GetComponent<DraggableUI>().canDrag;
highScoreText.GetComponent<DraggableUI>().canDrag = !highScoreText.GetComponent<DraggableUI>().canDrag; highScoreText.GetComponent<DraggableUI>().canDrag = !highScoreText.GetComponent<DraggableUI>().canDrag;
boostText.GetComponent<DraggableUI>().canDrag = !boostText.GetComponent<DraggableUI>().canDrag; boostText.GetComponent<DraggableUI>().canDrag = !boostText.GetComponent<DraggableUI>().canDrag;

View File

@@ -0,0 +1,42 @@
using TMPro;
using UnityEngine;
[RequireComponent(typeof(TMP_Text))]
public class GlobalFPSText : MonoBehaviour
{
private TMP_Text text;
private float timer;
private int frames;
private float fps;
void Awake()
{
if (FindObjectsByType<GlobalFPSText>(FindObjectsSortMode.None).Length > 1)
{
Destroy(gameObject.transform.parent.gameObject);
return;
}
DontDestroyOnLoad(transform.parent.gameObject);
text = GetComponent<TMP_Text>();
}
void Update()
{
var enabled = BazookaManager.Instance.GetSettingShowFPS();
if (!enabled && text.text != "")
{
text.text = "";
return;
}
else if (!enabled) return;
frames++;
timer += Time.unscaledDeltaTime;
if (timer >= 0.25f)
{
fps = frames / timer;
text.text = "FPS: " + Mathf.RoundToInt(fps);
frames = 0;
timer = 0;
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 703a7c60af3394e688f2e2bdec342176

View File

@@ -190,36 +190,49 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
newIcon.transform.GetChild(2).GetComponent<TMP_Text>().text = "Price " + Tools.FormatWithCommas(entry.Price) + " coins"; newIcon.transform.GetChild(2).GetComponent<TMP_Text>().text = "Price " + Tools.FormatWithCommas(entry.Price) + " coins";
newIcon.transform.GetChild(3).GetComponent<TMP_Text>().text = "Designer Name: " + entry.CreatorUsername; newIcon.transform.GetChild(3).GetComponent<TMP_Text>().text = "Designer Name: " + entry.CreatorUsername;
var btn = newIcon.transform.GetChild(4).GetComponent<Button>(); var btnGrid = newIcon.transform.GetChild(4);
var btnText = btn.transform.GetChild(0).GetComponent<TMP_Text>(); var buybtn = btnGrid.transform.GetChild(0).GetComponent<Button>();
var sellbtn = btnGrid.transform.GetChild(1).GetComponent<Button>();
var buyttnText = buybtn.transform.GetChild(0).GetComponent<TMP_Text>();
sellbtn.onClick.AddListener(() =>
{
HandleSell(entry, buybtn, buyttnText, sellbtn, localUserID);
Tools.RefreshHierarchy(newIcon);
});
buybtn.onClick.AddListener(() =>
{
HandlePurchase(entry, buybtn, sellbtn, localUserID);
Tools.RefreshHierarchy(newIcon);
});
bool alreadyBought = BazookaManager.Instance.GetCustomBirdIconData().Data.Any(d => d.UUID == entry.UUID); bool alreadyBought = BazookaManager.Instance.GetCustomBirdIconData().Data.Any(d => d.UUID == entry.UUID);
if (alreadyBought) if (alreadyBought)
{ {
btn.interactable = false; buybtn.interactable = false;
if (localUserID != entry.CreatorUserID) if (localUserID != entry.CreatorUserID)
{ {
btnText.text = "Purchased"; buyttnText.text = "Purchased";
sellbtn.gameObject.SetActive(true);
} }
else else
{ {
btnText.text = "Claimed"; buyttnText.text = "Claimed";
} }
} }
else else
{ {
btn.onClick.AddListener(() => HandlePurchase(entry, btn, localUserID));
if (localUserID != entry.CreatorUserID) if (localUserID != entry.CreatorUserID)
{ {
btnText.text = "Purchase"; buyttnText.text = "Purchase";
} }
else else
{ {
btnText.text = "Claim"; buyttnText.text = "Claim";
} }
} }
newIcon.SetActive(true); newIcon.SetActive(true);
Tools.RefreshHierarchy(newIcon);
} }
} }
refreshButton.interactable = true; refreshButton.interactable = true;
@@ -227,7 +240,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
backButton.interactable = true; backButton.interactable = true;
} }
void HandlePurchase(MarketplaceIconType data, Button button, BigInteger? localUserID) void HandlePurchase(MarketplaceIconType data, Button button, Button sellButton, BigInteger? localUserID)
{ {
button.interactable = false; button.interactable = false;
MarketplaceIconStorageType marketplaceIconStorage = BazookaManager.Instance.GetCustomBirdIconData(); MarketplaceIconStorageType marketplaceIconStorage = BazookaManager.Instance.GetCustomBirdIconData();
@@ -249,6 +262,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
if (localUserID != data.CreatorUserID) if (localUserID != data.CreatorUserID)
{ {
button.transform.GetChild(0).GetComponent<TMP_Text>().text = "Purchased"; button.transform.GetChild(0).GetComponent<TMP_Text>().text = "Purchased";
sellButton.gameObject.SetActive(true);
} }
else else
{ {
@@ -258,6 +272,34 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour
BazookaManager.Instance.SetCustomBirdIconData(marketplaceIconStorage); BazookaManager.Instance.SetCustomBirdIconData(marketplaceIconStorage);
} }
void HandleSell(MarketplaceIconType data, Button buyBtn, TMP_Text buyttnText, Button sellButton, BigInteger? localUserID)
{
MarketplaceIconStorageType marketplaceIconStorage = BazookaManager.Instance.GetCustomBirdIconData();
var list = marketplaceIconStorage.Data.ToList();
var owned = list.FirstOrDefault(d => d.UUID == data.UUID);
if (owned != null)
{
list.Remove(owned);
marketplaceIconStorage.Data = list.ToArray();
marketplaceIconStorage.Balance += data.Price;
if (data.UUID == marketplaceIconStorage.Selected) marketplaceIconStorage.Selected = null;
iconPurchaseSound.Stop();
iconPurchaseSound.Play();
balanceText.text = "You have " + Tools.FormatWithCommas(marketplaceIconStorage.Balance) + " coins to spend";
BazookaManager.Instance.SetCustomBirdIconData(marketplaceIconStorage);
if (localUserID != data.CreatorUserID)
{
buyttnText.text = "Purchase";
}
else
{
buyttnText.text = "Claim";
}
buyBtn.interactable = true;
sellButton.gameObject.SetActive(false);
}
}
void ShowStatus(string content) void ShowStatus(string content)
{ {
if (content == null) if (content == null)

View File

@@ -17,6 +17,7 @@ public class IconMarketplaceManager : MonoBehaviour
void Start() void Start()
{ {
downloadPanelScript.iconPurchaseSound.volume = BazookaManager.Instance.GetSettingSFXVolume();
downloadButton.onClick.AddListener(() => SwitchPanel(1)); downloadButton.onClick.AddListener(() => SwitchPanel(1));
if (BazookaManager.Instance.GetAccountID() != null && BazookaManager.Instance.GetAccountName() != null && BazookaManager.Instance.GetAccountSession() != null) if (BazookaManager.Instance.GetAccountID() != null && BazookaManager.Instance.GetAccountName() != null && BazookaManager.Instance.GetAccountSession() != null)
{ {

View File

@@ -1,5 +1,4 @@
using System; using System;
using System.Collections;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
@@ -7,27 +6,32 @@ using UnityEngine.UI;
public class PlayMenu : MonoBehaviour public class PlayMenu : MonoBehaviour
{ {
private static WaitForSeconds _waitForSeconds7 = new WaitForSeconds(7); [SerializeField] private GameObject selectionMenu;
private static WaitForSeconds _waitForSeconds3 = new WaitForSeconds(3); [SerializeField] private GameObject customMenu;
public GameObject selectionMenu; [SerializeField] private Button customButton;
public GameObject customMenu; [SerializeField] private Button customBackButton;
public Button customButton; [SerializeField] private Button customPlayButton;
public Button customBackButton; [SerializeField] private Button customNormalizeButton;
public Button customPlayButton;
public TMP_InputField normalBerryChance; [SerializeField] private TMP_InputField normalBerryChance;
public TMP_InputField poisonBerryChance; [SerializeField] private TMP_InputField poisonBerryChance;
public TMP_InputField slowBerryChance; [SerializeField] private TMP_InputField slowBerryChance;
public TMP_InputField ultraBerryChance; [SerializeField] private TMP_InputField ultraBerryChance;
public TMP_InputField speedyBerryChance; [SerializeField] private TMP_InputField speedyBerryChance;
public TMP_InputField randomBerryChance; [SerializeField] private TMP_InputField randomBerryChance;
public TMP_InputField antiBerryChance; [SerializeField] private TMP_InputField antiBerryChance;
[SerializeField] private TMP_InputField nothingBerryChance;
public TMP_Text validateTotalText; [SerializeField] private TMP_Text validateTotalText;
public Image jumpscareImage; private readonly float defaultNormalBerryChance = 47.5f;
public AudioSource jumpscareAudio; private readonly float defaultPoisonBerryChance = 12.5f;
public Button jumpscareButton; private readonly float defaultSlowBerryChance = 10f;
private readonly float defaultUltraBerryChance = 10f;
private readonly float defaultSpeedyBerryChance = 10f;
private readonly float defaultRandomBerryChance = 5f;
private readonly float defaultAntiBerryChance = 5f;
private readonly float defaultNothingBerryChance = 0f;
void Awake() void Awake()
{ {
@@ -41,13 +45,113 @@ public class PlayMenu : MonoBehaviour
customMenu.SetActive(false); customMenu.SetActive(false);
selectionMenu.SetActive(true); selectionMenu.SetActive(true);
normalBerryChance.text = "47.5%"; normalBerryChance.text = defaultNormalBerryChance.ToString();
poisonBerryChance.text = "12.5%"; poisonBerryChance.text = defaultPoisonBerryChance.ToString();
slowBerryChance.text = "10%"; slowBerryChance.text = defaultSlowBerryChance.ToString();
ultraBerryChance.text = "10%"; ultraBerryChance.text = defaultUltraBerryChance.ToString();
speedyBerryChance.text = "10%"; speedyBerryChance.text = defaultSpeedyBerryChance.ToString();
randomBerryChance.text = "5%"; randomBerryChance.text = defaultRandomBerryChance.ToString();
antiBerryChance.text = "5%"; antiBerryChance.text = defaultAntiBerryChance.ToString();
nothingBerryChance.text = defaultNothingBerryChance.ToString();
ValidateTotal();
});
customNormalizeButton.onClick.AddListener(() =>
{
float normalBerry = GetValueFrom(normalBerryChance);
float poisonBerry = GetValueFrom(poisonBerryChance);
float slowBerry = GetValueFrom(slowBerryChance);
float ultraBerry = GetValueFrom(ultraBerryChance);
float speedyBerry = GetValueFrom(speedyBerryChance);
float randomBerry = GetValueFrom(randomBerryChance);
float antiBerry = GetValueFrom(antiBerryChance);
float nothingBerry = GetValueFrom(nothingBerryChance);
int divideBy = 0;
divideBy += normalBerry > 0 ? 1 : 0;
divideBy += poisonBerry > 0 ? 1 : 0;
divideBy += slowBerry > 0 ? 1 : 0;
divideBy += ultraBerry > 0 ? 1 : 0;
divideBy += speedyBerry > 0 ? 1 : 0;
divideBy += randomBerry > 0 ? 1 : 0;
divideBy += antiBerry > 0 ? 1 : 0;
divideBy += nothingBerry > 0 ? 1 : 0;
float addedChances = normalBerry + poisonBerry + slowBerry + ultraBerry + speedyBerry + randomBerry + antiBerry + nothingBerry;
float difference = addedChances - 100f;
if (normalBerry > 0) NormalizeOne(normalBerryChance, normalBerry, divideBy, difference);
if (poisonBerry > 0) NormalizeOne(poisonBerryChance, poisonBerry, divideBy, difference);
if (slowBerry > 0) NormalizeOne(slowBerryChance, slowBerry, divideBy, difference);
if (ultraBerry > 0) NormalizeOne(ultraBerryChance, ultraBerry, divideBy, difference);
if (speedyBerry > 0) NormalizeOne(speedyBerryChance, speedyBerry, divideBy, difference);
if (randomBerry > 0) NormalizeOne(randomBerryChance, randomBerry, divideBy, difference);
if (antiBerry > 0) NormalizeOne(antiBerryChance, antiBerry, divideBy, difference);
if (nothingBerry > 0) NormalizeOne(nothingBerryChance, nothingBerry, divideBy, difference);
normalBerry = GetValueFrom(normalBerryChance);
poisonBerry = GetValueFrom(poisonBerryChance);
slowBerry = GetValueFrom(slowBerryChance);
ultraBerry = GetValueFrom(ultraBerryChance);
speedyBerry = GetValueFrom(speedyBerryChance);
randomBerry = GetValueFrom(randomBerryChance);
antiBerry = GetValueFrom(antiBerryChance);
nothingBerry = GetValueFrom(nothingBerryChance);
if (normalBerry > 0) normalBerry = (float)Math.Floor(normalBerry);
if (poisonBerry > 0) poisonBerry = (float)Math.Floor(poisonBerry);
if (slowBerry > 0) slowBerry = (float)Math.Floor(slowBerry);
if (ultraBerry > 0) ultraBerry = (float)Math.Floor(ultraBerry);
if (speedyBerry > 0) speedyBerry = (float)Math.Floor(speedyBerry);
if (randomBerry > 0) randomBerry = (float)Math.Floor(randomBerry);
if (antiBerry > 0) antiBerry = (float)Math.Floor(antiBerry);
if (nothingBerry > 0) nothingBerry = (float)Math.Floor(nothingBerry);
float addedChances2 = normalBerry + poisonBerry + slowBerry + ultraBerry + speedyBerry + randomBerry + antiBerry + nothingBerry;
float difference2 = addedChances2 - 100f;
bool fixedValues = false;
if (normalBerry > 0)
{
NormalizeTwo(normalBerryChance, fixedValues, normalBerry, difference2);
fixedValues = true;
}
if (poisonBerry > 0)
{
NormalizeTwo(poisonBerryChance, fixedValues, poisonBerry, difference2);
fixedValues = true;
}
if (slowBerry > 0)
{
NormalizeTwo(slowBerryChance, fixedValues, slowBerry, difference2);
fixedValues = true;
}
if (ultraBerry > 0)
{
NormalizeTwo(ultraBerryChance, fixedValues, ultraBerry, difference2);
fixedValues = true;
}
if (speedyBerry > 0)
{
NormalizeTwo(speedyBerryChance, fixedValues, speedyBerry, difference2);
fixedValues = true;
}
if (randomBerry > 0)
{
NormalizeTwo(randomBerryChance, fixedValues, randomBerry, difference2);
fixedValues = true;
}
if (antiBerry > 0)
{
NormalizeTwo(antiBerryChance, fixedValues, antiBerry, difference2);
fixedValues = true;
}
if (nothingBerry > 0)
{
NormalizeTwo(nothingBerryChance, fixedValues, nothingBerry, difference2);
fixedValues = true;
}
ValidateTotal(); ValidateTotal();
}); });
customPlayButton.onClick.AddListener(async () => customPlayButton.onClick.AddListener(async () =>
@@ -55,208 +159,117 @@ public class PlayMenu : MonoBehaviour
GameObject obj = new("CustomGameTempData"); GameObject obj = new("CustomGameTempData");
obj.AddComponent<CustomGameTempData>(); obj.AddComponent<CustomGameTempData>();
CustomGameTempData customGameTempData = obj.GetComponent<CustomGameTempData>(); CustomGameTempData customGameTempData = obj.GetComponent<CustomGameTempData>();
customGameTempData.normalBerryChance = float.Parse(normalBerryChance.text.Replace("%", "").Trim()); customGameTempData.normalBerryChance = GetValueFrom(normalBerryChance);
customGameTempData.poisonBerryChance = float.Parse(poisonBerryChance.text.Replace("%", "").Trim()); customGameTempData.poisonBerryChance = GetValueFrom(poisonBerryChance);
customGameTempData.slowBerryChance = float.Parse(slowBerryChance.text.Replace("%", "").Trim()); customGameTempData.slowBerryChance = GetValueFrom(slowBerryChance);
customGameTempData.ultraBerryChance = float.Parse(ultraBerryChance.text.Replace("%", "").Trim()); customGameTempData.ultraBerryChance = GetValueFrom(ultraBerryChance);
customGameTempData.speedyBerryChance = float.Parse(speedyBerryChance.text.Replace("%", "").Trim()); customGameTempData.speedyBerryChance = GetValueFrom(speedyBerryChance);
customGameTempData.randomBerryChance = float.Parse(randomBerryChance.text.Replace("%", "").Trim()); customGameTempData.randomBerryChance = GetValueFrom(randomBerryChance);
customGameTempData.antiBerryChance = float.Parse(antiBerryChance.text.Replace("%", "").Trim()); customGameTempData.antiBerryChance = GetValueFrom(antiBerryChance);
customGameTempData.nothingBerryChance = GetValueFrom(nothingBerryChance);
await SceneManager.LoadSceneAsync("CustomGamePlayer"); await SceneManager.LoadSceneAsync("CustomGamePlayer");
}); });
normalBerryChance.onSelect.AddListener((value) => normalBerryChance.onSelect.AddListener((value) => OnSelect(value, normalBerryChance));
{ normalBerryChance.onDeselect.AddListener((value) => OnDeselect(value, normalBerryChance));
validateTotalText.gameObject.SetActive(false); poisonBerryChance.onSelect.AddListener((value) => OnSelect(value, poisonBerryChance));
customBackButton.interactable = false; poisonBerryChance.onDeselect.AddListener((value) => OnDeselect(value, poisonBerryChance));
customPlayButton.interactable = false; slowBerryChance.onSelect.AddListener((value) => OnSelect(value, slowBerryChance));
normalBerryChance.text = value.Replace("%", ""); slowBerryChance.onDeselect.AddListener((value) => OnDeselect(value, slowBerryChance));
}); ultraBerryChance.onSelect.AddListener((value) => OnSelect(value, ultraBerryChance));
normalBerryChance.onDeselect.AddListener((value) => ultraBerryChance.onDeselect.AddListener((value) => OnDeselect(value, ultraBerryChance));
{ speedyBerryChance.onSelect.AddListener((value) => OnSelect(value, speedyBerryChance));
if (float.TryParse(value, out var value2) && value2 < 0f) speedyBerryChance.onDeselect.AddListener((value) => OnDeselect(value, speedyBerryChance));
{ randomBerryChance.onSelect.AddListener((value) => OnSelect(value, randomBerryChance));
value = "0"; randomBerryChance.onDeselect.AddListener((value) => OnDeselect(value, randomBerryChance));
} antiBerryChance.onSelect.AddListener((value) => OnSelect(value, antiBerryChance));
normalBerryChance.text = value + "%"; antiBerryChance.onDeselect.AddListener((value) => OnDeselect(value, antiBerryChance));
customBackButton.interactable = true; nothingBerryChance.onSelect.AddListener((value) => OnSelect(value, nothingBerryChance));
ValidateTotal(); nothingBerryChance.onDeselect.AddListener((value) => OnDeselect(value, nothingBerryChance));
});
poisonBerryChance.onSelect.AddListener((value) =>
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
poisonBerryChance.text = value.Replace("%", "");
poisonBerryChance.stringPosition = poisonBerryChance.text.Length;
});
poisonBerryChance.onDeselect.AddListener((value) =>
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
poisonBerryChance.text = value + "%";
customBackButton.interactable = true;
ValidateTotal();
});
slowBerryChance.onSelect.AddListener((value) =>
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
slowBerryChance.text = value.Replace("%", "");
slowBerryChance.stringPosition = slowBerryChance.text.Length;
});
slowBerryChance.onDeselect.AddListener((value) =>
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
slowBerryChance.text = value + "%";
customBackButton.interactable = true;
ValidateTotal();
});
ultraBerryChance.onSelect.AddListener((value) =>
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
ultraBerryChance.text = value.Replace("%", "");
ultraBerryChance.stringPosition = ultraBerryChance.text.Length;
});
ultraBerryChance.onDeselect.AddListener((value) =>
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
ultraBerryChance.text = value + "%";
customBackButton.interactable = true;
ValidateTotal();
});
speedyBerryChance.onSelect.AddListener((value) =>
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
speedyBerryChance.text = value.Replace("%", "");
speedyBerryChance.stringPosition = speedyBerryChance.text.Length;
});
speedyBerryChance.onDeselect.AddListener((value) =>
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
speedyBerryChance.text = value + "%";
customBackButton.interactable = true;
ValidateTotal();
});
randomBerryChance.onSelect.AddListener((value) =>
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
randomBerryChance.text = value.Replace("%", "");
randomBerryChance.stringPosition = randomBerryChance.text.Length;
});
randomBerryChance.onDeselect.AddListener((value) =>
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
randomBerryChance.text = value + "%";
customBackButton.interactable = true;
ValidateTotal();
});
antiBerryChance.onSelect.AddListener((value) =>
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
antiBerryChance.text = value.Replace("%", "");
antiBerryChance.stringPosition = antiBerryChance.text.Length;
});
antiBerryChance.onDeselect.AddListener((value) =>
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
antiBerryChance.text = value + "%";
customBackButton.interactable = true;
ValidateTotal();
});
jumpscareButton.onClick.AddListener(() =>
{
jumpscareButton.GetComponent<Image>().color = Color.red;
jumpscareButton.onClick.RemoveAllListeners();
StartCoroutine(Jumpscare());
});
} }
void ValidateTotal() void ValidateTotal()
{ {
customBackButton.interactable = false;
customPlayButton.interactable = false; customPlayButton.interactable = false;
customNormalizeButton.interactable = false;
float total = 0f; float total = 0f;
try total += GetValueFrom(normalBerryChance);
{ total += GetValueFrom(poisonBerryChance);
total += float.Parse(normalBerryChance.text.Replace("%", "")); total += GetValueFrom(slowBerryChance);
total += float.Parse(poisonBerryChance.text.Replace("%", "")); total += GetValueFrom(ultraBerryChance);
total += float.Parse(slowBerryChance.text.Replace("%", "")); total += GetValueFrom(speedyBerryChance);
total += float.Parse(ultraBerryChance.text.Replace("%", "")); total += GetValueFrom(randomBerryChance);
total += float.Parse(speedyBerryChance.text.Replace("%", "")); total += GetValueFrom(antiBerryChance);
total += float.Parse(randomBerryChance.text.Replace("%", "")); total += GetValueFrom(nothingBerryChance);
total += float.Parse(antiBerryChance.text.Replace("%", ""));
}
catch (Exception)
{
validateTotalText.text = "Failed to parse total";
validateTotalText.gameObject.SetActive(true);
return;
}
if (total == 100f) if (total == 100f)
{ {
customBackButton.interactable = true;
customPlayButton.interactable = true; customPlayButton.interactable = true;
validateTotalText.gameObject.SetActive(false); validateTotalText.gameObject.SetActive(false);
} }
else else
{ {
customNormalizeButton.interactable = true;
validateTotalText.text = "Total must add up to 100%!"; validateTotalText.text = "Total must add up to 100%!";
validateTotalText.gameObject.SetActive(true); validateTotalText.gameObject.SetActive(true);
} }
} }
IEnumerator Jumpscare() private float GetValueFrom(TMP_InputField inputField)
{ {
jumpscareAudio.Play(); return GetValueFroText(inputField.text);
float t = 0;
jumpscareImage.gameObject.SetActive(true);
jumpscareImage.rectTransform.localScale = Vector3.zero;
while (t < 0.25f)
{
t += Time.deltaTime;
float p = t / 0.25f;
jumpscareImage.rectTransform.localScale = Vector3.Lerp(Vector3.zero, Vector3.one, p);
jumpscareImage.color = Color.Lerp(Color.white, Color.red, p);
yield return null;
} }
jumpscareImage.rectTransform.localScale = Vector3.one;
yield return _waitForSeconds3; private float GetValueFroText(string text)
jumpscareAudio.Stop();
jumpscareImage.gameObject.SetActive(false);
jumpscareImage.rectTransform.localScale = Vector3.zero;
jumpscareImage.color = Color.white;
yield return _waitForSeconds7;
jumpscareButton.GetComponent<Image>().color = Color.white;
jumpscareButton.onClick.AddListener(() =>
{ {
jumpscareButton.GetComponent<Image>().color = Color.red; try
jumpscareButton.onClick.RemoveAllListeners(); {
StartCoroutine(Jumpscare()); return float.Parse(text.Replace("%", "").Trim());
}); }
catch
{
return 0f;
}
}
void OnSelect(string value, TMP_InputField inputField)
{
validateTotalText.gameObject.SetActive(false);
customBackButton.interactable = false;
customPlayButton.interactable = false;
customNormalizeButton.interactable = false;
inputField.text = value.Replace("%", "");
inputField.stringPosition = inputField.text.Length;
}
void OnDeselect(string value, TMP_InputField inputField)
{
if (float.TryParse(value, out var value2) && value2 < 0f)
{
value = "0";
}
inputField.text = value + "%";
ValidateTotal();
}
void NormalizeOne(TMP_InputField inputField, float berryChance, int divideBy, float difference)
{
inputField.text = (berryChance - (difference / divideBy)).ToString() + "%";
inputField.stringPosition = inputField.text.Length;
}
void NormalizeTwo(TMP_InputField inputField, bool fixedValues, float berryChance, float difference2)
{
if (!fixedValues)
{
inputField.text = (berryChance - difference2).ToString() + "%";
inputField.stringPosition = inputField.text.Length;
}
else
{
inputField.text = berryChance.ToString() + "%";
inputField.stringPosition = inputField.text.Length;
}
} }
} }

View File

@@ -2,21 +2,22 @@
"dependencies": { "dependencies": {
"com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git", "com.nobi.roundedcorners": "https://github.com/kirevdokimov/Unity-UI-Rounded-Corners.git",
"com.unity.2d.animation": "12.0.2", "com.unity.2d.animation": "12.0.2",
"com.unity.2d.aseprite": "2.0.1", "com.unity.2d.aseprite": "2.0.2",
"com.unity.2d.psdimporter": "11.0.1", "com.unity.2d.psdimporter": "11.0.1",
"com.unity.2d.sprite": "1.0.0", "com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "12.0.1", "com.unity.2d.spriteshape": "12.0.1",
"com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "5.0.1", "com.unity.2d.tilemap.extras": "5.0.1",
"com.unity.collab-proxy": "2.9.3", "com.unity.collab-proxy": "2.9.3",
"com.unity.ide.rider": "3.0.37", "com.unity.ide.rider": "3.0.38",
"com.unity.ide.visualstudio": "2.0.23", "com.unity.ide.visualstudio": "2.0.23",
"com.unity.inputsystem": "1.14.2", "com.unity.inputsystem": "1.14.2",
"com.unity.multiplayer.center": "1.0.0", "com.unity.multiplayer.center": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.render-pipelines.universal": "17.2.0", "com.unity.render-pipelines.universal": "17.2.0",
"com.unity.test-framework": "1.5.1", "com.unity.test-framework": "1.6.0",
"com.unity.timeline": "1.8.9", "com.unity.timeline": "1.8.9",
"com.unity.toolchain.linux-x86_64": "2.0.10",
"com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4", "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4",
"com.unity.ugui": "2.0.0", "com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.8", "com.unity.visualscripting": "1.9.8",

View File

@@ -21,7 +21,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.2d.aseprite": { "com.unity.2d.aseprite": {
"version": "2.0.1", "version": "2.0.2",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@@ -131,7 +131,7 @@
"dependencies": {} "dependencies": {}
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "3.0.37", "version": "3.0.38",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@@ -262,7 +262,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.5.1", "version": "1.6.0",
"depth": 0, "depth": 0,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
@@ -293,6 +293,16 @@
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.toolchain.linux-x86_64": {
"version": "2.0.10",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.10",
"com.unity.sysroot.linux-x86_64": "2.0.9"
},
"url": "https://packages.unity.com"
},
"com.unity.toolchain.macos-arm64-linux-x86_64": { "com.unity.toolchain.macos-arm64-linux-x86_64": {
"version": "2.0.4", "version": "2.0.4",
"depth": 0, "depth": 0,

View File

@@ -86,6 +86,7 @@ PlayerSettings:
muteOtherAudioSources: 0 muteOtherAudioSources: 0
Prepare IOS For Recording: 0 Prepare IOS For Recording: 0
Force IOS Speakers When Recording: 0 Force IOS Speakers When Recording: 0
audioSpatialExperience: 0
deferSystemGesturesMode: 0 deferSystemGesturesMode: 0
hideHomeButton: 0 hideHomeButton: 0
submitAnalytics: 1 submitAnalytics: 1
@@ -141,7 +142,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0 loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0 visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0 tvOSBundleVersion: 1.0
bundleVersion: 1.8.1 bundleVersion: 1.8.2
preloadedAssets: preloadedAssets:
- {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} - {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
metroInputSource: 0 metroInputSource: 0

View File

@@ -1,2 +1,2 @@
m_EditorVersion: 6000.2.3f1 m_EditorVersion: 6000.2.6f2
m_EditorVersionWithRevision: 6000.2.3f1 (c7638eb16d91) m_EditorVersionWithRevision: 6000.2.6f2 (4a4dcaec6541)

View File

@@ -12,6 +12,7 @@ TagManager:
- CoinBerry - CoinBerry
- RandomBerry - RandomBerry
- AntiBerry - AntiBerry
- NothingBerry
layers: layers:
- Default - Default
- TransparentFX - TransparentFX