Added parallel sync support
This commit is contained in:
parent
63039dbde2
commit
39eb7753d2
4
.gitignore
vendored
4
.gitignore
vendored
@ -69,4 +69,6 @@ crashlytics-build.properties
|
|||||||
|
|
||||||
# Temporary auto-generated Android Assets
|
# Temporary auto-generated Android Assets
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||||
|
omnisharp.json
|
||||||
|
/microsoft.unity.analyzers
|
||||||
|
@ -9,25 +9,19 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="8e9b3697-c9b4-441a-aeed-4ea7b4488600" name="Changes" comment="">
|
<list default="true" id="8e9b3697-c9b4-441a-aeed-4ea7b4488600" name="Changes" comment="">
|
||||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/Steam.asmdef" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/Steam.asmdef.meta" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/steam_appid.txt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.station_obscurum_temp/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/Assets/Materials/Levels/Level0/CeilLightMaterial.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/Levels/Level0/CeilLightMaterial.mat" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch.meta" beforeDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Astronaut/AstronautWithCameraWithNetworking.prefab" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/LevelPrefabs/Cryopod.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/LevelPrefabs/Cryopod.prefab" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.dll" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.dll.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/MainMenu/MainMenuManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/MainMenu/MainMenuManager.cs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.lib" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Player/PlayerMovementController.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Player/PlayerMovementController.cs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Packages/Facepunch/redistributable_bin/win64/steam_api64.lib.meta" beforeDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/FriendObject.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/FriendObject.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamFriendsManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamFriendsManager.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta" beforeDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyManager.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta" beforeDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/EditorBuildSettings.asset" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamManager.cs" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Packages/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/manifest.json" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Packages/packages-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -35,7 +29,7 @@
|
|||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="HighlightingSettingsPerFile">
|
<component name="HighlightingSettingsPerFile">
|
||||||
<setting file="file://$PROJECT_DIR$/Assets/Samples/Steamworks Foundation/3.0.16/Example Scenes/Examples/Common Scripts/MarketingButtons.cs" root0="SKIP_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/Assets/Packages/FishNet/Runtime/Object/EmptyNetworkBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.heathen.steamworksfoundation@3fc1f33a48/Runtime/SteamworksBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.heathen.steamworksfoundation@3fc1f33a48/Runtime/SteamworksBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
|
||||||
</component>
|
</component>
|
||||||
<component name="MarkdownSettingsMigration">
|
<component name="MarkdownSettingsMigration">
|
||||||
@ -125,6 +119,7 @@
|
|||||||
<workItem from="1685617055026" duration="83000" />
|
<workItem from="1685617055026" duration="83000" />
|
||||||
<workItem from="1685617157524" duration="2799000" />
|
<workItem from="1685617157524" duration="2799000" />
|
||||||
<workItem from="1685632962650" duration="5878000" />
|
<workItem from="1685632962650" duration="5878000" />
|
||||||
|
<workItem from="1686678780511" duration="1269000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 4c5607fd7c7f1864698e3d6f4d2f3a10
|
guid: 4dd0a47cadc6eef469e7e2d7d644074d
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
225
Assets/Compiled Shaders/QuickBuild.shadervariants
Normal file
225
Assets/Compiled Shaders/QuickBuild.shadervariants
Normal file
@ -0,0 +1,225 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!200 &20000000
|
||||||
|
ShaderVariantCollection:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: QuickBuild
|
||||||
|
m_Shaders:
|
||||||
|
- first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: UNITY_UI_ALPHACLIP
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: _DETAIL_MAP _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
|
||||||
|
_NORMALMAP _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE
|
||||||
|
_SURFACE_TYPE_TRANSPARENT
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP
|
||||||
|
_NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 8
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF SCREEN_SPACE_SHADOWS_OFF
|
||||||
|
SHADOW_MEDIUM USE_CLUSTERED_LIGHTLIST _DETAIL_MAP _DISABLE_SSR_TRANSPARENT
|
||||||
|
_ENABLE_FOG_ON_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
|
||||||
|
passType: 13
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF SCREEN_SPACE_SHADOWS_OFF
|
||||||
|
SHADOW_MEDIUM USE_CLUSTERED_LIGHTLIST _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
|
||||||
|
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
|
||||||
|
passType: 13
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
||||||
|
_DOUBLESIDED_ON _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
||||||
|
_MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
||||||
|
_MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
||||||
|
_NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
||||||
|
_NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP
|
||||||
|
_NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
|
||||||
|
passType: 13
|
||||||
|
- first: {fileID: 4800000, guid: 2fcfb8d92f45e4549b3f0bad5d0654bf, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 02ae56f4306413c4a96dcf005cde1971, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 2e37131331fbdca449b1a2bc47a639ca, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 035941b63024d1943af48811c1db20d9, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 8ea49ef16606acd489439e676ab84040, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 42dfcc8fe803ece4096c58630689982f, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: e22fc1942c664490980b8793dd4a163d, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 67d6171b0acc6554aad48c845ec7e67f, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: CHECKERBOARD_DOWNSAMPLE
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 2ad7ce40f0dbaf64dadef1f58d8524d3, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: NEAREST_DEPTH
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 32f724728cf19904291226f239ec16f0, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 9bd32a6ece529fd4f9408b8d7e00c10d, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: SHADOW_MEDIUM USE_FPTL_LIGHTLIST
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: fd532bf1795188c4daaa66ea798b8b0a, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: DECAL_SURFACE_GRADIENT
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: 5ac9ef0c50282754b93c7692488e7ee7, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: APPLY_AFTER_POST
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: -6465566751694194690, guid: d2ddc79091f86244b9e41d99a956f4b5, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON
|
||||||
|
passType: 13
|
||||||
|
- first: {fileID: -6465566751694194690, guid: c28bb37ced75c094faa86ea19e772801, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: INSTANCING_ON _DISABLE_SSR_TRANSPARENT
|
||||||
|
passType: 8
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT
|
||||||
|
passType: 8
|
||||||
|
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF SCREEN_SPACE_SHADOWS_OFF
|
||||||
|
SHADOW_MEDIUM USE_FPTL_LIGHTLIST _DISABLE_SSR_TRANSPARENT
|
||||||
|
passType: 13
|
||||||
|
- keywords: _DISABLE_SSR_TRANSPARENT
|
||||||
|
passType: 13
|
||||||
|
- first: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 8
|
||||||
|
- keywords:
|
||||||
|
passType: 13
|
||||||
|
- first: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: -6465566751694194690, guid: f63d574838ccfb44f84acc05fed0af48, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords: _ALPHATEST_ON _SURFACE_TYPE_TRANSPARENT
|
||||||
|
passType: 8
|
||||||
|
- keywords: _ALPHATEST_ON _SURFACE_TYPE_TRANSPARENT
|
||||||
|
passType: 13
|
||||||
|
- first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
||||||
|
- first: {fileID: 4800000, guid: c195329559c73c3468a698f0ef005558, type: 3}
|
||||||
|
second:
|
||||||
|
variants:
|
||||||
|
- keywords:
|
||||||
|
passType: 0
|
8
Assets/Compiled Shaders/QuickBuild.shadervariants.meta
Normal file
8
Assets/Compiled Shaders/QuickBuild.shadervariants.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: efa94ff7d3b795e449488c7599ce7c7a
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 20000000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -13,7 +13,8 @@ MonoBehaviour:
|
|||||||
m_Name: DefaultPrefabObjects
|
m_Name: DefaultPrefabObjects
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_prefabs:
|
_prefabs:
|
||||||
- {fileID: 3680155643994880520, guid: 502609875cf67524391bcf30129c195b, type: 3}
|
- {fileID: 1976054203064788043, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
|
||||||
|
- {fileID: 5869338221815862114, guid: 502609875cf67524391bcf30129c195b, type: 3}
|
||||||
- {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3}
|
- {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3}
|
||||||
- {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3}
|
- {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3}
|
||||||
- {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3}
|
- {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 96a44475794fb6445a6f3c4b9ee13966
|
guid: a9c34549a246d47439b106bb23f71dff
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
@ -1,5 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 0957b521a08374f4aa508231735153bc
|
guid: 333f3546c34512d4f98612780985f574
|
||||||
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
8
Assets/Plugins/ParrelSync.meta
Normal file
8
Assets/Plugins/ParrelSync.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0f5a61124be7d2a4f9a4888906dfa781
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
8
Assets/Plugins/ParrelSync/ScriptableObjects.meta
Normal file
8
Assets/Plugins/ParrelSync/ScriptableObjects.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4d9f6495f28e3894880f7ea51159a8e0
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,15 @@
|
|||||||
|
%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: c0011418c9d75434988a06b6df93b283, type: 3}
|
||||||
|
m_Name: ParrelSyncProjectSettings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_OptionalSymbolicLinkFolders: []
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c13c1c7c0db5fcd4b8ea4d8a4e57eccc
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -23,14 +23,14 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2036610877}
|
m_GameObject: {fileID: 2036610877}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5}
|
||||||
m_LocalPosition: {x: -0.00071835524, y: 0.00010227263, z: -0.011325002}
|
m_LocalPosition: {x: -0.03519, y: 0.00010227263, z: 0.0053}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 6960644867054158483}
|
m_Father: {fileID: 6960644867054158483}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: -90, z: -90}
|
||||||
--- !u!1 &29681900992242982
|
--- !u!1 &29681900992242982
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
using Mono.CompilerServices.SymbolWriter;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -18,6 +18,7 @@
|
|||||||
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5",
|
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5",
|
||||||
"com.unity.ugui": "1.0.0",
|
"com.unity.ugui": "1.0.0",
|
||||||
"com.unity.visualscripting": "1.8.0",
|
"com.unity.visualscripting": "1.8.0",
|
||||||
|
"com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
"com.unity.modules.animation": "1.0.0",
|
"com.unity.modules.animation": "1.0.0",
|
||||||
|
@ -290,6 +290,13 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
"com.veriorpies.parrelsync": {
|
||||||
|
"version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "git",
|
||||||
|
"dependencies": {},
|
||||||
|
"hash": "141b4e1e31966242a6fb7c495b52ac3d1221bc75"
|
||||||
|
},
|
||||||
"com.unity.modules.ai": {
|
"com.unity.modules.ai": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
@ -6,18 +6,6 @@ EditorBuildSettings:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Scenes:
|
m_Scenes:
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/StartScreen2.unity
|
path: Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity
|
||||||
guid: f6088ef3502812241bb0d0e97057f6c0
|
guid: e0543d9968729644ba772e12b0f7f922
|
||||||
- enabled: 1
|
|
||||||
path: Assets/Scenes/Levels/Level0.unity
|
|
||||||
guid: 9d1352b0990c7654e94397c2ab2f3fae
|
|
||||||
- enabled: 0
|
|
||||||
path: Assets/Scenes/ShootingScene.unity
|
|
||||||
guid: ab5be6c833a965f4d90255812bc8017f
|
|
||||||
- enabled: 0
|
|
||||||
path: Assets/Scenes/Deprecated/ItemPickupTest.unity
|
|
||||||
guid: 02df17a2572a04a4dbf099929c8a1cfd
|
|
||||||
- enabled: 0
|
|
||||||
path: Assets/Scenes/Deprecated/StartScreen.unity
|
|
||||||
guid: ebfe2b66ea34ee8478703b2f8705084a
|
|
||||||
m_configObjects: {}
|
m_configObjects: {}
|
||||||
|
@ -28,7 +28,7 @@ GraphicsSettings:
|
|||||||
m_LensFlare:
|
m_LensFlare:
|
||||||
m_Mode: 1
|
m_Mode: 1
|
||||||
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
|
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_VideoShadersIncludeMode: 2
|
m_VideoShadersIncludeMode: 1
|
||||||
m_AlwaysIncludedShaders:
|
m_AlwaysIncludedShaders:
|
||||||
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
@ -36,7 +36,8 @@ GraphicsSettings:
|
|||||||
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_PreloadedShaders: []
|
m_PreloadedShaders:
|
||||||
|
- {fileID: 20000000, guid: efa94ff7d3b795e449488c7599ce7c7a, type: 2}
|
||||||
m_PreloadShadersBatchTimeLimit: -1
|
m_PreloadShadersBatchTimeLimit: -1
|
||||||
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
m_CustomRenderPipeline: {fileID: 11400000, guid: 56e379f113b48a44aae6601d44ea5c77, type: 2}
|
m_CustomRenderPipeline: {fileID: 11400000, guid: 56e379f113b48a44aae6601d44ea5c77, type: 2}
|
||||||
@ -47,7 +48,7 @@ GraphicsSettings:
|
|||||||
m_TierSettings: []
|
m_TierSettings: []
|
||||||
m_LightmapStripping: 0
|
m_LightmapStripping: 0
|
||||||
m_FogStripping: 0
|
m_FogStripping: 0
|
||||||
m_InstancingStripping: 0
|
m_InstancingStripping: 1
|
||||||
m_LightmapKeepPlain: 1
|
m_LightmapKeepPlain: 1
|
||||||
m_LightmapKeepDirCombined: 1
|
m_LightmapKeepDirCombined: 1
|
||||||
m_LightmapKeepDynamicPlain: 1
|
m_LightmapKeepDynamicPlain: 1
|
||||||
|
Reference in New Issue
Block a user