Compare commits

8 Commits
Author SHA1 Message Date
Lncvrt f04fe7420d 1.1 2025-10-24 16:47:39 -07:00
Lncvrt 0397a13d9b Mobile support 2025-10-24 16:45:39 -07:00
Lncvrt 4688d1a930 Update gitignore 2025-10-24 15:56:09 -07:00
Lncvrt 2bfd1b8629 Update unity 2025-10-24 13:06:24 -07:00
Lncvrt b2483b7c18 Update unity 2025-10-14 11:33:12 -07:00
Lncvrt ba52270205 Fix 2 settings not being enabled 2025-10-11 13:32:48 -07:00
Lncvrt 4372f7862f Remove auto rotate in the normal script and add F as a shoot key along with left click 2025-10-08 11:30:32 -07:00
Lncvrt 5f430f79b1 Remove slow berry from random berry when you shoot it 2025-10-08 11:29:39 -07:00
10 changed files with 650 additions and 193 deletions

No files matched your search

+22 -6
View File
@@ -28,6 +28,8 @@
# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*
# Jetbrains Rider personal-layer settings
*.DotSettings.user
# Visual Studio cache directory
.vs/
@@ -41,6 +43,7 @@ ExportedObj/
*.csproj
*.unityproj
*.sln
*.slnx
*.suo
*.tmp
*.user
@@ -61,6 +64,9 @@ ExportedObj/
# Unity3D generated file on crash reports
sysinfo.txt
# Mono auto generated files
mono_crash.*
# Builds
*.apk
*.aab
@@ -71,12 +77,18 @@ sysinfo.txt
# Crashlytics generated file
crashlytics-build.properties
# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
# TestRunner generated files
InitTestScene*.unity*
# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
# Addressables default ignores, before user customizations
/ServerData
/[Aa]ssets/StreamingAssets/aa*
/[Aa]ssets/AddressableAssetsData/link.xml*
/[Aa]ssets/Addressables_Temp*
# By default, Addressables content builds will generate addressables_content_state.bin
# files in platform-specific subfolders, for example:
# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin
/[Aa]ssets/AddressableAssetsData/*/*.bin*
# Visual Scripting auto-generated files
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db
@@ -84,4 +96,8 @@ crashlytics-build.properties
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
.DS_STORE
# Auto-generated scenes by play mode tests
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*
# MacOS Stuff
.DS_STORE
+1 -1
View File
@@ -66,7 +66,7 @@
"explorer.fileNesting.patterns": {
"*.sln": "*.csproj"
},
"dotnet.defaultSolution": "BerryDashGuns.sln",
"dotnet.defaultSolution": "BerryDashGuns.slnx",
"editor.formatOnSave": true,
"dotnet.formatting.organizeImportsOnFormat": true,
"csharp.format.enable": true
+174 -147
View File
@@ -63,7 +63,7 @@ Material:
- _GlowOffset: 0
- _GlowOuter: 0.05
- _GlowPower: 0.75
- _GradientScale: 13
- _GradientScale: 14
- _LightAngle: 3.1416
- _MaskSoftnessX: 0
- _MaskSoftnessY: 0
@@ -73,9 +73,9 @@ Material:
- _OutlineWidth: 0
- _PerspectiveFilter: 0.875
- _Reflectivity: 10
- _ScaleRatioA: 0.9230769
- _ScaleRatioB: 0.75
- _ScaleRatioC: 0.75
- _ScaleRatioA: 0.9285714
- _ScaleRatioB: 0.75446427
- _ScaleRatioC: 0.75446427
- _ScaleX: 1
- _ScaleY: 1
- _ShaderFlags: 0
@@ -149,7 +149,7 @@ Texture2D:
m_ColorSpace: 0
m_PlatformBlob:
image data: 262144
_typelessdata: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103050506070809090a0a0a0b0b0b0a0a0909080807060504020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001030405040200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002040504040100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103040504020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103050507070a0d0e0f1011121213141414151514141313121211110f0f0e0b080806050503010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001030505080b0d0e0e0e0c0905050402000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001040505090b0d0e0e0d0b08050503010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001030505080b0d0e0e0d0c0905050402000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020405070b0d0e0f1110141618191a1a1b1c1d1e1e1e1e1f1e1e1d1d1c1c1b1b191917151212100f0e0d0b070403010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003070a0d0e0f12151718181715130f0f0d0b08040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004080b0d0f0f12151718181715120f0e0d0b080400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003070a0d0e0f12151718181715130f0f0d0b0804000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010304080b0e0f11141618191a191d2022222324252627272828282828272726262525242322211e1b1b1a19181614110e0d0a070303000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002070c10141618191c1f212222211f1c19191715110d080300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003080d11141718191c1f212222211f1c19181714110c08020000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
_typelessdata: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002040505070808080808080808080808080808080808080808080808080808070605040200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003040404020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000203040403000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105080b0d0e0e101111111111111111111111111111111111111111111111111111100f0e0d0b0906020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103040506090c0d0d0d0b0805040301000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001030405080b0d0d0d0c09060504030100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000307090e1114161717191a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1918171614110e0b080501000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000206090c0d0f0f121516171614110e0d0c0a07040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004070a0c0d0e111416161615130f0f0d0c0906020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002070b0f11161a1d1f20212223232323232323232323232323232323232323232323232323232221201f1d1a1613110d09040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050a0e12151618181c1e1f201f1d1a17161513100c080400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004080c10131516171a1d1f201f1e1c1818Line truncated
m_StreamData:
serializedVersion: 2
offset: 0
@@ -172,24 +172,24 @@ MonoBehaviour:
m_FaceIndex: 0
m_FamilyName: Font Awesome 7 Free
m_StyleName: Solid
m_PointSize: 157
m_PointSize: 134
m_Scale: 1
m_UnitsPerEM: 512
m_LineHeight: 157
m_AscentLine: 137.375
m_CapLine: 128
m_MeanLine: 129
m_LineHeight: 134
m_AscentLine: 117.25
m_CapLine: 109
m_MeanLine: 110
m_Baseline: 0
m_DescentLine: -19.625
m_SuperscriptOffset: 137.375
m_DescentLine: -16.75
m_SuperscriptOffset: 117.25
m_SuperscriptSize: 0.5
m_SubscriptOffset: -19.625
m_SubscriptOffset: -16.75
m_SubscriptSize: 0.5
m_UnderlineOffset: 0
m_UnderlineThickness: 0
m_StrikethroughOffset: 51.6
m_StrikethroughOffset: 44
m_StrikethroughThickness: 0
m_TabWidth: 79
m_TabWidth: 67
m_Material: {fileID: -3745752736039844685}
m_SourceFontFileGUID: 70c3626d6481a080ca8a0f3ee7018cd8
m_CreationSettings:
@@ -197,14 +197,14 @@ MonoBehaviour:
sourceFontFileGUID: 70c3626d6481a080ca8a0f3ee7018cd8
faceIndex: 0
pointSizeSamplingMode: 0
pointSize: 157
padding: 12
pointSize: 134
padding: 13
paddingMode: 1
packingMode: 0
atlasWidth: 512
atlasHeight: 512
characterSetSelectionMode: 6
characterSequence: F060-F061,F077,F0E2,f111,f04c,f00d,f0c8,f00c
characterSequence: F00C-F00D,F04C,F060-F061,F077,F0C8,F0E2,F111,e19b
referencedFontAssetGUID: 0b50c03e48f9f20d69553c78bfe39a89
referencedTextAssetGUID:
fontStyle: 0
@@ -216,142 +216,161 @@ MonoBehaviour:
m_AtlasPopulationMode: 0
InternalDynamicOS: 0
m_GlyphTable:
- m_Index: 116
m_Metrics:
m_Width: 150.75
m_Height: 117.25
m_HorizontalBearingX: 0
m_HorizontalBearingY: 108.875
m_HorizontalAdvance: 150.75
m_GlyphRect:
m_X: 14
m_Y: 14
m_Width: 151
m_Height: 118
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 422
m_Metrics:
m_Width: 139.53125
m_Height: 129.10938
m_HorizontalBearingX: -0.921875
m_HorizontalBearingY: 118.984375
m_HorizontalAdvance: 137.375
m_Width: 119.078125
m_Height: 110.1875
m_HorizontalBearingX: -0.78125
m_HorizontalBearingY: 101.546875
m_HorizontalAdvance: 117.25
m_GlyphRect:
m_X: 358
m_Y: 158
m_Width: 140
m_Height: 130
m_X: 14
m_Y: 159
m_Width: 120
m_Height: 111
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 423
m_Metrics:
m_Width: 119.90625
m_Height: 119.59375
m_HorizontalBearingX: -0.921875
m_HorizontalBearingY: 118.671875
m_HorizontalAdvance: 117.75
m_Width: 102.328125
m_Height: 102.0625
m_HorizontalBearingX: -0.78125
m_HorizontalBearingY: 101.28125
m_HorizontalAdvance: 100.5
m_GlyphRect:
m_X: 379
m_Y: 13
m_Width: 120
m_Height: 120
m_X: 14
m_Y: 393
m_Width: 103
m_Height: 103
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 474
m_Metrics:
m_Width: 117.75
m_Height: 137.375
m_Width: 100.5
m_Height: 117.25
m_HorizontalBearingX: 0
m_HorizontalBearingY: 127.5625
m_HorizontalAdvance: 117.75
m_HorizontalBearingY: 108.875
m_HorizontalAdvance: 100.5
m_GlyphRect:
m_X: 196
m_Y: 321
m_Width: 118
m_Height: 138
m_X: 306
m_Y: 306
m_Width: 101
m_Height: 118
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 490
m_Metrics:
m_Width: 157.92188
m_Height: 119.59375
m_HorizontalBearingX: -0.921875
m_HorizontalBearingY: 118.671875
m_HorizontalAdvance: 157
m_Width: 134.78125
m_Height: 102.0625
m_HorizontalBearingX: -0.78125
m_HorizontalBearingY: 101.28125
m_HorizontalAdvance: 134
m_GlyphRect:
m_X: 13
m_Y: 379
m_Width: 158
m_Height: 120
m_X: 192
m_Y: 14
m_Width: 135
m_Height: 103
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 491
m_Metrics:
m_Width: 157.92188
m_Height: 119.59375
m_Width: 134.78125
m_Height: 102.0625
m_HorizontalBearingX: 0
m_HorizontalBearingY: 118.671875
m_HorizontalAdvance: 157
m_HorizontalBearingY: 101.28125
m_HorizontalAdvance: 134
m_GlyphRect:
m_X: 196
m_Y: 13
m_Width: 158
m_Height: 120
m_X: 354
m_Y: 14
m_Width: 135
m_Height: 103
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 510
m_Metrics:
m_Width: 139.21875
m_Height: 80.34375
m_HorizontalBearingX: -0.921875
m_HorizontalBearingY: 108.859375
m_HorizontalAdvance: 137.375
m_Width: 118.8125
m_Height: 68.5625
m_HorizontalBearingX: -0.78125
m_HorizontalBearingY: 92.90625
m_HorizontalAdvance: 117.25
m_GlyphRect:
m_X: 358
m_Y: 313
m_Width: 140
m_Height: 81
m_X: 14
m_Y: 297
m_Width: 120
m_Height: 69
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 561
m_Metrics:
m_Width: 137.375
m_Height: 137.375
m_Width: 117.25
m_Height: 117.25
m_HorizontalBearingX: 0
m_HorizontalBearingY: 127.5625
m_HorizontalAdvance: 137.375
m_HorizontalBearingY: 108.875
m_HorizontalAdvance: 117.25
m_GlyphRect:
m_X: 195
m_Y: 158
m_Width: 138
m_Height: 138
m_X: 161
m_Y: 306
m_Width: 118
m_Height: 118
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 580
m_Metrics:
m_Width: 157
m_Height: 157
m_Width: 134
m_Height: 134
m_HorizontalBearingX: 0
m_HorizontalBearingY: 137.375
m_HorizontalAdvance: 157
m_HorizontalBearingY: 117.25
m_HorizontalAdvance: 134
m_GlyphRect:
m_X: 13
m_Y: 13
m_Width: 157
m_Height: 158
m_X: 192
m_Y: 144
m_Width: 134
m_Height: 135
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
- m_Index: 616
m_Metrics:
m_Width: 157
m_Height: 157
m_Width: 134
m_Height: 134
m_HorizontalBearingX: 0
m_HorizontalBearingY: 137.375
m_HorizontalAdvance: 157
m_HorizontalBearingY: 117.25
m_HorizontalAdvance: 134
m_GlyphRect:
m_X: 13
m_Y: 196
m_Width: 157
m_Height: 158
m_X: 353
m_Y: 144
m_Width: 134
m_Height: 135
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
m_CharacterTable:
- m_ElementType: 1
m_Unicode: 57755
m_GlyphIndex: 116
m_Scale: 1
- m_ElementType: 1
m_Unicode: 61452
m_GlyphIndex: 422
@@ -396,70 +415,78 @@ MonoBehaviour:
m_ClearDynamicDataOnBuild: 0
m_AtlasWidth: 512
m_AtlasHeight: 512
m_AtlasPadding: 12
m_AtlasPadding: 13
m_AtlasRenderMode: 4165
m_UsedGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 182
m_Height: 183
- m_X: 0
m_Y: 183
m_Width: 182
m_Height: 183
- m_X: 0
m_Y: 366
m_Width: 183
m_Width: 178
m_Height: 145
- m_X: 183
- m_X: 178
m_Y: 0
m_Width: 183
m_Height: 145
- m_X: 366
m_Width: 162
m_Height: 130
- m_X: 340
m_Y: 0
m_Width: 162
m_Height: 130
- m_X: 178
m_Y: 130
m_Width: 161
m_Height: 162
- m_X: 339
m_Y: 130
m_Width: 161
m_Height: 162
- m_X: 0
m_Y: 145
m_Width: 147
m_Height: 138
- m_X: 0
m_Y: 283
m_Width: 147
m_Height: 96
- m_X: 0
m_Y: 379
m_Width: 130
m_Height: 130
- m_X: 147
m_Y: 292
m_Width: 145
m_Height: 145
- m_X: 182
m_Y: 145
m_Width: 163
m_Height: 163
- m_X: 345
m_Y: 145
m_Width: 165
m_Height: 155
- m_X: 345
m_Y: 300
m_Width: 165
m_Height: 106
- m_X: 183
m_Y: 308
m_Width: 143
m_Height: 163
m_FreeGlyphRects:
- m_X: 182
m_Y: 0
m_Width: 1
- m_X: 292
m_Y: 292
m_Width: 128
m_Height: 145
- m_X: 510
m_FreeGlyphRects:
- m_X: 502
m_Y: 0
m_Width: 9
m_Height: 511
- m_X: 500
m_Y: 130
m_Width: 11
m_Height: 381
- m_X: 0
m_Y: 509
m_Width: 511
m_Height: 2
- m_X: 147
m_Y: 145
m_Width: 1
m_Height: 366
- m_X: 182
m_Y: 308
m_Width: 1
m_Height: 58
- m_X: 183
m_Y: 471
m_Width: 328
m_Height: 40
- m_X: 326
m_Y: 406
m_Width: 185
m_Height: 105
- m_X: 326
m_Y: 308
m_Width: 19
m_Height: 203
m_Width: 31
m_Height: 147
- m_X: 130
m_Y: 437
m_Width: 381
m_Height: 74
- m_X: 130
m_Y: 379
m_Width: 17
m_Height: 132
- m_X: 420
m_Y: 292
m_Width: 91
m_Height: 219
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
+380
View File
@@ -314,6 +314,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 45564161}
m_CullTransparentMesh: 1
--- !u!1 &69575133
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 69575134}
- component: {fileID: 69575136}
- component: {fileID: 69575135}
m_Layer: 5
m_Name: Texture
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &69575134
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 69575133}
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: 690436108}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &69575135
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 69575133}
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: \ue19b
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 0b50c03e48f9f20d69553c78bfe39a89, type: 2}
m_sharedMaterial: {fileID: -3745752736039844685, guid: 0b50c03e48f9f20d69553c78bfe39a89, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
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: 48
m_fontSizeBase: 48
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
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 &69575136
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 69575133}
m_CullTransparentMesh: 1
--- !u!1 &72292951
GameObject:
m_ObjectHideFlags: 0
@@ -2441,6 +2577,7 @@ MonoBehaviour:
jumpButton: {fileID: 293594129}
rightButton: {fileID: 1125207522}
leftButton: {fileID: 2069651268}
shootButton: {fileID: 690436111}
--- !u!1 &527090675
GameObject:
m_ObjectHideFlags: 0
@@ -3346,6 +3483,112 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 659310343}
m_CullTransparentMesh: 1
--- !u!1 &690436107
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 690436108}
- component: {fileID: 690436112}
- component: {fileID: 690436111}
- component: {fileID: 690436109}
m_Layer: 5
m_Name: ShootButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &690436108
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 690436107}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1898620960}
- {fileID: 69575134}
m_Father: {fileID: 872476495}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -293, y: 128}
m_SizeDelta: {x: 128, y: 128}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &690436109
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 690436107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a3e765e68473d4e5cb86a7b42c5377f2, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ImageColorSync
originalText: {fileID: 1898620961}
toSync: {fileID: 69575135}
--- !u!114 &690436111
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 690436107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1898620961}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!222 &690436112
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 690436107}
m_CullTransparentMesh: 1
--- !u!1 &694384381
GameObject:
m_ObjectHideFlags: 0
@@ -3711,6 +3954,7 @@ RectTransform:
- {fileID: 293594128}
- {fileID: 1125207521}
- {fileID: 2069651267}
- {fileID: 690436108}
m_Father: {fileID: 1811565639}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -7279,6 +7523,142 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1881710694}
m_CullTransparentMesh: 1
--- !u!1 &1898620959
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1898620960}
- component: {fileID: 1898620962}
- component: {fileID: 1898620961}
m_Layer: 5
m_Name: Circle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1898620960
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1898620959}
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: 690436108}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1898620961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1898620959}
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: \uf111
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 2392e4822ecf2c5e19a145850cebbd9a, type: 2}
m_sharedMaterial: {fileID: -2740074640587096286, guid: 2392e4822ecf2c5e19a145850cebbd9a, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
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: 128
m_fontSizeBase: 128
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 1
m_fontSizeMax: 999
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
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 &1898620962
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1898620959}
m_CullTransparentMesh: 1
--- !u!1 &1931111987
GameObject:
m_ObjectHideFlags: 0
+4 -5
View File
@@ -43,6 +43,7 @@ public class GamePlayer : MonoBehaviour
public Button jumpButton;
public Button rightButton;
public Button leftButton;
public Button shootButton;
void Start()
{
@@ -62,6 +63,8 @@ public class GamePlayer : MonoBehaviour
screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect;
if (Application.isMobilePlatform) mobileButtons.SetActive(true);
UpdateStats(0, 1);
if (Application.isMobilePlatform) shootButton.onClick.AddListener(() => GunHandler.Instance.ShootGun());
}
void MoveBird()
@@ -96,7 +99,7 @@ public class GamePlayer : MonoBehaviour
{
doMoveRight = true;
}
if (controllerJump || Keyboard.current.spaceKey.isPressed || Keyboard.current.upArrowKey.isPressed || Keyboard.current.wKey.isPressed || Keyboard.current.downArrowKey.isPressed || Keyboard.current.sKey.isPressed || Keyboard.current.kKey.isPressed || Keyboard.current.iKey.isPressed || Mouse.current.leftButton.isPressed || (Gamepad.current != null && Gamepad.current.buttonSouth.isPressed))
if (controllerJump || Keyboard.current.spaceKey.isPressed || Keyboard.current.upArrowKey.isPressed || Keyboard.current.wKey.isPressed || Keyboard.current.downArrowKey.isPressed || Keyboard.current.sKey.isPressed || Keyboard.current.kKey.isPressed || Keyboard.current.iKey.isPressed || (Gamepad.current != null && Gamepad.current.buttonSouth.isPressed))
{
doJump = true;
}
@@ -124,13 +127,11 @@ public class GamePlayer : MonoBehaviour
{
bird.transform.position += new UnityEngine.Vector3(-movespeed, 0f, 0f);
ClampPosition(bird);
bird.transform.localScale = new UnityEngine.Vector3(1.35f, 1.35f, 1.35f);
}
if (doMoveRight && !doMoveLeft)
{
bird.transform.position += new UnityEngine.Vector3(movespeed, 0f, 0f);
ClampPosition(bird);
bird.transform.localScale = new UnityEngine.Vector3(-1.35f, 1.35f, 1.35f);
}
if (doJump && isGrounded)
{
@@ -521,7 +522,6 @@ public class GamePlayer : MonoBehaviour
totalRandomBerries++;
System.Action[] funcs = {
() => DoNormalBerry(randomBerry),
() => DoSlowBerry(randomBerry),
() => DoUltraBerry(randomBerry),
() => DoSpeedyBerry(randomBerry),
() => DoAntiBerry(randomBerry)
@@ -598,7 +598,6 @@ public class GamePlayer : MonoBehaviour
void Respawn()
{
bird.transform.position = new UnityEngine.Vector3(0f, -4.3f, 0f);
bird.transform.localScale = new UnityEngine.Vector3(1.35f, 1.35f, 1.35f);
rb.gravityScale = 0f;
rb.linearVelocity = UnityEngine.Vector2.zero;
score = 0;
+51 -18
View File
@@ -1,21 +1,51 @@
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
public class GunHandler : MonoBehaviour
{
public static GunHandler Instance;
public SpriteRenderer bulletTemplate;
private bool hasAutoRotated = false;
private bool tracking = true;
void Awake()
{
Instance = this;
}
void Update()
{
if (GamePlayer.instance.pausePanel.activeSelf) return;
Vector2 mouseScreenPos = Mouse.current.position.ReadValue();
Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(
new Vector3(mouseScreenPos.x, mouseScreenPos.y, -Camera.main.transform.position.z)
Vector2 inputPos = Vector2.zero;
bool pressedNow = false;
bool isMobile = Touchscreen.current != null;
if (isMobile)
{
var touch = Touchscreen.current.primaryTouch;
bool touchingUI = EventSystem.current != null && EventSystem.current.IsPointerOverGameObject(touch.touchId.ReadValue());
if (touch.press.wasPressedThisFrame && !touchingUI) tracking = true;
if (touch.press.wasReleasedThisFrame) tracking = false;
if (tracking && !touchingUI) inputPos = touch.position.ReadValue();
}
else
{
inputPos = Mouse.current.position.ReadValue();
pressedNow = Mouse.current.leftButton.wasPressedThisFrame
|| Keyboard.current.leftShiftKey.wasPressedThisFrame
|| Keyboard.current.rightShiftKey.wasPressedThisFrame
|| Keyboard.current.fKey.wasPressedThisFrame;
}
if (!tracking) return;
Vector3 worldPos = Camera.main.ScreenToWorldPoint(
new Vector3(inputPos.x, inputPos.y, -Camera.main.transform.position.z)
);
Vector2 direction = mouseWorldPos - transform.position;
Vector2 direction = worldPos - transform.position;
bool flipped = transform.parent.localScale.x > 0f;
if (flipped)
@@ -34,7 +64,7 @@ public class GunHandler : MonoBehaviour
if (!hasAutoRotated)
{
hasAutoRotated = true;
Vector3 scale = transform.parent.localScale;
var scale = transform.parent.localScale;
scale.x *= -1;
transform.parent.localScale = scale;
flipped = !flipped;
@@ -51,19 +81,22 @@ public class GunHandler : MonoBehaviour
transform.rotation = Quaternion.Euler(0f, 0f, clamped);
if (Keyboard.current.leftShiftKey.wasPressedThisFrame || Keyboard.current.rightShiftKey.wasPressedThisFrame)
{
Vector3 offset = new(0.6932073f, 0.352302f, 0f);
if (flipped) offset.x = -offset.x;
Vector3 spawnPos = transform.position + transform.rotation * offset;
var bullet = Instantiate(bulletTemplate, spawnPos, Quaternion.identity);
bullet.transform.rotation = Quaternion.Euler(0f, 0f, transform.rotation.eulerAngles.z + (flipped ? 0 : 180f));
bullet.gameObject.name = "Bullet";
bullet.gameObject.SetActive(true);
if (pressedNow) ShootGun();
}
float angleRad = bullet.transform.eulerAngles.z * Mathf.Deg2Rad;
Vector2 dir = new(-Mathf.Cos(angleRad), -Mathf.Sin(angleRad));
bullet.GetComponent<Rigidbody2D>().linearVelocity = dir * 10f;
}
internal void ShootGun()
{
bool flipped = transform.parent.localScale.x > 0f;
Vector3 offset = new(0.6932073f, 0.352302f, 0f);
if (flipped) offset.x = -offset.x;
Vector3 spawnPos = transform.position + transform.rotation * offset;
var bullet = Instantiate(bulletTemplate, spawnPos, Quaternion.identity);
bullet.transform.rotation = Quaternion.Euler(0f, 0f, transform.rotation.eulerAngles.z + (flipped ? 0 : 180f));
bullet.gameObject.name = "Bullet";
bullet.gameObject.SetActive(true);
float angleRad = bullet.transform.eulerAngles.z * Mathf.Deg2Rad;
Vector2 dir = new(-Mathf.Cos(angleRad), -Mathf.Sin(angleRad));
bullet.GetComponent<Rigidbody2D>().linearVelocity = dir * 10f;
}
}
+3 -3
View File
@@ -7,9 +7,9 @@
"com.unity.2d.spriteshape": "12.0.1",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "5.0.1",
"com.unity.collab-proxy": "2.9.3",
"com.unity.collab-proxy": "2.10.0",
"com.unity.ide.rider": "3.0.38",
"com.unity.ide.visualstudio": "2.0.23",
"com.unity.ide.visualstudio": "2.0.25",
"com.unity.inputsystem": "1.14.2",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.1",
@@ -19,7 +19,7 @@
"com.unity.toolchain.linux-x86_64": "2.0.10",
"com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.4",
"com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.8",
"com.unity.visualscripting": "1.9.9",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
+8 -8
View File
@@ -88,7 +88,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.24",
"version": "1.8.25",
"depth": 2,
"source": "registry",
"dependencies": {
@@ -98,18 +98,18 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.9.3",
"version": "2.10.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.collections": {
"version": "2.5.7",
"version": "2.6.2",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.8.19",
"com.unity.burst": "1.8.23",
"com.unity.mathematics": "1.3.2",
"com.unity.test-framework": "1.4.6",
"com.unity.nuget.mono-cecil": "1.11.5",
@@ -133,11 +133,11 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.23",
"version": "2.0.25",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.9"
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.com"
},
@@ -265,7 +265,7 @@
}
},
"com.unity.test-framework.performance": {
"version": "3.1.0",
"version": "3.2.0",
"depth": 2,
"source": "registry",
"dependencies": {
@@ -316,7 +316,7 @@
}
},
"com.unity.visualscripting": {
"version": "1.9.8",
"version": "1.9.9",
"depth": 0,
"source": "registry",
"dependencies": {
+5 -3
View File
@@ -70,6 +70,7 @@ PlayerSettings:
androidStartInFullscreen: 1
androidRenderOutsideSafeArea: 1
androidUseSwappy: 1
androidDisplayOptions: 1
androidBlitType: 0
androidResizeableActivity: 1
androidDefaultWindowWidth: 1920
@@ -142,7 +143,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0
bundleVersion: 1.0
bundleVersion: 1.1
preloadedAssets:
- {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
metroInputSource: 0
@@ -178,12 +179,12 @@ PlayerSettings:
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 23
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 0
AndroidPreferredInstallLocation: 2
aotOptions:
stripEngineCode: 1
iPhoneStrippingLevel: 0
iPhoneScriptCallOptimization: 0
ForceInternetPermission: 0
ForceInternetPermission: 1
ForceSDCardPermission: 0
CreateWallpaper: 0
androidSplitApplicationBinary: 0
@@ -921,3 +922,4 @@ PlayerSettings:
androidVulkanDenyFilterList: []
androidVulkanAllowFilterList: []
androidVulkanDeviceFilterListAsset: {fileID: 0}
d3d12DeviceFilterListAsset: {fileID: 0}
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 6000.2.6f2
m_EditorVersionWithRevision: 6000.2.6f2 (4a4dcaec6541)
m_EditorVersion: 6000.2.9f1
m_EditorVersionWithRevision: 6000.2.9f1 (e0c4e791ab71)