From fc6cf4b8201b60a02d1edaf13455b49e0410a392 Mon Sep 17 00:00:00 2001 From: 45 <980269297@qq.com> Date: Mon, 20 Oct 2025 14:25:56 +0800 Subject: [PATCH] =?UTF-8?q?uibug=E4=BF=AE=E7=90=86=EF=BC=8C=E5=9C=B0?= =?UTF-8?q?=E5=9D=97=E5=BD=A2=E7=8A=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Eff_UI/mat_FloorsPanel/mat_Blue.mat | 2 +- .../Eff_UI/mat_FloorsPanel/mat_Green.mat | 2 +- .../Eff_UI/mat_FloorsPanel/mat_Matal.mat | 2 +- .../Eff_UI/mat_FloorsPanel/mat_Red.mat | 2 +- .../Eff_UI/mat_FloorsPanel/mat_White.mat | 2 +- .../Eff_UI/mat_FloorsPanel/mat_Yellow.mat | 2 +- .../Prefab/MapNodePrefab/MapUnity _2.prefab | 2 +- .../Assets/Resources/ItemPrefab/Bamboo.prefab | 2 +- .../Resources/ItemPrefab/Believer.prefab | 2 +- .../Resources/ItemPrefab/BlackSheep.prefab | 2 +- .../Assets/Resources/ItemPrefab/Bomb.prefab | 2 +- .../Resources/ItemPrefab/Burrower.prefab | 2 +- .../Resources/ItemPrefab/BurrowerOld.prefab | 2 +- .../Assets/Resources/ItemPrefab/Cactus.prefab | 2 +- .../Resources/ItemPrefab/CampHold.prefab | 2 +- .../Resources/ItemPrefab/CoconutPalm.prefab | 2 +- .../Resources/ItemPrefab/Cultist.prefab | 2 +- .../Resources/ItemPrefab/FireDragon.prefab | 2 +- .../Resources/ItemPrefab/Hibiscus.prefab | 2 +- .../Assets/Resources/ItemPrefab/Hippo.prefab | 2 +- .../Resources/ItemPrefab/IceDragon.prefab | 2 +- .../Resources/ItemPrefab/Jimsonweed.prefab | 2 +- .../Assets/Resources/ItemPrefab/Lizard.prefab | 2 +- .../Assets/Resources/ItemPrefab/Lotus.prefab | 2 +- .../Assets/Resources/ItemPrefab/Mimic.prefab | 2 +- .../Resources/ItemPrefab/Penguin.prefab | 2 +- .../Assets/Resources/ItemPrefab/Rabbit.prefab | 2 +- .../Resources/ItemPrefab/Singularity.prefab | 2 +- .../Assets/Resources/ItemPrefab/Spruce.prefab | 2 +- .../Resources/ItemPrefab/Squirrel.prefab | 2 +- .../Resources/ItemPrefab/Sunflower.prefab | 2 +- .../Assets/Resources/ItemPrefab/Trash.prefab | 2 +- .../Resources/ItemPrefab/TrashCan.prefab | 2 +- .../Resources/ItemPrefab/Treasure.prefab | 2 +- .../Resources/ItemPrefab/Volcano.prefab | 2 +- .../Assets/Resources/ItemPrefab/Willow.prefab | 2 +- .../Assets/Scenes/SampleScene.unity | 149 +++++++++++++++++- .../Assets/Scenes/StartMainScence.unity | 4 +- 38 files changed, 180 insertions(+), 45 deletions(-) diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat index e36cff1d..ab6fbc21 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat +++ b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat @@ -349,7 +349,7 @@ Material: - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskRefine: {r: 0, g: 1, b: 1, a: 0} - - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.36666682, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat index 64921f60..94d943df 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat +++ b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat @@ -349,7 +349,7 @@ Material: - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskRefine: {r: 0, g: 1, b: 1, a: 0} - - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4333334, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat index ba6e1200..5700c9c6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat +++ b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat @@ -349,7 +349,7 @@ Material: - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskRefine: {r: 0, g: 1, b: 1, a: 0} - - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.30000025, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat index 4575df29..3ca518c3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat +++ b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat @@ -349,7 +349,7 @@ Material: - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskRefine: {r: 0, g: 1, b: 1, a: 0} - - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.4333334, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat index 1bbdf055..0bf0f6ac 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat +++ b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat @@ -30,7 +30,7 @@ Material: m_Ints: [] m_Floats: [] m_Colors: - - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.16408885, a: 0} - _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] --- !u!114 &558137770919511581 diff --git a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat index 6f73c33d..a5aa7b98 100644 --- a/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat +++ b/ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat @@ -349,7 +349,7 @@ Material: - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0} - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0} - _MaskRefine: {r: 0, g: 1, b: 1, a: 0} - - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.30000025, a: 0} + - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0} - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab index 25555997..1f4604c1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/MapNodePrefab/MapUnity _2.prefab @@ -114,7 +114,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.45, y: 1, z: 1} + m_LocalScale: {x: 1.2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4579690416932963536} diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bamboo.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bamboo.prefab index cbaabae6..bf6ae386 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bamboo.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bamboo.prefab @@ -165,7 +165,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab index 79d959ab..c8c622d4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Believer.prefab @@ -165,7 +165,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BlackSheep.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BlackSheep.prefab index b30a1233..bc3367f8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BlackSheep.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BlackSheep.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bomb.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bomb.prefab index 99b02986..d9fa1040 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bomb.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Bomb.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7470075999252082373 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Burrower.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Burrower.prefab index 26b1c51a..d142f8af 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Burrower.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Burrower.prefab @@ -188,7 +188,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BurrowerOld.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BurrowerOld.prefab index e08975fd..8f153d83 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BurrowerOld.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/BurrowerOld.prefab @@ -189,7 +189,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cactus.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cactus.prefab index cb0380ab..6c63002d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cactus.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cactus.prefab @@ -267,7 +267,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &3481001194713140367 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CampHold.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CampHold.prefab index 844ab241..14002bf1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CampHold.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CampHold.prefab @@ -298,7 +298,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &6343251402112390214 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CoconutPalm.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CoconutPalm.prefab index 7c71a2b1..9389c312 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CoconutPalm.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/CoconutPalm.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cultist.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cultist.prefab index 04abfcd2..d23815e8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cultist.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Cultist.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &3481001194713140367 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/FireDragon.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/FireDragon.prefab index dbd48761..5c70b317 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/FireDragon.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/FireDragon.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hibiscus.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hibiscus.prefab index d23daf48..dd69e057 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hibiscus.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hibiscus.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hippo.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hippo.prefab index 52f9d562..8c33f098 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hippo.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Hippo.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/IceDragon.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/IceDragon.prefab index 7c1dd8a5..69374259 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/IceDragon.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/IceDragon.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Jimsonweed.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Jimsonweed.prefab index 5e3a1559..a51291d3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Jimsonweed.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Jimsonweed.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lizard.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lizard.prefab index e1dafd5f..5d3b1c6c 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lizard.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lizard.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lotus.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lotus.prefab index bb6747d8..1ca5672e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lotus.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Lotus.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Mimic.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Mimic.prefab index aaf74034..1db5fb93 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Mimic.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Mimic.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Penguin.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Penguin.prefab index 1d2bea1b..d8d3f950 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Penguin.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Penguin.prefab @@ -165,7 +165,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Rabbit.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Rabbit.prefab index 9ea8268d..c2ff3f06 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Rabbit.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Rabbit.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Singularity.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Singularity.prefab index e10c981f..e36f64dc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Singularity.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Singularity.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Spruce.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Spruce.prefab index 84ef2a88..a6d0dbc9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Spruce.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Spruce.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &3481001194713140367 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Squirrel.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Squirrel.prefab index d67b93f5..739f7021 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Squirrel.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Squirrel.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Sunflower.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Sunflower.prefab index 463033e2..013caf8d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Sunflower.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Sunflower.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Trash.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Trash.prefab index 6a0a3a97..6b1bdd41 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Trash.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Trash.prefab @@ -166,7 +166,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TrashCan.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TrashCan.prefab index bee4e0aa..acb6a889 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TrashCan.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TrashCan.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Treasure.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Treasure.prefab index f19b42dd..5f6cebc4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Treasure.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Treasure.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Volcano.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Volcano.prefab index f0e365a8..29afd2d5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Volcano.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Volcano.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &6555535221111057200 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Willow.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Willow.prefab index 789ebcf5..2b1257b8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Willow.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Willow.prefab @@ -86,7 +86,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.6 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7128087568868009527 MonoBehaviour: diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 8e876d83..07fa350f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -30186,8 +30186,8 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 50 - orthographic: 0 - orthographic size: 5 + orthographic: 1 + orthographic size: 4.2 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -30212,7 +30212,7 @@ Transform: m_GameObject: {fileID: 330585543} serializedVersion: 2 m_LocalRotation: {x: 0.60876137, y: 0, z: 0, w: 0.7933534} - m_LocalPosition: {x: 2.99, y: 10.42, z: -0.7} + m_LocalPosition: {x: 3.3, y: 9.65, z: -0.7} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -62232,7 +62232,7 @@ MonoBehaviour: m_Follow: {fileID: 0} m_Lens: FieldOfView: 50 - OrthographicSize: 5 + OrthographicSize: 4.2 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -62258,7 +62258,7 @@ Transform: m_GameObject: {fileID: 699857786} serializedVersion: 2 m_LocalRotation: {x: 0.60876137, y: 0, z: 0, w: 0.7933534} - m_LocalPosition: {x: 2.99, y: 10.42, z: -0.7} + m_LocalPosition: {x: 3.3, y: 9.65, z: -0.7} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -134719,11 +134719,71 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.y + value: 10.120683 + objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.z + value: 11.270374 + objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6589840777862894700, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.y + value: 10.120684 + objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.z + value: 11.270374 + objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.y + value: 10.120683 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.z + value: 11.270374 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -178502,6 +178562,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 425926192885693485, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 445384651250783383, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3} propertyPath: m_IsActive @@ -178512,6 +178577,11 @@ PrefabInstance: propertyPath: startDelay.scalar value: 0 objectReference: {fileID: 0} + - target: {fileID: 1233851070431612615, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2490369801246147296, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3} propertyPath: TriggerModule.enabled @@ -178522,16 +178592,81 @@ PrefabInstance: propertyPath: TriggerModule.primitives.Array.size value: 0 objectReference: {fileID: 0} + - target: {fileID: 2626598613216839226, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3419851601979508938, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3} propertyPath: m_Name value: par_eff_ui_gameIn objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.y + value: 10.120682 + objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.z + value: 11.270379 + objectReference: {fileID: 0} + - target: {fileID: 4508506136082123919, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6218921812816820065, guid: 926ec935ad69f0f44b5c7c12ab4295d3, type: 3} propertyPath: startDelay.scalar value: 0.58 objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.y + value: 10.120682 + objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.z + value: 11.270379 + objectReference: {fileID: 0} + - target: {fileID: 7267532954517249698, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.y + value: 10.120682 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_LocalScale.z + value: 11.270379 + objectReference: {fileID: 0} + - target: {fileID: 8435594806998215029, guid: 926ec935ad69f0f44b5c7c12ab4295d3, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -186880,9 +187015,9 @@ MonoBehaviour: m_EditorClassIdentifier: mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3} line: 6 - column: 5 + column: 6 generatePoint: {fileID: 514899946} - lineOffSet: {x: 1.43, y: 0, z: 0} + lineOffSet: {x: 1.2, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.86} mapUniteLineOffset: 000000000000000000000000000000000000000000000000 enemyGenerateDataList: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index 421e9d7b..f6869548 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -24287,7 +24287,7 @@ GameObject: - component: {fileID: 513198971} - component: {fileID: 513198970} m_Layer: 5 - m_Name: Canvas8 + m_Name: Canvas9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -24377,7 +24377,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 1637390125 - m_SortingOrder: 8 + m_SortingOrder: 9 m_TargetDisplay: 0 --- !u!1 &513238045 GameObject: