From a7eecd0c7a02d9c094c517d992039c0c2c3b7b35 Mon Sep 17 00:00:00 2001 From: NTG Date: Thu, 15 Feb 2024 16:31:39 +0900 Subject: [PATCH] =?UTF-8?q?VContainer=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BlueWater/Assets/01.Scenes/02.Ocean.unity | 63 +++---------------- .../Assets/02.Scripts/GameLifetimeScope.cs | 9 --- .../02.Scripts/GameLifetimeScope.cs.meta | 2 - BlueWater/Packages/manifest.json | 1 - BlueWater/Packages/packages-lock.json | 7 --- 5 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 BlueWater/Assets/02.Scripts/GameLifetimeScope.cs delete mode 100644 BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta diff --git a/BlueWater/Assets/01.Scenes/02.Ocean.unity b/BlueWater/Assets/01.Scenes/02.Ocean.unity index 87f105329..48aaa0c13 100644 --- a/BlueWater/Assets/01.Scenes/02.Ocean.unity +++ b/BlueWater/Assets/01.Scenes/02.Ocean.unity @@ -1882,7 +1882,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: ed36e1064a49b084bac46d5debdc1de3, type: 2} m_BuildHeightMesh: 0 @@ -2131,7 +2131,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &252841256 stripped @@ -3409,7 +3409,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 5ea25972c984549389ea883b022806f2, type: 2} m_BuildHeightMesh: 0 @@ -7127,7 +7127,7 @@ MonoBehaviour: m_OverrideTileSize: 0 m_TileSize: 256 m_OverrideVoxelSize: 0 - m_VoxelSize: 0.13333334 + m_VoxelSize: 0.5 m_MinRegionArea: 2 m_NavMeshData: {fileID: 23800000, guid: 31dac17fce1ca4b4ba03670c1a4102d9, type: 2} m_BuildHeightMesh: 0 @@ -12204,7 +12204,7 @@ SpriteRenderer: m_Size: {x: 10, y: 10} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1001 &1284342734 @@ -18841,8 +18841,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485085414} serializedVersion: 2 - m_LocalRotation: {x: 0.38026944, y: 0.61870486, z: -0.4629384, w: 0.50822} - m_LocalPosition: {x: -0.0019035339, y: 0, z: -0.009597778} + m_LocalRotation: {x: 0.38026953, y: 0.61870474, z: -0.46293837, w: 0.50822} + m_LocalPosition: {x: -0.0019073486, y: 0, z: -0.009613037} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -20900,54 +20900,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1770089208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1770089210} - - component: {fileID: 1770089209} - m_Layer: 0 - m_Name: GameLifetimeScope - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1770089209 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1770089208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6d3174aef91e74449c5585531f446ac, type: 3} - m_Name: - m_EditorClassIdentifier: - parentReference: - TypeName: - autoRun: 1 - autoInjectGameObjects: [] ---- !u!4 &1770089210 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1770089208} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1771297321 GameObject: m_ObjectHideFlags: 0 @@ -40658,7 +40610,6 @@ SceneRoots: - {fileID: 734248431} - {fileID: 2125686127} - {fileID: 1341654437} - - {fileID: 1770089210} - {fileID: 55264371} - {fileID: 1806659892} - {fileID: 642763787} diff --git a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs b/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs deleted file mode 100644 index 64b5b22c7..000000000 --- a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs +++ /dev/null @@ -1,9 +0,0 @@ -using VContainer; -using VContainer.Unity; - -public class GameLifetimeScope : LifetimeScope -{ - protected override void Configure(IContainerBuilder builder) - { - } -} diff --git a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta b/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta deleted file mode 100644 index 9f80f7e41..000000000 --- a/BlueWater/Assets/02.Scripts/GameLifetimeScope.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: f6d3174aef91e74449c5585531f446ac \ No newline at end of file diff --git a/BlueWater/Packages/manifest.json b/BlueWater/Packages/manifest.json index b0316927d..4aeba47f4 100644 --- a/BlueWater/Packages/manifest.json +++ b/BlueWater/Packages/manifest.json @@ -18,7 +18,6 @@ "com.unity.timeline": "1.8.6", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.8.0", - "jp.hadashikick.vcontainer": "https://github.com/hadashiA/VContainer.git?path=VContainer/Assets/VContainer#1.14.0", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/BlueWater/Packages/packages-lock.json b/BlueWater/Packages/packages-lock.json index 0c9d5506e..ffb5a1fc0 100644 --- a/BlueWater/Packages/packages-lock.json +++ b/BlueWater/Packages/packages-lock.json @@ -404,13 +404,6 @@ }, "url": "https://packages.unity.com" }, - "jp.hadashikick.vcontainer": { - "version": "https://github.com/hadashiA/VContainer.git?path=VContainer/Assets/VContainer#1.14.0", - "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "d37fb21ba4d17f3a80effdc8119d985d8d150ebe" - }, "com.unity.modules.accessibility": { "version": "1.0.0", "depth": 0,