From 0eb7c3cf3ca21fd3511baf1f24b293b23e0a14d7 Mon Sep 17 00:00:00 2001 From: M1_IDMhan Date: Wed, 13 Sep 2023 13:56:22 +0900 Subject: [PATCH] [Hotfix] FindObjectOfType -> FindAnyObjectByType --- BlueWater/Assets/01.Scenes/02.Main.unity | 444 ++++++++---------- BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs | 27 ++ .../Assets/02.Scripts/Ai/Human/NpcAi.cs.meta | 3 + .../02.Scripts/AssaultMode/DraggableCard.cs | 2 +- BlueWater/Assets/02.Scripts/GameManager.cs | 4 +- .../Assets/02.Scripts/Utility/Singletone.cs | 2 +- .../WaterAndFloater/Gerstner wave/Floater.cs | 2 +- .../Assets/03.Materials/CanRemoveAnyone.mat | 133 ++++++ .../03.Materials/CanRemoveAnyone.mat.meta | 8 + ...erer-URP-Package-2021.2+.unitypackage.meta | 7 + .../2DRenderer-URP-Package.unitypackage.meta | 7 + .../URP Unlit Materials.unitypackage.meta | 7 + ...RP Upgrade (2020.3.45f1).unitypackage.meta | 7 + .../FeelTemplatesDemo.unitypackage.meta | 7 + .../NiceVibrations-v-1-7.unitypackage.meta | 7 + .../NiceVibrations-v-2-0-1.unitypackage.meta | 7 + .../NiceVibrations-v-3-9-0.unitypackage.meta | 7 + ...ender Pipeline] Built-In.unitypackage.meta | 7 + ...ipeline] Universal (URP).unitypackage.meta | 7 + ...emple-BuiltInRP-UModeler.unitypackage.meta | 7 + ...LostTemple-HDRP-UModeler.unitypackage.meta | 7 + .../LostTemple-HDRP.unitypackage.meta | 7 + .../LostTemple-URP-UModeler.unitypackage.meta | 7 + .../LostTemple-URP.unitypackage.meta | 7 + .../RainbowHierarchy.src.unitypackage.meta | 7 + ...tom Attribute Processors.unitypackage.meta | 7 + .../Demos/Custom Drawers.unitypackage.meta | 7 + .../Demos/Editor Windows.unitypackage.meta | 7 + .../Sample - RPG Editor.unitypackage.meta | 7 + 29 files changed, 504 insertions(+), 261 deletions(-) create mode 100644 BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs create mode 100644 BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs.meta create mode 100644 BlueWater/Assets/03.Materials/CanRemoveAnyone.mat create mode 100644 BlueWater/Assets/03.Materials/CanRemoveAnyone.mat.meta create mode 100644 BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta create mode 100644 BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta create mode 100644 BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta create mode 100644 BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta create mode 100644 BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta create mode 100644 BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta create mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta create mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta create mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 376d92ba4..460053ef1 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -13895,13 +13895,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 - k__BackingField: {fileID: 11400000, guid: ae7ec952e14cea8499afd4a7b8ee8dfb, + k__BackingField: {fileID: 11400000, guid: d4ed8ebcf48bbdb4d84caf4a4cab7c04, type: 2} - k__BackingField: {fileID: 11400000, guid: 45c7e0b53956de746a37c2e34cb2eb14, + k__BackingField: {fileID: 11400000, guid: 33ac25d6eca8f6447a342dfb44a2a282, type: 2} - k__BackingField: {fileID: 11400000, guid: a017fce7d59b4fc4cb88332a7854eef3, + k__BackingField: {fileID: 11400000, guid: c19ae12d221eae64f90d58e15a04d592, type: 2} - k__BackingField: {fileID: 11400000, guid: d363ca1023ab0754489bda2d69d79564, + k__BackingField: {fileID: 11400000, guid: 0f0ed8929be00534e97398bb55d8c541, + type: 2} + k__BackingField: {fileID: 11400000, guid: d363ca1023ab0754489bda2d69d79564, + type: 2} + k__BackingField: {fileID: 11400000, guid: 6cd374040492d94498f1cce6c3a10e14, type: 2} k__BackingField: {fileID: 11400000, guid: 0db3b35c9121e9e4bbe8559a0922145f, type: 2} @@ -18088,9 +18092,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b934a5073db193343a89fc4597056b68, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -18099,14 +18100,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_001 k__BackingField: ai_view_sailor_e_001 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 30 k__BackingField: 30 k__BackingField: 50 k__BackingField: 0 k__BackingField: 2.5 k__BackingField: 3 + k__BackingField: 0 k__BackingField: 15 + k__BackingField: 0 k__BackingField: 25 k__BackingField: 20 k__BackingField: 0 @@ -18117,7 +18123,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -18150,12 +18155,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 arrowMaxSize: 100 arrowsPoolLocation: {fileID: 0} - inaccuracy: 0 archerLayer: serializedVersion: 2 m_Bits: 66328 @@ -25418,7 +25420,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &187351605 Transform: m_ObjectHideFlags: 0 @@ -27348,7 +27350,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.16666667 + m_VoxelSize: 0.13333334 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: ed36e1064a49b084bac46d5debdc1de3, type: 2} m_BuildHeightMesh: 0 @@ -62440,7 +62442,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1140805708} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, type: 3} @@ -67776,9 +67778,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b934a5073db193343a89fc4597056b68, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -67787,14 +67786,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_001 k__BackingField: ai_view_sailor_e_001 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 30 k__BackingField: 30 k__BackingField: 50 k__BackingField: 0 k__BackingField: 2.5 k__BackingField: 3 + k__BackingField: 0 k__BackingField: 15 + k__BackingField: 0 k__BackingField: 25 k__BackingField: 20 k__BackingField: 0 @@ -67805,7 +67809,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -67838,12 +67841,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 arrowMaxSize: 100 arrowsPoolLocation: {fileID: 0} - inaccuracy: 0 archerLayer: serializedVersion: 2 m_Bits: 66328 @@ -90335,9 +90335,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4363b722ccf9a2b49b7506fd355c6a4d, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -90346,14 +90343,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_captain_e_004 k__BackingField: ai_view_captain_e_004 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 300 k__BackingField: 300 k__BackingField: 30 k__BackingField: 10 k__BackingField: 2.5 k__BackingField: 1.5 + k__BackingField: 0 k__BackingField: 1 + k__BackingField: 0 k__BackingField: 50 k__BackingField: 10 k__BackingField: 1 @@ -90364,7 +90366,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -90397,8 +90398,6 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 --- !u!136 &572767113 CapsuleCollider: @@ -91226,9 +91225,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4363b722ccf9a2b49b7506fd355c6a4d, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -91237,14 +91233,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_004 k__BackingField: ai_view_sailor_e_004 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 60 k__BackingField: 60 k__BackingField: 30 k__BackingField: 10 k__BackingField: 2.5 k__BackingField: 1.5 + k__BackingField: 0 k__BackingField: 1 + k__BackingField: 0 k__BackingField: 50 k__BackingField: 10 k__BackingField: 1 @@ -91255,7 +91256,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -91288,8 +91288,6 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 --- !u!136 &580029271 CapsuleCollider: @@ -94238,12 +94236,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 598581590} m_Mesh: {fileID: 4300770, guid: 02ded044b8e0963439276550f50be6f9, type: 3} ---- !u!1 &598889757 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - m_PrefabInstance: {fileID: 622062897} - m_PrefabAsset: {fileID: 0} --- !u!1 &599273925 GameObject: m_ObjectHideFlags: 0 @@ -97535,19 +97527,10 @@ PrefabInstance: propertyPath: m_Name value: SM_Prop_Cannon_01 (5) objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2556788256821959539, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 622062901} - - targetCorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 622062904} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} --- !u!4 &622062898 stripped Transform: @@ -97555,43 +97538,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 622062897} m_PrefabAsset: {fileID: 0} ---- !u!114 &622062901 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 598889757} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3} - m_Name: - m_EditorClassIdentifier: - power: 0 - reloadTime: 1 - radarTargetUI: {fileID: 0} - projectilePrefab: {fileID: 0} - launchPoint: {fileID: 0} - timeOfFlight: 1 - predictedPos: {fileID: 1287417561} ---- !u!1183024399 &622062904 -LookAtConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 598889757} - m_Enabled: 1 - serializedVersion: 2 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 0 - m_Active: 1 - m_IsLocked: 0 - m_Sources: [] --- !u!1 &622341546 GameObject: m_ObjectHideFlags: 0 @@ -98889,19 +98835,10 @@ PrefabInstance: propertyPath: m_Name value: SM_Prop_Cannon_01 (6) objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2556788256821959539, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1910056923} - - targetCorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1910056926} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} --- !u!4 &631284636 stripped Transform: @@ -114679,9 +114616,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4363b722ccf9a2b49b7506fd355c6a4d, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -114690,14 +114624,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_004 k__BackingField: ai_view_sailor_e_004 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 60 k__BackingField: 60 k__BackingField: 30 k__BackingField: 10 k__BackingField: 2.5 k__BackingField: 1.5 + k__BackingField: 0 k__BackingField: 1 + k__BackingField: 0 k__BackingField: 50 k__BackingField: 10 k__BackingField: 1 @@ -114708,7 +114647,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -114741,8 +114679,6 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 --- !u!136 &742687296 CapsuleCollider: @@ -134535,7 +134471,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.16666667 + m_VoxelSize: 0.13333334 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: e7c7d6f5a0b2b8747b46ea19b5b42628, type: 2} m_BuildHeightMesh: 0 @@ -174767,7 +174703,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1140805708 Transform: m_ObjectHideFlags: 0 @@ -174784,7 +174720,6 @@ Transform: - {fileID: 1010297106} - {fileID: 1344744312} - {fileID: 1274110287} - - {fileID: 1747236060} m_Father: {fileID: 888439616} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1141075561 @@ -193233,7 +193168,7 @@ MonoBehaviour: - {fileID: 9100000, guid: 9f0a9572ffcdefc49b34f61fb0a0f801, type: 2} - {fileID: 9100000, guid: aca0db2952a1e6e4d84c9551f29c5b3e, type: 2} - {fileID: 9100000, guid: 29cd6b82b1043b54791bb98058dac0da, type: 2} - playerUnitList: [] + pirateUnitList: [] --- !u!4 &1228753929 Transform: m_ObjectHideFlags: 0 @@ -197593,19 +197528,10 @@ PrefabInstance: propertyPath: m_Name value: SM_Prop_Cannon_01 (4) objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2556788256821959539, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1647855425} - - targetCorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1647855428} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c9e74631c8994b8cb728cde8efae49a, type: 3} --- !u!4 &1260016380 stripped Transform: @@ -218214,9 +218140,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b934a5073db193343a89fc4597056b68, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -218225,14 +218148,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_001 k__BackingField: ai_view_sailor_e_001 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 30 k__BackingField: 30 k__BackingField: 50 k__BackingField: 0 k__BackingField: 2.5 k__BackingField: 3 + k__BackingField: 0 k__BackingField: 15 + k__BackingField: 0 k__BackingField: 25 k__BackingField: 20 k__BackingField: 0 @@ -218243,7 +218171,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -218276,12 +218203,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 arrowMaxSize: 100 arrowsPoolLocation: {fileID: 0} - inaccuracy: 0 archerLayer: serializedVersion: 2 m_Bits: 66328 @@ -252214,9 +252138,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b934a5073db193343a89fc4597056b68, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -252225,14 +252146,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_001 k__BackingField: ai_view_sailor_e_001 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 30 k__BackingField: 30 k__BackingField: 50 k__BackingField: 0 k__BackingField: 2.5 k__BackingField: 3 + k__BackingField: 0 k__BackingField: 15 + k__BackingField: 0 k__BackingField: 25 k__BackingField: 20 k__BackingField: 0 @@ -252243,7 +252169,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -252276,12 +252201,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 arrowMaxSize: 100 arrowsPoolLocation: {fileID: 0} - inaccuracy: 0 archerLayer: serializedVersion: 2 m_Bits: 66328 @@ -259036,49 +258958,6 @@ SkinnedMeshRenderer: m_Center: {x: -3.037315, y: -0.16242945, z: 0.0017783642} m_Extent: {x: 1.6850129, y: 0.013213582, z: 0.91438246} m_DirtyAABB: 0 ---- !u!1 &1647855422 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - m_PrefabInstance: {fileID: 1260016379} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1647855425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647855422} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3} - m_Name: - m_EditorClassIdentifier: - power: 0 - reloadTime: 1 - radarTargetUI: {fileID: 0} - projectilePrefab: {fileID: 0} - launchPoint: {fileID: 0} - timeOfFlight: 1 - predictedPos: {fileID: 1287417561} ---- !u!1183024399 &1647855428 -LookAtConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1647855422} - m_Enabled: 1 - serializedVersion: 2 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 0 - m_Active: 1 - m_IsLocked: 0 - m_Sources: [] --- !u!1 &1648071599 GameObject: m_ObjectHideFlags: 0 @@ -261249,9 +261128,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4363b722ccf9a2b49b7506fd355c6a4d, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -261260,14 +261136,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_004 k__BackingField: ai_view_sailor_e_004 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 60 k__BackingField: 60 k__BackingField: 30 k__BackingField: 10 k__BackingField: 2.5 k__BackingField: 1.5 + k__BackingField: 0 k__BackingField: 1 + k__BackingField: 0 k__BackingField: 50 k__BackingField: 10 k__BackingField: 1 @@ -261278,7 +261159,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -261311,8 +261191,6 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 --- !u!136 &1667689828 CapsuleCollider: @@ -272400,12 +272278,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!4 &1747236060 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8555732528907214649, guid: 0fb8c5f1ef56d8449a3945a5d886c1b9, - type: 3} - m_PrefabInstance: {fileID: 388824494} - m_PrefabAsset: {fileID: 0} --- !u!1 &1747324802 GameObject: m_ObjectHideFlags: 0 @@ -284093,9 +283965,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b934a5073db193343a89fc4597056b68, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -284104,14 +283973,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_sailor_e_001 k__BackingField: ai_view_sailor_e_001 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 30 k__BackingField: 30 k__BackingField: 50 k__BackingField: 0 k__BackingField: 2.5 k__BackingField: 3 + k__BackingField: 0 k__BackingField: 15 + k__BackingField: 0 k__BackingField: 25 k__BackingField: 20 k__BackingField: 0 @@ -284122,7 +283996,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -284155,12 +284028,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 arrowMaxSize: 100 arrowsPoolLocation: {fileID: 0} - inaccuracy: 0 archerLayer: serializedVersion: 2 m_Bits: 66328 @@ -289291,7 +289161,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871370245} serializedVersion: 2 - m_LocalRotation: {x: 0.6764068, y: -0, z: -0, w: 0.7365283} + m_LocalRotation: {x: 0.67640686, y: 0.00000023841855, z: -0.0000002980232, w: 0.7365282} m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -294406,49 +294276,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1909935235} m_PrefabAsset: {fileID: 0} ---- !u!1 &1910056920 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4836829392273355565, guid: 8c9e74631c8994b8cb728cde8efae49a, - type: 3} - m_PrefabInstance: {fileID: 631284635} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1910056923 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1910056920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3} - m_Name: - m_EditorClassIdentifier: - power: 0 - reloadTime: 1 - radarTargetUI: {fileID: 0} - projectilePrefab: {fileID: 0} - launchPoint: {fileID: 0} - timeOfFlight: 1 - predictedPos: {fileID: 1287417561} ---- !u!1183024399 &1910056926 -LookAtConstraint: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1910056920} - m_Enabled: 1 - serializedVersion: 2 - m_Weight: 1 - m_RotationAtRest: {x: 0, y: 0, z: 0} - m_RotationOffset: {x: 0, y: 0, z: 0} - m_Roll: 0 - m_WorldUpObject: {fileID: 0} - m_UseUpObject: 0 - m_Active: 1 - m_IsLocked: 0 - m_Sources: [] --- !u!1 &1911764924 GameObject: m_ObjectHideFlags: 0 @@ -311983,6 +311810,111 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2030152820} m_Mesh: {fileID: 4300464, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &2030286354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2030286358} + - component: {fileID: 2030286357} + - component: {fileID: 2030286356} + - component: {fileID: 2030286355} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &2030286355 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030286354} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2030286356 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030286354} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2030286357 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030286354} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2030286358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2030286354} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.4, y: 5.6890793, z: -91.4} + m_LocalScale: {x: 120.48793, y: 96.06005, z: 164.58932} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2031112891 GameObject: m_ObjectHideFlags: 0 @@ -321870,9 +321802,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b934a5073db193343a89fc4597056b68, type: 3} m_Name: m_EditorClassIdentifier: - attackerType: -1 - offenseType: 0 - defenseType: 0 skinMaterialList: [] defaultSkinColor: {r: 0, g: 0, b: 0, a: 1} mouseEnterHighlightSkinColor: {r: 1, g: 1, b: 1, a: 1} @@ -321881,14 +321810,19 @@ MonoBehaviour: k__BackingField: k__BackingField: ai_stat_captain_e_001 k__BackingField: ai_view_captain_e_001 - k__BackingField: 2 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 + k__BackingField: -1 k__BackingField: 150 k__BackingField: 150 k__BackingField: 50 k__BackingField: 0 k__BackingField: 2.5 k__BackingField: 3 + k__BackingField: 0 k__BackingField: 15 + k__BackingField: 0 k__BackingField: 25 k__BackingField: 20 k__BackingField: 0 @@ -321899,7 +321833,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 66304 - k__BackingField: 0 k__BackingField: - {fileID: 0} - {fileID: 0} @@ -321932,12 +321865,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} k__BackingField: {fileID: 0} - k__BackingField: 0 - k__BackingField: 0 k__BackingField: 0 arrowMaxSize: 100 arrowsPoolLocation: {fileID: 0} - inaccuracy: 0 archerLayer: serializedVersion: 2 m_Bits: 66328 @@ -329384,4 +329314,6 @@ SceneRoots: - {fileID: 1687254661} - {fileID: 342641572} - {fileID: 99817019} + - {fileID: 388824494} - {fileID: 1574668128} + - {fileID: 2030286358} diff --git a/BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs b/BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs new file mode 100644 index 000000000..871dddd68 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs @@ -0,0 +1,27 @@ +using System; + +namespace BlueWaterProject +{ + public class NpcAi : HumanAi + { + private void Start() + { + Init(); + } + + private void Init() + { + //InitViewModel(Npc SO) + } + // private void InitViewModel(PirateView pirateView) + // { + // SetActiveViewModel(backpackContainer, pirateView.Backpack); + // SetActiveViewModel(leftWeaponContainer, pirateView.LeftWeapon); + // SetActiveViewModel(leftShieldContainer, pirateView.LeftShield); + // SetActiveViewModel(headContainer, pirateView.Head); + // SetActiveViewModel(rightWeaponContainer, pirateView.RightWeapon); + // SetActiveViewModel(bodyContainer, pirateView.Body); + // SetActiveViewModel(flagContainer, pirateView.Flag); + // } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs.meta b/BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs.meta new file mode 100644 index 000000000..fa5f59e31 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Ai/Human/NpcAi.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e4ade29e99e34fc3b3e513a0597e85df +timeCreated: 1694577997 \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs index b0c3b7b45..e0a537091 100644 --- a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs +++ b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs @@ -39,7 +39,7 @@ namespace BlueWaterProject public void CardInit() { var cardInfo = DataManager.Inst.GetPirateUnitStatDictionaryFromKey(card.UnitIdx); - var captainStat = DataManager.Inst.GetEnemyStatDictionaryFromKey(cardInfo.CaptainStatIdx); + var captainStat = DataManager.Inst.GetPirateStatDictionaryFromKey(cardInfo.CaptainStatIdx); typeImage.sprite = DataManager.Inst.cardType[(int)captainStat.UnitType]; } diff --git a/BlueWater/Assets/02.Scripts/GameManager.cs b/BlueWater/Assets/02.Scripts/GameManager.cs index de315954d..aef093744 100644 --- a/BlueWater/Assets/02.Scripts/GameManager.cs +++ b/BlueWater/Assets/02.Scripts/GameManager.cs @@ -18,8 +18,8 @@ namespace BlueWaterProject private void Init() { - CameraController = FindObjectOfType(); - player = FindObjectOfType(); + CameraController = FindAnyObjectByType(); + player = FindAnyObjectByType(); } protected override void OnAwake() { diff --git a/BlueWater/Assets/02.Scripts/Utility/Singletone.cs b/BlueWater/Assets/02.Scripts/Utility/Singletone.cs index 6a5d3207e..7a859dea2 100644 --- a/BlueWater/Assets/02.Scripts/Utility/Singletone.cs +++ b/BlueWater/Assets/02.Scripts/Utility/Singletone.cs @@ -117,7 +117,7 @@ public abstract class Singleton : MonoBehaviour // return _instance; // } // -// _instance = (T)FindObjectOfType(typeof(T)); +// _instance = (T)FindAnyObjectByType(typeof(T)); // // if (_instance == null) // { diff --git a/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs b/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs index d8c91c274..58192a35e 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndFloater/Gerstner wave/Floater.cs @@ -14,7 +14,7 @@ namespace BlueWaterProject private void Start() { - waveGenerator = FindObjectOfType(); + waveGenerator = FindAnyObjectByType(); rb = GetComponent(); } diff --git a/BlueWater/Assets/03.Materials/CanRemoveAnyone.mat b/BlueWater/Assets/03.Materials/CanRemoveAnyone.mat new file mode 100644 index 000000000..6f67095af --- /dev/null +++ b/BlueWater/Assets/03.Materials/CanRemoveAnyone.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4693189023854577904 +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: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CanRemoveAnyone + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/03.Materials/CanRemoveAnyone.mat.meta b/BlueWater/Assets/03.Materials/CanRemoveAnyone.mat.meta new file mode 100644 index 000000000..c53ce1647 --- /dev/null +++ b/BlueWater/Assets/03.Materials/CanRemoveAnyone.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38ff7ca3cc09a42758ce5dbf79a53d70 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta new file mode 100644 index 000000000..b7c4cd42b --- /dev/null +++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a55ee4efaad27d948ba5f03fc6d7bc80 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta new file mode 100644 index 000000000..559272344 --- /dev/null +++ b/BlueWater/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed9b95dc6ed6d0647ad7f1a8f305385d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta new file mode 100644 index 000000000..cdb770faa --- /dev/null +++ b/BlueWater/Assets/Blobcreate/Projectile Toolkit/Materials/URP Unlit Materials.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ff1f29eab234cf4490d9bb383892c44 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta new file mode 100644 index 000000000..a9c2e2131 --- /dev/null +++ b/BlueWater/Assets/Epic Toon FX/Upgrade/ETFX URP Upgrade (2020.3.45f1).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d7c4217783978e4abe6496ac71eee94 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta new file mode 100644 index 000000000..508065e3b --- /dev/null +++ b/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta new file mode 100644 index 000000000..b4ec97874 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 078b8f13a17171b49892ad10426d5af0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta new file mode 100644 index 000000000..2ac65e5d2 --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f9406a33814af9c47b352e77f079d798 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta new file mode 100644 index 000000000..69d7b56dd --- /dev/null +++ b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9aacf6f3043624194bb6f6fe9a580786 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta new file mode 100644 index 000000000..be555027e --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f4227764308e84f89a765fbf315e2945 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta new file mode 100644 index 000000000..350ee4c64 --- /dev/null +++ b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 41e59f562b69648719f2424c438758f3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..d7e559c52 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b044a2387a61dac41bdf204adffdce9d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta new file mode 100644 index 000000000..8ac8bbf10 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd287c84e887ea24a8679e67aac7c074 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta new file mode 100644 index 000000000..589ee74d0 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta new file mode 100644 index 000000000..e22c323d5 --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f211254f5bfad224ba88868f2c75432c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta new file mode 100644 index 000000000..ea9dafacc --- /dev/null +++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4368c9be31b3c174dbfd80f2caf98889 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta new file mode 100644 index 000000000..614e98f98 --- /dev/null +++ b/BlueWater/Assets/Plugins/Borodar/RainbowHierarchy/Source/RainbowHierarchy.src.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 617b3f1032a08c14ebfedfa340767cdf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 000000000..1eadf09a3 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 000000000..f073d2ab4 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 000000000..130722af7 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 000000000..f9b8ed82b --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: