diff --git a/.gitignore b/.gitignore index a53f5a85..f96b5463 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ Assets/1.TeamWorkspace/Ann Assets/1.TeamWorkspace/Amee Assets/1.TeamWorkspace/Sopha Assets/1.TeamWorkspace/Boy -Assets/1.TeamWorkspace/Phettae # This .gitignore file should be placed at the root of your Unity project directory # diff --git a/Assets/1.TeamWorkspace/GameTesting/GameSystem/SendRecieveData.cs b/Assets/1.TeamWorkspace/GameTesting/GameSystem/SendRecieveData.cs index 3610f2b4..2f63522a 100644 --- a/Assets/1.TeamWorkspace/GameTesting/GameSystem/SendRecieveData.cs +++ b/Assets/1.TeamWorkspace/GameTesting/GameSystem/SendRecieveData.cs @@ -15,7 +15,7 @@ protected override void OtherUpdate() Dictionary args = new Dictionary { {"id", ConnectionManager.Instance.GetConnectionId()}, {"mes", mes}, - {"score_val", GameManager.instance.score.ToString()}, + {"score_val", CurrentScore().ToString()}, {"name_val", "NIGG"} }; Debug.Log("sent to GAMA: " + mes); @@ -28,6 +28,13 @@ protected override void OtherUpdate() message = null; } } + // The bridge sits in both module scenes: Module 1 has GameManager, Module 2 has M2Manager. + static int CurrentScore() + { + if (GameManager.instance != null) return GameManager.instance.score; + if (M2Manager.Instance != null) return M2Manager.Instance.score; + return 0; + } public class GAMAMessages { public int cycle; diff --git a/Assets/1.TeamWorkspace/GameTesting/GameSystem/WaterContainer.cs b/Assets/1.TeamWorkspace/GameTesting/GameSystem/WaterContainer.cs index 1e9cc1e6..bb69324b 100644 --- a/Assets/1.TeamWorkspace/GameTesting/GameSystem/WaterContainer.cs +++ b/Assets/1.TeamWorkspace/GameTesting/GameSystem/WaterContainer.cs @@ -13,7 +13,8 @@ private void Start() } public IEnumerator Fill() { - yield return new WaitUntil(()=>GameManager.instance.IsRain); + // Shared prefabs carry this script into Module 2, which has no GameManager: wait instead of throwing. + yield return new WaitUntil(() => GameManager.instance != null && GameManager.instance.IsRain); WaterOBJ.SetActive(true); isFill = true; } diff --git a/Assets/1.TeamWorkspace/Phettae.meta b/Assets/1.TeamWorkspace/Module2.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae.meta rename to Assets/1.TeamWorkspace/Module2.meta diff --git a/Assets/1.TeamWorkspace/Phettae/G.meta b/Assets/1.TeamWorkspace/Module2/G.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/G.meta rename to Assets/1.TeamWorkspace/Module2/G.meta diff --git a/Assets/1.TeamWorkspace/Phettae/G/Roun.shadergraph b/Assets/1.TeamWorkspace/Module2/G/Roun.shadergraph similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/G/Roun.shadergraph rename to Assets/1.TeamWorkspace/Module2/G/Roun.shadergraph diff --git a/Assets/1.TeamWorkspace/Phettae/G/Roun.shadergraph.meta b/Assets/1.TeamWorkspace/Module2/G/Roun.shadergraph.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/G/Roun.shadergraph.meta rename to Assets/1.TeamWorkspace/Module2/G/Roun.shadergraph.meta diff --git a/Assets/1.TeamWorkspace/Phettae/G/Shader Graphs_Roun.mat b/Assets/1.TeamWorkspace/Module2/G/Shader Graphs_Roun.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/G/Shader Graphs_Roun.mat rename to Assets/1.TeamWorkspace/Module2/G/Shader Graphs_Roun.mat diff --git a/Assets/1.TeamWorkspace/Phettae/G/Shader Graphs_Roun.mat.meta b/Assets/1.TeamWorkspace/Module2/G/Shader Graphs_Roun.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/G/Shader Graphs_Roun.mat.meta rename to Assets/1.TeamWorkspace/Module2/G/Shader Graphs_Roun.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material.meta b/Assets/1.TeamWorkspace/Module2/Material.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material.meta rename to Assets/1.TeamWorkspace/Module2/Material.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Blue.mat b/Assets/1.TeamWorkspace/Module2/Material/Blue.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Blue.mat rename to Assets/1.TeamWorkspace/Module2/Material/Blue.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Blue.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Blue.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Blue.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Blue.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Cream_Effect.mat b/Assets/1.TeamWorkspace/Module2/Material/Cream_Effect.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Cream_Effect.mat rename to Assets/1.TeamWorkspace/Module2/Material/Cream_Effect.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Cream_Effect.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Cream_Effect.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Cream_Effect.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Cream_Effect.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Green.mat b/Assets/1.TeamWorkspace/Module2/Material/Green.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Green.mat rename to Assets/1.TeamWorkspace/Module2/Material/Green.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Green.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Green.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Green.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Green.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Jar_top.mat b/Assets/1.TeamWorkspace/Module2/Material/Jar_top.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Jar_top.mat rename to Assets/1.TeamWorkspace/Module2/Material/Jar_top.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Jar_top.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Jar_top.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Jar_top.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Jar_top.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 1.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 1.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 1.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 1.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 1.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 1.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 1.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 1.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 2.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 2.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 2.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 2.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 2.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 2.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001 2.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001 2.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.001.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.001.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002 1.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002 1.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002 1.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002 1.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002 1.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002 1.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002 1.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002 1.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.002.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.002.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.003.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.003.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.003.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.003.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.003.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.003.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.003.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.003.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Material.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Material.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Mosquito_Cream.png b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Mosquito_Cream.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Mosquito_Cream.png rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Mosquito_Cream.png diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Mosquito_Cream.png.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Mosquito_Cream.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Mosquito_Cream.png.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Mosquito_Cream.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Waste_Can.mat b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Waste_Can.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Waste_Can.mat rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Waste_Can.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Waste_Can.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Waste_Can.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Model_Matrial/Waste_Can.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Model_Matrial/Waste_Can.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Red.mat b/Assets/1.TeamWorkspace/Module2/Material/Red.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Red.mat rename to Assets/1.TeamWorkspace/Module2/Material/Red.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Red.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Red.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Red.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Red.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Shilde.mat b/Assets/1.TeamWorkspace/Module2/Material/Shilde.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Shilde.mat rename to Assets/1.TeamWorkspace/Module2/Material/Shilde.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Material/Shilde.mat.meta b/Assets/1.TeamWorkspace/Module2/Material/Shilde.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Material/Shilde.mat.meta rename to Assets/1.TeamWorkspace/Module2/Material/Shilde.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo.meta b/Assets/1.TeamWorkspace/Module2/Mo.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo.meta rename to Assets/1.TeamWorkspace/Module2/Mo.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Bin2.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Bin2.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Bin2.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Bin2.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Bin2.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Bin2.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Bin2.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Bin2.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Cream.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Cream.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Cream.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Cream.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Cream.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Cream.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Cream.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Cream.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Cream_effect.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Cream_effect.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Cream_effect.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Cream_effect.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Cream_effect.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Cream_effect.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Cream_effect.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Cream_effect.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials.meta b/Assets/1.TeamWorkspace/Module2/Mo/Materials.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Materials.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.001.mat b/Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.001.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.001.mat rename to Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.001.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.001.mat.meta b/Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.001.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.001.mat.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.001.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.002.mat b/Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.002.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.002.mat rename to Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.002.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.002.mat.meta b/Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.002.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.002.mat.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.002.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.003.mat b/Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.003.mat similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.003.mat rename to Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.003.mat diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.003.mat.meta b/Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.003.mat.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Materials/Material.003.mat.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Materials/Material.003.mat.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Banana Leaf.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Banana Leaf.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Banana Leaf.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Banana Leaf.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Banana Leaf.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Banana Leaf.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Banana Leaf.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Banana Leaf.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Chopsticks.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Chopsticks.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Chopsticks.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Chopsticks.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Chopsticks.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Chopsticks.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Chopsticks.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Chopsticks.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Cup Noodle.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Cup Noodle.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Cup Noodle.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Cup Noodle.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Cup Noodle.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Cup Noodle.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Cup Noodle.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Cup Noodle.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Foam Box.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Foam Box.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Foam Box.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Foam Box.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Foam Box.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Foam Box.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Foam Box.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Foam Box.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Banana_Leaf.jpg.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Screenshot (329).png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_FoamBox.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Image Texture/Texture_Tissue.jpg.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Plastic Cup.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Plastic Cup.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Plastic Cup.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Plastic Cup.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Plastic Cup.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Plastic Cup.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Plastic Cup.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Plastic Cup.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Tissue.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Tissue.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Tissue.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Tissue.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Tissue.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Tissue.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/General Waste/Tissue.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/General Waste/Tissue.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Car oils .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Car oils .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Car oils .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Car oils .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Car oils .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Car oils .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Car oils .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Car oils .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Rush steel spray .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Serum .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Serum .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Serum .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Serum .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Serum .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Serum .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Serum .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Serum .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Spray .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Spray .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Spray .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Spray .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Spray .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Spray .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Spray .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Spray .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic barrel .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/Toxic bottle .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/barrel .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/barrel .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/barrel .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/barrel .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/barrel .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/barrel .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/barrel .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/barrel .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/FlameBlue_1024x1024.webp.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/emo08che.jpg.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/image texture/rusty_metal_05_diff_4k.jpg.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/tao kat .fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/tao kat .fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/tao kat .fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/tao kat .fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/tao kat .fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/tao kat .fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Hazardous Waste/tao kat .fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Hazardous Waste/tao kat .fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Banana.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Banana.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Banana.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Banana.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Banana.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Banana.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Banana.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Banana.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Cheese.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Cheese.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Cheese.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Cheese.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Cheese.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Cheese.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Cheese.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Cheese.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Egg.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Egg.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Egg.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Egg.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Egg.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Egg.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Egg.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Egg.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Banana.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Banana.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Banana.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Banana.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Banana.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Banana.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Banana.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Banana.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Cheese.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Cheese.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Cheese.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Cheese.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Cheese.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Cheese.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Cheese.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Cheese.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Egg.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Egg.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Egg.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Egg.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Egg.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Egg.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Egg.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Egg.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Pizza.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Pizza.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Pizza.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Pizza.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Pizza.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Pizza.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Pizza.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Pizza.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Rose.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Rose.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Rose.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Rose.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Rose.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Rose.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Rose.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Rose.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Tomato.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Tomato.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Tomato.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Tomato.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Tomato.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Tomato.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Tomato.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Tomato.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Watermelon.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Watermelon.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Watermelon.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Watermelon.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Watermelon.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Watermelon.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Image/Watermelon.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Image/Watermelon.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Pizza.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Pizza.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Pizza.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Pizza.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Pizza.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Pizza.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Pizza.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Pizza.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Rose.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Rose.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Rose.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Rose.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Rose.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Rose.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Rose.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Rose.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Tomato.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Tomato.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Tomato.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Tomato.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Tomato.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Tomato.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Tomato.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Tomato.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Watermelon.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Watermelon.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Watermelon.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Watermelon.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Watermelon.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Watermelon.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Organic Waste/Watermelon.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Organic Waste/Watermelon.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Alcohol_Glass.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Bottle.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Bottle.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Bottle.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Bottle.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Bottle.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Bottle.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Bottle.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Bottle.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Glass_Jar.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Metal can.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Metal can.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Metal can.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Metal can.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Metal can.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Metal can.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Metal can.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Metal can.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Milk_Carton.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Pizza_Box.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Recyclable waste.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/Image/Soda_Can_RED.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Alcohol_Glass.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Glass_Jar.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Metal_can.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Milk_Carton.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Pizza_box.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_Blue.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Soda_can_RED.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/SM_Water_Bottle.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/T_GradientMap.png b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/T_GradientMap.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/T_GradientMap.png rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/T_GradientMap.png diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/T_GradientMap.png.meta b/Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/T_GradientMap.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Model trash waste/Recycle Waste/T_GradientMap.png.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Model trash waste/Recycle Waste/T_GradientMap.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Pa.fbx b/Assets/1.TeamWorkspace/Module2/Mo/Pa.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Pa.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/Pa.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/Pa.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/Pa.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/Pa.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/Pa.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/SM_ElectricRacket.fbx b/Assets/1.TeamWorkspace/Module2/Mo/SM_ElectricRacket.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/SM_ElectricRacket.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/SM_ElectricRacket.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/SM_ElectricRacket.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/SM_ElectricRacket.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/SM_ElectricRacket.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/SM_ElectricRacket.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/T_FX_Snap.psd b/Assets/1.TeamWorkspace/Module2/Mo/T_FX_Snap.psd similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/T_FX_Snap.psd rename to Assets/1.TeamWorkspace/Module2/Mo/T_FX_Snap.psd diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/T_FX_Snap.psd.meta b/Assets/1.TeamWorkspace/Module2/Mo/T_FX_Snap.psd.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/T_FX_Snap.psd.meta rename to Assets/1.TeamWorkspace/Module2/Mo/T_FX_Snap.psd.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/watch.fbx b/Assets/1.TeamWorkspace/Module2/Mo/watch.fbx similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/watch.fbx rename to Assets/1.TeamWorkspace/Module2/Mo/watch.fbx diff --git a/Assets/1.TeamWorkspace/Phettae/Mo/watch.fbx.meta b/Assets/1.TeamWorkspace/Module2/Mo/watch.fbx.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Mo/watch.fbx.meta rename to Assets/1.TeamWorkspace/Module2/Mo/watch.fbx.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs.meta b/Assets/1.TeamWorkspace/Module2/Prefabs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Bin2.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Bin2.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Bin2.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Bin2.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Bin2.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Bin2.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Bin2.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Bin2.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Mosquito_Female.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Mosquito_Female.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Mosquito_Female.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Mosquito_Female.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Mosquito_Female.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Mosquito_Female.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Mosquito_Female.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Mosquito_Female.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Pa (1).prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Pa (1).prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Pa (1).prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Pa (1).prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Pa (1).prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Pa (1).prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Pa (1).prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Pa (1).prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Cream_effect.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Cream_effect.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Cream_effect.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Cream_effect.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Cream_effect.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Cream_effect.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Cream_effect.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Cream_effect.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Particle_Spawn.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Particle_Spawn.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Particle_Spawn.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Particle_Spawn.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Particle_Spawn.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Particle_Spawn.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Particle_Spawn.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Particle_Spawn.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Water_Splash_Effect.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Water_Splash_Effect.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Water_Splash_Effect.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Water_Splash_Effect.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Water_Splash_Effect.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Water_Splash_Effect.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Particle/Water_Splash_Effect.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Particle/Water_Splash_Effect.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Player.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player/Cream.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Player/Cream.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player/Cream.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player/Cream.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player/Cream.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Player/Cream.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player/Cream.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player/Cream.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player/SM_ElectricRacket.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Player/SM_ElectricRacket.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player/SM_ElectricRacket.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player/SM_ElectricRacket.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player/SM_ElectricRacket.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Player/SM_ElectricRacket.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player/SM_ElectricRacket.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player/SM_ElectricRacket.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player/VR_Player_Module_2.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Player/VR_Player_Module_2.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player/VR_Player_Module_2.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player/VR_Player_Module_2.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Player/VR_Player_Module_2.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Player/VR_Player_Module_2.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Player/VR_Player_Module_2.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Player/VR_Player_Module_2.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/UI.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/UI.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/UI.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/UI.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/PF_VaseWithFlowers.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/PF_VaseWithFlowers.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/PF_VaseWithFlowers.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/PF_VaseWithFlowers.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/PF_VaseWithFlowers.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/PF_VaseWithFlowers.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/PF_VaseWithFlowers.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/PF_VaseWithFlowers.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/SM_Jar_Ex.prefab b/Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/SM_Jar_Ex.prefab similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/SM_Jar_Ex.prefab rename to Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/SM_Jar_Ex.prefab diff --git a/Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/SM_Jar_Ex.prefab.meta b/Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/SM_Jar_Ex.prefab.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Prefabs/Water Contain/SM_Jar_Ex.prefab.meta rename to Assets/1.TeamWorkspace/Module2/Prefabs/Water Contain/SM_Jar_Ex.prefab.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scene.meta b/Assets/1.TeamWorkspace/Module2/Scene.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scene.meta rename to Assets/1.TeamWorkspace/Module2/Scene.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scene/Module_2_MainScene.unity b/Assets/1.TeamWorkspace/Module2/Scene/Module_2_MainScene.unity similarity index 99% rename from Assets/1.TeamWorkspace/Phettae/Scene/Module_2_MainScene.unity rename to Assets/1.TeamWorkspace/Module2/Scene/Module_2_MainScene.unity index eec9891b..fef46e30 100644 --- a/Assets/1.TeamWorkspace/Phettae/Scene/Module_2_MainScene.unity +++ b/Assets/1.TeamWorkspace/Module2/Scene/Module_2_MainScene.unity @@ -3114,7 +3114,6 @@ GameObject: m_Component: - component: {fileID: 326674666} - component: {fileID: 326674663} - - component: {fileID: 326674665} - component: {fileID: 326674664} m_Layer: 7 m_Name: CameraUI @@ -3218,14 +3217,6 @@ MonoBehaviour: m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 m_Version: 2 ---- !u!81 &326674665 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 326674662} - m_Enabled: 1 --- !u!4 &326674666 Transform: m_ObjectHideFlags: 0 @@ -3774,6 +3765,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2723373030106347489, guid: dacd338a3ef0e194bb382d72ad058119, type: 3} m_PrefabInstance: {fileID: 2507683916883717659} m_PrefabAsset: {fileID: 0} +--- !u!1 &401769911 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2379950430341512700, guid: dacd338a3ef0e194bb382d72ad058119, type: 3} + m_PrefabInstance: {fileID: 2507683916883717659} + m_PrefabAsset: {fileID: 0} --- !u!1001 &404140305 PrefabInstance: m_ObjectHideFlags: 0 @@ -16327,7 +16323,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::SendRecieveData primaryRightHandButton: {fileID: 0} - player: {fileID: 0} + player: {fileID: 401769911} Ground: {fileID: 7290993179999183354, guid: 7b886bd7aa09cc246875597729385633, type: 3} --- !u!114 &1380034232 MonoBehaviour: @@ -16357,7 +16353,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::SendReceiveMessageExample primaryRightHandButton: {fileID: 0} - player: {fileID: 0} + player: {fileID: 401769911} Ground: {fileID: 0} --- !u!1001 &1388699124 PrefabInstance: diff --git a/Assets/1.TeamWorkspace/Phettae/Scene/Module_2_MainScene.unity.meta b/Assets/1.TeamWorkspace/Module2/Scene/Module_2_MainScene.unity.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scene/Module_2_MainScene.unity.meta rename to Assets/1.TeamWorkspace/Module2/Scene/Module_2_MainScene.unity.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scene/Tutorial_M2.unity b/Assets/1.TeamWorkspace/Module2/Scene/Tutorial_M2.unity similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scene/Tutorial_M2.unity rename to Assets/1.TeamWorkspace/Module2/Scene/Tutorial_M2.unity diff --git a/Assets/1.TeamWorkspace/Phettae/Scene/Tutorial_M2.unity.meta b/Assets/1.TeamWorkspace/Module2/Scene/Tutorial_M2.unity.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scene/Tutorial_M2.unity.meta rename to Assets/1.TeamWorkspace/Module2/Scene/Tutorial_M2.unity.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts.meta b/Assets/1.TeamWorkspace/Module2/Scripts.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts.meta rename to Assets/1.TeamWorkspace/Module2/Scripts.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Effect.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Effect.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Effect.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Effect.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Effect/CreamEff.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Effect/CreamEff.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Effect/CreamEff.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Effect/CreamEff.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Effect/CreamEff.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Effect/CreamEff.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Effect/CreamEff.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Effect/CreamEff.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager.meta b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/M2Manager.cs b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager/M2Manager.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/M2Manager.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager/M2Manager.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/M2Manager.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager/M2Manager.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/M2Manager.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager/M2Manager.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/MosquitoSpawn.cs b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager/MosquitoSpawn.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/MosquitoSpawn.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager/MosquitoSpawn.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/MosquitoSpawn.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager/MosquitoSpawn.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/MosquitoSpawn.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager/MosquitoSpawn.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/TutorialManager.cs b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager/TutorialManager.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/TutorialManager.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager/TutorialManager.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/TutorialManager.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/GameManager/TutorialManager.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/GameManager/TutorialManager.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/GameManager/TutorialManager.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Hand.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand/Cream.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Hand/Cream.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand/Cream.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand/Cream.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand/Cream.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Hand/Cream.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand/Cream.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand/Cream.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand/NormalHand.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Hand/NormalHand.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand/NormalHand.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand/NormalHand.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand/NormalHand.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Hand/NormalHand.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand/NormalHand.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand/NormalHand.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand/SwatterHand.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Hand/SwatterHand.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand/SwatterHand.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand/SwatterHand.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Hand/SwatterHand.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Hand/SwatterHand.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Hand/SwatterHand.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Hand/SwatterHand.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Input Device.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Input Device.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Input Device.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Input Device.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/HandAnimation.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Input Device/HandAnimation.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/HandAnimation.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Input Device/HandAnimation.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/HandAnimation.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Input Device/HandAnimation.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/HandAnimation.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Input Device/HandAnimation.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/InputVR.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Input Device/InputVR.cs similarity index 94% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/InputVR.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Input Device/InputVR.cs index 0e71226c..6aa64907 100644 --- a/Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/InputVR.cs +++ b/Assets/1.TeamWorkspace/Module2/Scripts/Input Device/InputVR.cs @@ -3,8 +3,6 @@ using UnityEngine.InputSystem; using UnityEngine; using UnityEngine.XR; -using UnityEngine.iOS; -using UnityEngine.tvOS; public class InputVR : MonoBehaviour { public UnityEngine.XR.InputDevice _rightController; @@ -28,17 +26,14 @@ private void InitializeInputDevices() if (!_rightController.isValid) { InitializeInputDevice(InputDeviceCharacteristics.Controller | InputDeviceCharacteristics.Right, ref _rightController); - print("A"); } if (!_leftController.isValid) { InitializeInputDevice(InputDeviceCharacteristics.Controller | InputDeviceCharacteristics.Left, ref _leftController); - print("S"); } if (!_HMD.isValid) { InitializeInputDevice(InputDeviceCharacteristics.HeadMounted, ref _HMD); - print("D"); } } diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/InputVR.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Input Device/InputVR.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Input Device/InputVR.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Input Device/InputVR.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Trash.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Trash.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Trash.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Trash.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Trash/TrashBin.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Trash/TrashBin.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Trash/TrashBin.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Trash/TrashBin.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Trash/TrashBin.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Trash/TrashBin.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Trash/TrashBin.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Trash/TrashBin.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI.meta b/Assets/1.TeamWorkspace/Module2/Scripts/UI.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/UI.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/CameraHandFollow.cs b/Assets/1.TeamWorkspace/Module2/Scripts/UI/CameraHandFollow.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/CameraHandFollow.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/CameraHandFollow.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/CameraHandFollow.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/UI/CameraHandFollow.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/CameraHandFollow.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/CameraHandFollow.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/CanvasFollower.cs b/Assets/1.TeamWorkspace/Module2/Scripts/UI/CanvasFollower.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/CanvasFollower.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/CanvasFollower.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/CanvasFollower.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/UI/CanvasFollower.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/CanvasFollower.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/CanvasFollower.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/UIHand.cs b/Assets/1.TeamWorkspace/Module2/Scripts/UI/UIHand.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/UIHand.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/UIHand.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/UIHand.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/UI/UIHand.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/UIHand.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/UIHand.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_HandSwatter_Button.cs b/Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_HandSwatter_Button.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_HandSwatter_Button.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_HandSwatter_Button.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_HandSwatter_Button.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_HandSwatter_Button.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_HandSwatter_Button.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_HandSwatter_Button.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_Hand_Button.cs b/Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_Hand_Button.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_Hand_Button.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_Hand_Button.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_Hand_Button.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_Hand_Button.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/UI/UI_Hand_Button.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/UI/UI_Hand_Button.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/FishCon.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/FishCon.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/FishCon.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/FishCon.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/FishCon.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/FishCon.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/FishCon.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/FishCon.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/Jar.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/Jar.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/Jar.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/Jar.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/Jar.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/Jar.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/Jar.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/Jar.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/WaterButton.cs b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/WaterButton.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/WaterButton.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/WaterButton.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/WaterButton.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/WaterButton.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/Water_contain/WaterButton.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/Water_contain/WaterButton.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/mOSQUTO.meta b/Assets/1.TeamWorkspace/Module2/Scripts/mOSQUTO.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/mOSQUTO.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/mOSQUTO.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/mOSQUTO/Mosquto.cs b/Assets/1.TeamWorkspace/Module2/Scripts/mOSQUTO/Mosquto.cs similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/mOSQUTO/Mosquto.cs rename to Assets/1.TeamWorkspace/Module2/Scripts/mOSQUTO/Mosquto.cs diff --git a/Assets/1.TeamWorkspace/Phettae/Scripts/mOSQUTO/Mosquto.cs.meta b/Assets/1.TeamWorkspace/Module2/Scripts/mOSQUTO/Mosquto.cs.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Scripts/mOSQUTO/Mosquto.cs.meta rename to Assets/1.TeamWorkspace/Module2/Scripts/mOSQUTO/Mosquto.cs.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sound Effect.meta b/Assets/1.TeamWorkspace/Module2/Sound Effect.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sound Effect.meta rename to Assets/1.TeamWorkspace/Module2/Sound Effect.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sound Effect/Water splash.meta b/Assets/1.TeamWorkspace/Module2/Sound Effect/Water splash.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sound Effect/Water splash.meta rename to Assets/1.TeamWorkspace/Module2/Sound Effect/Water splash.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sound Effect/Water splash/Water_splash.mp3 b/Assets/1.TeamWorkspace/Module2/Sound Effect/Water splash/Water_splash.mp3 similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sound Effect/Water splash/Water_splash.mp3 rename to Assets/1.TeamWorkspace/Module2/Sound Effect/Water splash/Water_splash.mp3 diff --git a/Assets/1.TeamWorkspace/Phettae/Sound Effect/Water splash/Water_splash.mp3.meta b/Assets/1.TeamWorkspace/Module2/Sound Effect/Water splash/Water_splash.mp3.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sound Effect/Water splash/Water_splash.mp3.meta rename to Assets/1.TeamWorkspace/Module2/Sound Effect/Water splash/Water_splash.mp3.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite.meta b/Assets/1.TeamWorkspace/Module2/Sprite.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite.meta rename to Assets/1.TeamWorkspace/Module2/Sprite.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Cream_VF.png b/Assets/1.TeamWorkspace/Module2/Sprite/Cream_VF.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Cream_VF.png rename to Assets/1.TeamWorkspace/Module2/Sprite/Cream_VF.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Cream_VF.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/Cream_VF.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Cream_VF.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/Cream_VF.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Han.png b/Assets/1.TeamWorkspace/Module2/Sprite/Han.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Han.png rename to Assets/1.TeamWorkspace/Module2/Sprite/Han.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Han.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/Han.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Han.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/Han.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/MosaqutiSwatter.png b/Assets/1.TeamWorkspace/Module2/Sprite/MosaqutiSwatter.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/MosaqutiSwatter.png rename to Assets/1.TeamWorkspace/Module2/Sprite/MosaqutiSwatter.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/MosaqutiSwatter.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/MosaqutiSwatter.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/MosaqutiSwatter.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/MosaqutiSwatter.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Score.png b/Assets/1.TeamWorkspace/Module2/Sprite/Score.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Score.png rename to Assets/1.TeamWorkspace/Module2/Sprite/Score.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Score.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/Score.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Score.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/Score.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Shield 1.png b/Assets/1.TeamWorkspace/Module2/Sprite/Shield 1.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Shield 1.png rename to Assets/1.TeamWorkspace/Module2/Sprite/Shield 1.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Shield 1.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/Shield 1.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Shield 1.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/Shield 1.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Shield.png b/Assets/1.TeamWorkspace/Module2/Sprite/Shield.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Shield.png rename to Assets/1.TeamWorkspace/Module2/Sprite/Shield.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Shield.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/Shield.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Shield.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/Shield.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Watch.png b/Assets/1.TeamWorkspace/Module2/Sprite/Watch.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Watch.png rename to Assets/1.TeamWorkspace/Module2/Sprite/Watch.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/Watch.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/Watch.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/Watch.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/Watch.png.meta diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/mosquit_cream-removebg-preview.png b/Assets/1.TeamWorkspace/Module2/Sprite/mosquit_cream-removebg-preview.png similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/mosquit_cream-removebg-preview.png rename to Assets/1.TeamWorkspace/Module2/Sprite/mosquit_cream-removebg-preview.png diff --git a/Assets/1.TeamWorkspace/Phettae/Sprite/mosquit_cream-removebg-preview.png.meta b/Assets/1.TeamWorkspace/Module2/Sprite/mosquit_cream-removebg-preview.png.meta similarity index 100% rename from Assets/1.TeamWorkspace/Phettae/Sprite/mosquit_cream-removebg-preview.png.meta rename to Assets/1.TeamWorkspace/Module2/Sprite/mosquit_cream-removebg-preview.png.meta diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0ba28986..c6e9605e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -54,7 +54,7 @@ EditorBuildSettings: path: Assets/1.TeamWorkspace/GameTesting/Scene/Module_1_MainScene.unity guid: 69e69fcaf6fe326439ca73d9fc683741 - enabled: 1 - path: Assets/1.TeamWorkspace/Phettae/Scene/Module_2_MainScene.unity + path: Assets/1.TeamWorkspace/Module2/Scene/Module_2_MainScene.unity guid: 35c87c2dd13eadf4ba7464dde81e7162 - enabled: 0 path: Assets/Scenes/Scenes by Simple/Code Examples/Receive Water Data.unity