iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[HOTFIX] 1st. everything and spum merge error fix

Browse Source
This commit is contained in:
IDMhan 2024-01-12 13:32:11 +09:00
parent 8fe84ff837
commit 018226aa0a
27 changed files with 211 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BlueWater/Assets/01.Scenes/Import for HDRP.unitypackage.meta
View File

@ -1,15 +0,0 @@
fileFormatVersion: 2
guid: 004bb78c41a95b84093e416b01e1fbe8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 271742
packageName: 'COZY: Stylized Weather 3'
packageVersion: 3.0.2b
assetPath: Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for
HDRP.unitypackage
uploadId: 633375

15
BlueWater/Assets/01.Scenes/Import for SW2 Underwater Integration.unitypackage.meta
View File

@ -1,15 +0,0 @@
fileFormatVersion: 2
guid: aba6fa52907672a4da99307e9c925639
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
AssetOrigin:
serializedVersion: 1
productId: 271742
packageName: 'COZY: Stylized Weather 3'
packageVersion: 3.0.2b
assetPath: Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for
SW2 Underwater Integration.unitypackage
uploadId: 633375

8
BlueWater/Assets/03.Images/Tycoon/Floors.meta Normal file
View File

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

8
BlueWater/Assets/03.Images/Tycoon/Foods.meta Normal file
View File

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

8
BlueWater/Assets/03.Images/Tycoon/Kitchens.meta Normal file
View File

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

8
BlueWater/Assets/03.Materials/Boids.meta Normal file
View File

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

4
BlueWater/Assets/DefaultVolumeProfile.asset.meta
View File

@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 81c413490ad4e8e46ababe286c6441e8
=======
guid: a44f4b795325c428c96946ffadcca9ef
>>>>>>> 3c3086cc4799be66ca98f944d372c1128cbe04c9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

7
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for HDRP.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta Normal file
View File

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

28
BlueWater/Assets/SPUM/Res/Materials/SpriteDiffuse.mat
View File

@ -1,21 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
<<<<<<< HEAD
--- !u!114 &-4476318198658659499
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
=======
>>>>>>> 3c3086cc4799be66ca98f944d372c1128cbe04c9
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -28,22 +12,10 @@ Material:
m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
<<<<<<< HEAD
m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
- MOTIONVECTORS
m_LockedProperties:
=======
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
>>>>>>> 3c3086cc4799be66ca98f944d372c1128cbe04c9
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:

62
BlueWater/Assets/UniversalRenderPipelineGlobalSettings 1.asset Normal file
View File

@ -0,0 +1,62 @@
%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: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
m_Name: UniversalRenderPipelineGlobalSettings 1
m_EditorClassIdentifier:
m_Settings:
m_SettingsList: []
m_RuntimeSettings: []
m_AssetVersion: 5
m_DefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames:
- Default
m_ValidRenderingLayers: 1
lightLayerName0:
lightLayerName1:
lightLayerName2:
lightLayerName3:
lightLayerName4:
lightLayerName5:
lightLayerName6:
lightLayerName7:
apvScenesData:
m_ObsoleteSerializedBakingSets: []
sceneToBakingSet:
m_Keys: []
m_Values: []
bakingSets: []
sceneBounds:
m_Keys: []
m_Values: []
hasProbeVolumes:
m_Keys: []
m_Values:
m_ShaderStrippingSetting:
m_Version: 0
m_ExportShaderVariants: 1
m_ShaderVariantLogLevel: 0
m_StripRuntimeDebugShaders: 1
m_URPShaderStrippingSetting:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
m_ShaderVariantLogLevel: 0
m_ExportShaderVariants: 1
m_StripDebugVariants: 1
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
supportRuntimeDebugDisplay: 0
references:
version: 2
RefIds: []

8
BlueWater/Assets/UniversalRenderPipelineGlobalSettings 1.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 868cc28dde6d8448e9a23ac7d7d34aa7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

8
BlueWater/ProjectSettings/GraphicsSettings.asset
View File

@ -3,7 +3,7 @@
--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 15
serializedVersion: 16
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@ -61,13 +61,13 @@ GraphicsSettings:
m_FogKeepExp: 1
m_FogKeepExp2: 1
m_AlbedoSwatchInfos: []
m_RenderPipelineGlobalSettingsMap:
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 868cc28dde6d8448e9a23ac7d7d34aa7,
type: 2}
m_LightsUseLinearIntensity: 1
m_LightsUseColorTemperature: 1
m_DefaultRenderingLayerMask: 1
m_LogWhenShaderIsCompiled: 0
m_SRPDefaultSettings:
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa,
type: 2}
m_LightProbeOutsideHullStrategy: 0
m_CameraRelativeLightCulling: 0
m_CameraRelativeShadowCulling: 0

4
BlueWater/ProjectSettings/ProjectSettings.asset
View File

@ -814,11 +814,7 @@ PlayerSettings:
webGLCloseOnQuit: 0
scriptingDefineSymbols:
Android: CROSS_PLATFORM_INPUT;MOBILE_INPUT;UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
<<<<<<< HEAD
Bratwurst: UNITY_POST_PROCESSING_STACK_V2;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
=======
Bratwurst: UNITY_POST_PROCESSING_STACK_V2
>>>>>>> 3c3086cc4799be66ca98f944d372c1128cbe04c9
EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS
GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2;INPUT_SYSTEM_PACKAGE;DOOZY_UIMANAGER;DOOZY_REACTOR;DOOZY_SIGNALS