Skip to content

Project FIxes for Unity 6 #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
60 changes: 60 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.vs": true,
"**/.gitmodules": true,
"**/.vsconfig": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"Logs/": true,
"logs/": true,
"ProjectSettings/": true,
"UserSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "BoatAttack.sln"
}
33 changes: 19 additions & 14 deletions Assets/AddressableAssetsData/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ MonoBehaviour:
m_Name: AddressableAssetSettings
m_EditorClassIdentifier:
m_DefaultGroup: ae971df5c2b654af9a3670c7d1a6fc27
m_CachedHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
Expand All @@ -39,9 +42,9 @@ MonoBehaviour:
m_overridePlayerVersion:
m_GroupAssets:
- {fileID: 11400000, guid: 283cfc36cc7e3476c947ddc708efef12, type: 2}
- {fileID: 11400000, guid: 38904d4108bb34d4396119b6e237dc14, type: 2}
- {fileID: 11400000, guid: ada935aea24d34bafa3ba34440872e90, type: 2}
- {fileID: 11400000, guid: a0936c6e3ab2d4684a93f95196a12668, type: 2}
- {fileID: 11400000, guid: 38904d4108bb34d4396119b6e237dc14, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
Expand All @@ -53,29 +56,29 @@ MonoBehaviour:
m_Id: bb810b2e0c37a46518903b769881a40b
m_ProfileName: Default
m_Values:
- m_Id: 28ba4bc7b75864163846859a34a42adf
m_Value: 'ServerData/[BuildTarget]'
- m_Id: 5baa6669c14d34bcc9d172addd4ffac6
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: 7f9b679f43cd842e0a2d00c5056601f8
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: a97c2753c313940f3b39c7767c006f00
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: 5baa6669c14d34bcc9d172addd4ffac6
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: 28ba4bc7b75864163846859a34a42adf
m_Value: ServerData/[BuildTarget]
- m_Id: db15ee1355f3d4f138b374d9a49c2974
m_Value: http://localhost/[BuildTarget]
m_Value: 'http://localhost/[BuildTarget]'
m_ProfileEntryNames:
- m_Id: 28ba4bc7b75864163846859a34a42adf
m_Name: RemoteBuildPath
m_InlineUsage: 0
- m_Id: 5baa6669c14d34bcc9d172addd4ffac6
m_Name: LocalLoadPath
m_InlineUsage: 0
- m_Id: 7f9b679f43cd842e0a2d00c5056601f8
m_Name: BuildTarget
m_InlineUsage: 0
- m_Id: a97c2753c313940f3b39c7767c006f00
m_Name: LocalBuildPath
m_InlineUsage: 0
- m_Id: 5baa6669c14d34bcc9d172addd4ffac6
m_Name: LocalLoadPath
m_InlineUsage: 0
- m_Id: 28ba4bc7b75864163846859a34a42adf
m_Name: RemoteBuildPath
m_InlineUsage: 0
- m_Id: db15ee1355f3d4f138b374d9a49c2974
m_Name: RemoteLoadPath
m_InlineUsage: 0
Expand All @@ -90,10 +93,9 @@ MonoBehaviour:
m_CertificateHandlerType:
m_AssemblyName:
m_ClassName:
m_ActivePlayerDataBuilderIndex: 3
m_ActivePlayerDataBuilderIndex: 2
m_DataBuilders:
- {fileID: 11400000, guid: c48a9382c82c04ec9a37f847abf166a2, type: 2}
- {fileID: 11400000, guid: 8889f0da1cd4f4d9990fc97212b7bc4d, type: 2}
- {fileID: 11400000, guid: a78db7510dabe40ad8086ded61ef3702, type: 2}
- {fileID: 11400000, guid: 760e57f7852f74520bd905e58230848f, type: 2}
m_ActiveProfileId: bb810b2e0c37a46518903b769881a40b
Expand All @@ -102,3 +104,6 @@ MonoBehaviour:
m_Settings: {fileID: 11400000}
m_NextInstanceId: 0
m_RegisteredServiceTypeRefs: []
m_GlobalProfileVariablesInfos:
- key: PrivateIpAddress
value: 192.168.0.104
15 changes: 2 additions & 13 deletions Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,9 @@ MonoBehaviour:
m_Name: Built In Data
m_EditorClassIdentifier:
m_GroupName: Built In Data
m_Data:
m_SerializedData: []
m_GUID: 138b95a3b437d48349e8694fb1dab031
m_SerializeEntries:
- m_GUID: EditorSceneList
m_Address: EditorSceneList
m_ReadOnly: 1
m_SerializedLabels: []
- m_GUID: Resources
m_Address: Resources
m_ReadOnly: 1
m_SerializedLabels: []
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 46fc3d082b08c4dacacae72d7016c235, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: ea287fc6e0c474cd58a84f6405594aad, type: 2}
m_Schemas: []
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3}
m_Name: Built In Data_PlayerDataGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 283cfc36cc7e3476c947ddc708efef12, type: 2}
m_IncludeResourcesFolders: 1
m_IncludeBuildSettingsScenes: 1

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

135 changes: 135 additions & 0 deletions Assets/AddressableAssetsData/link.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<linker>
<assembly fullname="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="BoatAttack.Boat" preserve="all" />
<type fullname="BoatAttack.BoatFoamGenerator" preserve="all" />
<type fullname="BoatAttack.Engine" preserve="all" />
<type fullname="BoatAttack.UI.PlayerMapMarker" preserve="all" />
<type fullname="BoatAttack.UI.PlayerMarker" preserve="all" />
<type fullname="BoatAttack.UI.RaceStatsPlayer" preserve="all" />
<type fullname="BoatAttack.UI.RaceUI" preserve="all" />
<type fullname="BoatAttack.WakeGenerator" preserve="all" />
<type fullname="DoNotDestroy" preserve="all" />
<type fullname="LoadingScreen" preserve="all" />
<type fullname="BoatAttack.WakeGenerator/Wake" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Cinemachine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Cinemachine.CinemachineBrain" preserve="all" />
<type fullname="Cinemachine.CinemachineComposer" preserve="all" />
<type fullname="Cinemachine.CinemachinePipeline" preserve="all" />
<type fullname="Cinemachine.CinemachineTransposer" preserve="all" />
<type fullname="Cinemachine.CinemachineVirtualCamera" preserve="all" />
<type fullname="Cinemachine.CinemachineBrain/VcamActivatedEvent" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineVirtualCameraBase/TransitionParams" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.LensSettings" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineBlendDefinition" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineBrain/BrainEvent" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
<type fullname="UnityEngine.AddressableAssets.AssetReference" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.InputSystem, Version=1.11.2.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.InputSystem.InputActionAsset" preserve="all" />
<type fullname="UnityEngine.InputSystem.InputActionReference" preserve="all" />
<type fullname="UnityEngine.InputSystem.OnScreen.OnScreenButton" preserve="all" />
<type fullname="UnityEngine.InputSystem.OnScreen.OnScreenStick" preserve="all" />
<type fullname="UnityEngine.InputSystem.UI.InputSystemUIInputModule" preserve="all" />
<type fullname="UnityEngine.InputSystem.InputAction" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputActionMap" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputBinding" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputControlScheme" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.InputSystem.InputControlScheme/DeviceRequirement" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.RenderPipelines.Universal.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Rendering.Universal.UniversalAdditionalCameraData" preserve="all" />
<type fullname="UnityEngine.Rendering.Universal.TemporalAA/Settings" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
<assembly fullname="Unity.TextMeshPro, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="TMPro.TextMeshProUGUI" preserve="all" />
<type fullname="TMPro.TMP_FontAsset" preserve="all" />
<type fullname="TMPro.FaceInfo_Legacy" preserve="nothing" serialized="true" />
<type fullname="TMPro.FontAssetCreationSettings" preserve="nothing" serialized="true" />
<type fullname="TMPro.KerningTable" preserve="nothing" serialized="true" />
<type fullname="TMPro.TMP_Character" preserve="nothing" serialized="true" />
<type fullname="TMPro.TMP_FontFeatureTable" preserve="nothing" serialized="true" />
<type fullname="TMPro.TMP_FontWeightPair" preserve="nothing" serialized="true" />
<type fullname="TMPro.VertexGradient" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.AIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.AI.NavMeshObstacle" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.AudioModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.AudioClip" preserve="all" />
<type fullname="UnityEngine.AudioListener" preserve="all" />
<type fullname="UnityEngine.AudioSource" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Camera" preserve="all" />
<type fullname="UnityEngine.GameObject" preserve="all" />
<type fullname="UnityEngine.LineRenderer" preserve="all" />
<type fullname="UnityEngine.Material" preserve="all" />
<type fullname="UnityEngine.Mesh" preserve="all" />
<type fullname="UnityEngine.MeshFilter" preserve="all" />
<type fullname="UnityEngine.MeshRenderer" preserve="all" />
<type fullname="UnityEngine.Object" preserve="all" />
<type fullname="UnityEngine.RectTransform" preserve="all" />
<type fullname="UnityEngine.Shader" preserve="all" />
<type fullname="UnityEngine.Sprite" preserve="all" />
<type fullname="UnityEngine.Texture2D" preserve="all" />
<type fullname="UnityEngine.Transform" preserve="all" />
<type fullname="UnityEngine.Events.PersistentCallGroup" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.ArgumentCache" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.Events.PersistentListenerMode" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.RectOffset" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.ParticleSystemModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.ParticleSystem" preserve="all" />
<type fullname="UnityEngine.ParticleSystemRenderer" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.MeshCollider" preserve="all" />
<type fullname="UnityEngine.PhysicsMaterial" preserve="all" />
<type fullname="UnityEngine.Rigidbody" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Font" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.EventSystems.EventSystem" preserve="all" />
<type fullname="UnityEngine.UI.Button" preserve="all" />
<type fullname="UnityEngine.UI.CanvasScaler" preserve="all" />
<type fullname="UnityEngine.UI.ContentSizeFitter" preserve="all" />
<type fullname="UnityEngine.UI.GraphicRaycaster" preserve="all" />
<type fullname="UnityEngine.UI.HorizontalLayoutGroup" preserve="all" />
<type fullname="UnityEngine.UI.Image" preserve="all" />
<type fullname="UnityEngine.UI.VerticalLayoutGroup" preserve="all" />
<type fullname="UnityEngine.UI.AnimationTriggers" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.ColorBlock" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.MaskableGraphic/CullStateChangedEvent" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.Navigation" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.UI.SpriteState" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.Canvas" preserve="all" />
<type fullname="UnityEngine.CanvasRenderer" preserve="all" />
</assembly>
<assembly fullname="WaterSystem, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="WaterSystem.BuoyantObject" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.TextCoreFontEngineModule">
<type fullname="UnityEngine.TextCore.FaceInfo" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.Glyph" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.GlyphMetrics" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.GlyphRect" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.LowLevel.GlyphAdjustmentRecord" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.LowLevel.GlyphPairAdjustmentRecord" preserve="nothing" serialized="true" />
<type fullname="UnityEngine.TextCore.LowLevel.GlyphValueRecord" preserve="nothing" serialized="true" />
</assembly>
</linker>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading