diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_a_salt.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_a_salt.png index 4728fed8..eb7472fc 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_a_salt.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_a_salt.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_b_caramel.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_b_caramel.png index b1df5d48..39905104 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_b_caramel.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_b_caramel.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_c_BlackPepper.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_c_BlackPepper.png index 6eb0a253..99faa3bb 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_c_BlackPepper.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_c_BlackPepper.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_d_honey.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_d_honey.png index 00133f01..ceebdefa 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_d_honey.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_d_honey.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_e_cheese.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_e_cheese.png index afaf2b69..8d51ee56 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_e_cheese.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_e_cheese.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_SoySauce.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_SoySauce.png index 52f9cd6d..2bdcf27a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_SoySauce.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_SoySauce.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_g_Strawberry.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_g_Strawberry.png index bf3b7b52..d3382fb1 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_g_Strawberry.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_g_Strawberry.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_h_Matcha.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_h_Matcha.png index cb014ff5..3ff0f1e6 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_h_Matcha.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_h_Matcha.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_i_chocolate.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_i_chocolate.png index 2d2ff8c0..1c9fb26a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_i_chocolate.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_i_chocolate.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_j_NoriSalt.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_j_NoriSalt.png index fc5adf9e..295274ac 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_j_NoriSalt.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_j_NoriSalt.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_k_ButterSoySauce.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_k_ButterSoySauce.png index f4584115..0b08cacb 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_k_ButterSoySauce.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_k_ButterSoySauce.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_l_PepperCheese.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_l_PepperCheese.png index 6d23bef1..093087f3 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_l_PepperCheese.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_l_PepperCheese.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_m_SaltCaramel.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_m_SaltCaramel.png index 165843a4..3a5a37ad 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_m_SaltCaramel.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_m_SaltCaramel.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_n_GreenLaverButter.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_n_GreenLaverButter.png index 4f16e32e..123985c6 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_n_GreenLaverButter.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_n_GreenLaverButter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_o_GreenLaverSoySauce.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_o_GreenLaverSoySauce.png index 7853a061..c01af51b 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_o_GreenLaverSoySauce.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_o_GreenLaverSoySauce.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_p_SaltButter.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_p_SaltButter.png index b89a50e6..b243ecbb 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_p_SaltButter.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_p_SaltButter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_q_StrawberryMilk.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_q_StrawberryMilk.png index b063f1fe..373f03e7 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_q_StrawberryMilk.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_q_StrawberryMilk.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_r_MilkChocolate.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_r_MilkChocolate.png index 9c437822..441ba6b4 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_r_MilkChocolate.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_r_MilkChocolate.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_s_CaramelCheese.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_s_CaramelCheese.png index e7da8502..48a07ed9 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_s_CaramelCheese.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_s_CaramelCheese.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_t_SaltChocolate.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_t_SaltChocolate.png index 228500bf..358d7cfb 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_t_SaltChocolate.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_t_SaltChocolate.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_u_HoneyButter.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_u_HoneyButter.png index d2702c85..d27680a7 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_u_HoneyButter.png and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_u_HoneyButter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text.png index 20d46d2a..4f60bd0d 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_Tasting_text.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_a_salt.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_a_salt.png index b45ba84f..051f81a5 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_a_salt.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_a_salt.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_b_caramel.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_b_caramel.png index aad3c81a..86ab33b3 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_b_caramel.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_b_caramel.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_c_BlackPepper.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_c_BlackPepper.png index 1a3b5a24..4df00d6c 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_c_BlackPepper.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_c_BlackPepper.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_d_honey.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_d_honey.png index 1ee0d6a5..9acc15bd 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_d_honey.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_d_honey.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_e_cheese.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_e_cheese.png index 396f5440..f099ced9 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_e_cheese.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_e_cheese.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_SoySauce.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_SoySauce.png index 98575fcf..7864a6c5 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_SoySauce.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_SoySauce.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_g_Strawberry.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_g_Strawberry.png index 7e01a7e1..a9604daf 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_g_Strawberry.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_g_Strawberry.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_h_Matcha.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_h_Matcha.png index 5257232a..9a8df72a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_h_Matcha.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_h_Matcha.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_i_chocolate.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_i_chocolate.png index be798f86..473aae01 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_i_chocolate.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_i_chocolate.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_j_NoriSalt.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_j_NoriSalt.png index 37977f7c..7d25cd83 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_j_NoriSalt.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_j_NoriSalt.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_k_ButterSoySauce.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_k_ButterSoySauce.png index 15d36563..d1d84c31 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_k_ButterSoySauce.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_k_ButterSoySauce.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_l_PepperCheese.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_l_PepperCheese.png index 1218cd41..9084ab45 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_l_PepperCheese.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_l_PepperCheese.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_m_SaltCaramel.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_m_SaltCaramel.png index a310e322..582f4f7b 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_m_SaltCaramel.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_m_SaltCaramel.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_n_GreenLaverButter.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_n_GreenLaverButter.png index 75a3e85e..f9d00f0f 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_n_GreenLaverButter.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_n_GreenLaverButter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_o_GreenLaverSoySauce.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_o_GreenLaverSoySauce.png index ce037288..4441cb14 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_o_GreenLaverSoySauce.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_o_GreenLaverSoySauce.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_p_SaltButter.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_p_SaltButter.png index f4c7fb6b..9d6bb1fd 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_p_SaltButter.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_p_SaltButter.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_q_StrawberryMilk.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_q_StrawberryMilk.png index f8bf55c1..45c0a050 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_q_StrawberryMilk.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_q_StrawberryMilk.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_r_MilkChocolate.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_r_MilkChocolate.png index 926c3d56..79e8a2d2 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_r_MilkChocolate.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_r_MilkChocolate.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_s_CaramelCheese.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_s_CaramelCheese.png index ffd9b334..ca952b9e 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_s_CaramelCheese.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_s_CaramelCheese.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_t_SaltChocolate.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_t_SaltChocolate.png index 2d6d9f8e..6e8cad17 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_t_SaltChocolate.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_t_SaltChocolate.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_u_HoneyButter.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_u_HoneyButter.png index 5e0d10d0..b7ee7f47 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_u_HoneyButter.png and b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_u_HoneyButter.png differ diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 0acec9c7..44a6e7bd 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -pxle/UKyGAcy2Asz/xIh6pTWT4GztIQW9Xc2zatInXG8nxE5BVKuR/QLbEiM3PCw \ No newline at end of file +ya1yPjvcsaALbXyIEiomWesLYNDMnMpBOCrbCjrUDcFpotenXF/LRTVN3yKbzGnj \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ShopData.txt b/popcorn/Assets/MyGame/Resources/Data/ShopData.txt index f9a29ffc..55cb66bf 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ShopData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ShopData.txt @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/MaterialIcons/tank.prefab b/popcorn/Assets/MyGame/Resources/MaterialIcons/tank.prefab new file mode 100644 index 00000000..0c15d5b9 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/MaterialIcons/tank.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7293390095564164939 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_SizeDelta.x + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_SizeDelta.y + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7695150006707541572, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8081510323215557737, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Name + value: tank + objectReference: {fileID: 0} + - target: {fileID: 8405059258981650115, guid: 21933a027d6844d1b8213bf5192430ac, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7377ceb58a42a41468de8292c46bc83e, + type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21933a027d6844d1b8213bf5192430ac, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/MaterialIcons/tank.prefab.meta b/popcorn/Assets/MyGame/Resources/MaterialIcons/tank.prefab.meta new file mode 100644 index 00000000..ab611854 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/MaterialIcons/tank.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71bd1f5bbbd6746beb8118f0f8a633da +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 66634b4e..61f0052b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -506,18 +506,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &390540611 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2152797965052096507, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &404298883 GameObject: m_ObjectHideFlags: 0 @@ -1729,6 +1717,16 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 5780529271574476149, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + propertyPath: gameManager + value: + objectReference: {fileID: 1870432533} + - target: {fileID: 5780529271574476149, guid: b0a57f0d9e5524e579cad0309e9d44d1, + type: 3} + propertyPath: thermalControl + value: + objectReference: {fileID: 1870432535} - target: {fileID: 5969116567130955788, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_AnchorMax.y @@ -1874,66 +1872,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &657773250 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4493661992505599346, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &657773251 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4035365465071032020, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &657773252 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6405201674218417112, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &657773253 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1930711677042961620, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &657773254 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2446509828538118658, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &657773255 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 390509818088476977, guid: b0a57f0d9e5524e579cad0309e9d44d1, @@ -2796,18 +2734,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1028629823 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8798175650031291884, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1095273984 GameObject: m_ObjectHideFlags: 0 @@ -3951,18 +3877,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1665053976 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 462546169576730945, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1673325601 GameObject: m_ObjectHideFlags: 0 @@ -4395,7 +4309,9 @@ MonoBehaviour: thermalControl: {fileID: 1870432535} thermoMeter: {fileID: 1928679192} cornManager: {fileID: 1870432536} - resetButton: {fileID: 390540611} + panColliderChanger: {fileID: 2137549896} + gameProgress: 0 + resultDelay: 1.8 --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -4435,14 +4351,6 @@ MonoBehaviour: maxDecreaseSpeed: 0.1 yellowSize: 0.3 randomRange: 0.2 - factorSlider: {fileID: 657773254} - deadZoneSlider: {fileID: 657773253} - baseSpeedSlider: {fileID: 657773252} - coldSpeedSlider: {fileID: 1995319247} - hotSpeedSlider: {fileID: 657773251} - decreaseSpeedSlider: {fileID: 657773250} - yellowSizeSlider: {fileID: 1028629823} - randomRangeSlider: {fileID: 1665053976} --- !u!114 &1870432536 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4472,6 +4380,8 @@ MonoBehaviour: cornPopSpeed: 30 screenKoProbability: 0.2 maxScreenKoCount: 1 + willFinishValue: 0.798 + cornAddCount: 50 cornCountSlider: {fileID: 657773260} faildCountSlider: {fileID: 657773259} coldGrowSpeedSlider: {fileID: 1661453984} @@ -4704,18 +4614,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1933828729} m_PrefabAsset: {fileID: 0} ---- !u!114 &1995319247 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 543610246068091086, guid: b0a57f0d9e5524e579cad0309e9d44d1, - type: 3} - m_PrefabInstance: {fileID: 657773245} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &2055584752 GameObject: m_ObjectHideFlags: 0 @@ -5011,6 +4909,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2137549891} m_PrefabAsset: {fileID: 0} +--- !u!114 &2137549896 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6144151140781756319, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + m_PrefabInstance: {fileID: 2137549891} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0921292620c649ef8f75f013ff51c349, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2603874726320550220 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab index 83ff54ee..b15e8677 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugParameter.prefab @@ -33,7 +33,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5.0000305, y: 0} + m_AnchoredPosition: {x: -5.000061, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2876606376949105246 @@ -67,7 +67,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4479773526412999563} - - {fileID: 9206954437394057716} + - {fileID: 9143851948024293878} - {fileID: 3009159661648502780} m_Father: {fileID: 0} m_RootOrder: 0 @@ -75,7 +75,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 900, y: 100} + m_SizeDelta: {x: 900, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &491621608902190462 MonoBehaviour: @@ -90,7 +90,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: text: {fileID: 1095104764996803417} - value: {fileID: 72149009873864757} + inputField: {fileID: 897396180863686974} slider: {fileID: 3475518114244289108} minValue: 0 maxValue: 0 @@ -131,6 +131,146 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3274499932230645930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9143851948024293878} + - component: {fileID: 3419366076015106744} + - component: {fileID: 590428595889232007} + - component: {fileID: 897396180863686974} + m_Layer: 0 + m_Name: InputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9143851948024293878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 619926225662647783} + m_Father: {fileID: 74534877661002025} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 150.47, y: 0} + m_SizeDelta: {x: 559.05005, y: 91.47} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3419366076015106744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + m_CullTransparentMesh: 0 +--- !u!114 &590428595889232007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &897396180863686974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3274499932230645930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 590428595889232007} + m_TextComponent: {fileID: 3432115779824197160} + m_Placeholder: {fileID: 0} + m_ContentType: 3 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 2 + m_LineType: 0 + m_HideMobileInput: 0 + m_CharacterValidation: 2 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: 0.000000 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!1 &3826102410214529843 GameObject: m_ObjectHideFlags: 0 @@ -166,7 +306,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 300, y: -10} + m_SizeDelta: {x: 270.56714, y: -10} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3190204835267579441 CanvasRenderer: @@ -209,7 +349,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: TextTestTextTest ---- !u!1 &5987920068234996123 +--- !u!1 &6223501935553774239 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -217,50 +357,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9206954437394057716} - - component: {fileID: 2057185061937190269} - - component: {fileID: 72149009873864757} + - component: {fileID: 619926225662647783} + - component: {fileID: 538406132838563980} + - component: {fileID: 3432115779824197160} m_Layer: 0 - m_Name: Value + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9206954437394057716 +--- !u!224 &619926225662647783 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5987920068234996123} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6223501935553774239} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 74534877661002025} - m_RootOrder: 1 + m_Father: {fileID: 9143851948024293878} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -400, y: 0} - m_SizeDelta: {x: 150, y: 50} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &2057185061937190269 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5000038} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &538406132838563980 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5987920068234996123} + m_GameObject: {fileID: 6223501935553774239} m_CullTransparentMesh: 0 ---- !u!114 &72149009873864757 +--- !u!114 &3432115779824197160 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5987920068234996123} + m_GameObject: {fileID: 6223501935553774239} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -275,18 +415,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 70 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 100 - m_Alignment: 3 + m_MinSize: 3 + m_MaxSize: 300 + m_Alignment: 0 m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 0000 + m_Text: 0.000000 --- !u!1 &6757487088329549315 GameObject: m_ObjectHideFlags: 0 @@ -413,7 +553,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3009159661648502780 RectTransform: m_ObjectHideFlags: 0 @@ -434,7 +574,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 368.73462, y: 63.7} + m_SizeDelta: {x: 318.0871, y: 63.7} m_Pivot: {x: 1, y: 0.5} --- !u!114 &3475518114244289108 MonoBehaviour: @@ -519,7 +659,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -593,7 +733,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab index 86b4f8d9..3ddb07a8 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/DebugView.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5613348811662922110} - component: {fileID: 2835022773081316995} - component: {fileID: 9133335128237374767} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -89,7 +89,7 @@ GameObject: - component: {fileID: 4140395521699310764} - component: {fileID: 3302955830178679139} - component: {fileID: 8242868838447147877} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -165,7 +165,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4303795378509814408} - m_Layer: 0 + m_Layer: 5 m_Name: View m_TagString: Untagged m_Icon: {fileID: 0} @@ -210,7 +210,7 @@ GameObject: - component: {fileID: 2505729874336374508} - component: {fileID: 3463608572823271386} - component: {fileID: 8346684863944409345} - m_Layer: 0 + m_Layer: 5 m_Name: BackMainButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -328,7 +328,7 @@ GameObject: - component: {fileID: 3818386847057816358} - component: {fileID: 650525365612456080} - component: {fileID: 5694425316329821690} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -407,7 +407,7 @@ GameObject: - component: {fileID: 6487049893294274262} - component: {fileID: 9091914540220019492} - component: {fileID: 2152797965052096507} - m_Layer: 0 + m_Layer: 5 m_Name: ResetButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -524,7 +524,7 @@ GameObject: m_Component: - component: {fileID: 4971887160877779298} - component: {fileID: 7883455930803081654} - m_Layer: 0 + m_Layer: 5 m_Name: Parameters m_TagString: Untagged m_Icon: {fileID: 0} @@ -587,8 +587,8 @@ MonoBehaviour: m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 900, y: 90} - m_Spacing: {x: 20, y: 20} + m_CellSize: {x: 900, y: 110} + m_Spacing: {x: 0, y: 10} m_Constraint: 1 m_ConstraintCount: 1 --- !u!1 &5001511587226957584 @@ -602,7 +602,7 @@ GameObject: - component: {fileID: 568747320455404892} - component: {fileID: 3484451170873733580} - component: {fileID: 5088421321322141769} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -679,7 +679,7 @@ GameObject: m_Component: - component: {fileID: 5284969908565993463} - component: {fileID: 5780529271574476149} - m_Layer: 0 + m_Layer: 5 m_Name: DebugView m_TagString: Untagged m_Icon: {fileID: 0} @@ -726,6 +726,17 @@ MonoBehaviour: view: {fileID: 608696602171851566} pattern1: {fileID: 7720918852878828156} pattern2: {fileID: 958025840167371830} + panDataParameters: + - {fileID: 1664834096015488296} + - {fileID: 3180199370115656702} + - {fileID: 7929372799703231730} + - {fileID: 3558504320151633892} + - {fileID: 1074510875190235646} + - {fileID: 627587725713367640} + - {fileID: 5544059043823831750} + - {fileID: 3495454367822427755} + gameManager: {fileID: 0} + thermalControl: {fileID: 0} --- !u!1 &5654533854386921258 GameObject: m_ObjectHideFlags: 0 @@ -738,7 +749,7 @@ GameObject: - component: {fileID: 1330983862053837295} - component: {fileID: 4419917016337627108} - component: {fileID: 1835835199602684098} - m_Layer: 0 + m_Layer: 5 m_Name: OpenButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -856,7 +867,7 @@ GameObject: - component: {fileID: 2135879124423655501} - component: {fileID: 8479033059926637393} - component: {fileID: 6590249268861633600} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -934,7 +945,7 @@ GameObject: - component: {fileID: 1245551812151214321} - component: {fileID: 6786330932404166001} - component: {fileID: 5986627331947351756} - m_Layer: 0 + m_Layer: 5 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -1013,7 +1024,7 @@ GameObject: - component: {fileID: 1680282534423946932} - component: {fileID: 6429788805263348925} - component: {fileID: 958025840167371830} - m_Layer: 0 + m_Layer: 5 m_Name: Pattern2Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1131,7 +1142,7 @@ GameObject: - component: {fileID: 2472549091385177827} - component: {fileID: 1051029848530001939} - component: {fileID: 3736476309860490666} - m_Layer: 0 + m_Layer: 5 m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} @@ -1206,7 +1217,7 @@ GameObject: - component: {fileID: 53300449127876901} - component: {fileID: 3168845778350697030} - component: {fileID: 6674939901714048809} - m_Layer: 0 + m_Layer: 5 m_Name: CloseButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -1325,7 +1336,7 @@ GameObject: - component: {fileID: 334852932963138782} - component: {fileID: 2070673246419519088} - component: {fileID: 7720918852878828156} - m_Layer: 0 + m_Layer: 5 m_Name: Pattern1Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1554,16 +1565,31 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u6570" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornCount objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive @@ -1579,16 +1605,46 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &91222054387263441 stripped @@ -1719,11 +1775,26 @@ PrefabInstance: propertyPath: m_Text value: "Hot\u6642\u4E0A\u6607\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: HotSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -1734,6 +1805,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &662934999055142313 stripped @@ -1742,6 +1843,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 593343534531572864} m_PrefabAsset: {fileID: 0} +--- !u!114 &1074510875190235646 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 593343534531572864} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1037856004329375526 PrefabInstance: m_ObjectHideFlags: 0 @@ -1864,11 +1977,26 @@ PrefabInstance: propertyPath: m_Text value: "\u6700\u5927\u51B7\u5374\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DebugParameter (4) objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -1879,8 +2007,50 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} +--- !u!114 &627587725713367640 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 1037856004329375526} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1112382072943771151 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, @@ -2009,11 +2179,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30D5\u30E9\u30A4\u30D1\u30F3\u611F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: Sense objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2024,6 +2209,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &1207237267587803519 stripped @@ -2032,6 +2247,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1281338920150454358} m_PrefabAsset: {fileID: 0} +--- !u!114 &1664834096015488296 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 1281338920150454358} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2201722375469517283 PrefabInstance: m_ObjectHideFlags: 0 @@ -2154,11 +2381,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u304C\n\u5F3E\u3051\u308B\u5F37\u3055" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DebugParameter (13) objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2169,6 +2411,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &2271744707010736330 stripped @@ -2299,11 +2571,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornBurntTime objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2314,6 +2601,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &2438367493108694558 stripped @@ -2444,11 +2761,26 @@ PrefabInstance: propertyPath: m_Text value: DeadZone objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DeadZone objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2459,8 +2791,50 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} +--- !u!114 &3180199370115656702 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 3094185449995849344} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &3168295903013582761 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, @@ -2589,11 +2963,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u304C\n\u98DB\u3073\u51FA\u3059\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: SpilledLimitSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2604,6 +2993,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &3771789703286377036 stripped @@ -2734,11 +3153,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30E9\u30F3\u30C0\u30E0\u4F4D\u7F6E" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: RandomValue objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2749,6 +3183,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &3987940865115793980 stripped @@ -2757,6 +3221,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3913854601083867925} m_PrefabAsset: {fileID: 0} +--- !u!114 &3495454367822427755 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 3913854601083867925} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4012935884479519386 PrefabInstance: m_ObjectHideFlags: 0 @@ -2879,16 +3355,31 @@ PrefabInstance: propertyPath: m_Text value: "Cold\u6642\u4E0A\u6607\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: ColdSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -2899,6 +3390,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &3942904769723343795 stripped @@ -2907,6 +3428,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4012935884479519386} m_PrefabAsset: {fileID: 0} +--- !u!114 &3558504320151633892 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 4012935884479519386} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4407426121755080304 PrefabInstance: m_ObjectHideFlags: 0 @@ -3029,11 +3562,26 @@ PrefabInstance: propertyPath: m_Text value: "\u5931\u6557\u3057\u3066\u3082\u826F\u3044\n\u30B3\u30FC\u30F3\u6570" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: FailedCount objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3044,6 +3592,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &4333201332210061145 stripped @@ -3174,11 +3752,26 @@ PrefabInstance: propertyPath: m_Text value: "Hot\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: DebugParameter (9) objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3189,6 +3782,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &4771112501857001908 stripped @@ -3319,11 +3942,26 @@ PrefabInstance: propertyPath: m_Text value: "Cold\u6642\u30B3\u30FC\u30F3\u5B8C\u6210\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: ColdCornSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3334,6 +3972,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &5028291535338148132 stripped @@ -3464,11 +4132,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B2\u30FC\u30B8\n\u9EC4\u8272\u306E\u30B5\u30A4\u30BA" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: YellowSize objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3479,6 +4162,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &5416192627147036305 stripped @@ -3487,6 +4200,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5342082161051447224} m_PrefabAsset: {fileID: 0} +--- !u!114 &5544059043823831750 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 5342082161051447224} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7308813773154804941 PrefabInstance: m_ObjectHideFlags: 0 @@ -3609,11 +4334,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u5B8C\u6210\u6642\u9593\n0~5\u79D2\u30E9\u30F3\u30C0\u30E0\u3067\u8FFD\u52A0" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornPopTime objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3624,6 +4364,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &7234701249961237988 stripped @@ -3754,11 +4524,26 @@ PrefabInstance: propertyPath: m_Text value: "\u30B3\u30FC\u30F3\u7126\u3052\u6642\u9593\u306E\u3070\u3089\u3064\u304D" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: CornBurntRandom objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3769,6 +4554,36 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} --- !u!224 &7271260149865018078 stripped @@ -3899,11 +4714,26 @@ PrefabInstance: propertyPath: m_Text value: "\u6E29\u5EA6\u4E0A\u6607\u901F\u5EA6" objectReference: {fileID: 0} + - target: {fileID: 1677767607159343418, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_Name value: BaseSpeed objectReference: {fileID: 0} + - target: {fileID: 2876606376949105246, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3826102410214529843, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} - target: {fileID: 4294869768702479285, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} propertyPath: m_AnchorMax.y @@ -3914,8 +4744,50 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5987920068234996123, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6757487088329549315, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7497294269553338116, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7912557860526418570, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8242294222592591534, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 9081540684356947506, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4b152553cae694e4fb6cd75d23ba5087, type: 3} +--- !u!114 &7929372799703231730 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 491621608902190462, guid: 4b152553cae694e4fb6cd75d23ba5087, + type: 3} + m_PrefabInstance: {fileID: 7554891398754978188} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b5899ced7e3b48568008faa25816466, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7624753188443107493 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 74534877661002025, guid: 4b152553cae694e4fb6cd75d23ba5087, diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab index b654bfcd..506e6493 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab @@ -9741,6 +9741,170 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &2172530787014104870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3756107145556210927} + - component: {fileID: 8695774672704424618} + m_Layer: 0 + m_Name: PanEdge Top Finish + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3756107145556210927 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2172530787014104870} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.38, y: -0.03, z: 0} + m_LocalScale: {x: 102.03828, y: 110.093575, z: 85.63402} + m_Children: [] + m_Father: {fileID: 3218397595738205000} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &8695774672704424618 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2172530787014104870} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 440db2e8ae6ea41b792d56600b0532f3, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 2.61 + m_Points: + - {x: -0.06249666, y: 0.008998046} + - {x: -0.0523351, y: 0.028039727} + - {x: -0.041206434, y: 0.03511869} + - {x: -0.015046993, y: 0.05204403} + - {x: 0.017697936, y: 0.05248006} + - {x: 0.036029074, y: 0.044425998} + - {x: 0.058061335, y: 0.025281195} + - {x: 0.06824917, y: 0.0029303213} +--- !u!1 &2772421931217617868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7252290375963454523} + - component: {fileID: 6422771557208889528} + m_Layer: 0 + m_Name: PanEdge Top Will Finish + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7252290375963454523 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2772421931217617868} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.38, y: -0.03, z: 0} + m_LocalScale: {x: 102.03828, y: 110.093575, z: 85.63402} + m_Children: [] + m_Father: {fileID: 3218397595738205000} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &6422771557208889528 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2772421931217617868} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 440db2e8ae6ea41b792d56600b0532f3, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 2.61 + m_Points: + - {x: -0.06249666, y: 0.008998046} + - {x: -0.051591836, y: 0.025973067} + - {x: -0.027804706, y: 0.042549714} + - {x: 0.0025015222, y: 0.04699563} + - {x: 0.038333848, y: 0.04032514} + - {x: 0.058061335, y: 0.025281195} + - {x: 0.06824917, y: 0.0029303213} +--- !u!1 &5939863161591235221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4694130269973048913} + - component: {fileID: 71968105059914684} + m_Layer: 0 + m_Name: PanEdge Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4694130269973048913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939863161591235221} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.38, y: -0.78, z: 0} + m_LocalScale: {x: 102.03828, y: 110.093575, z: 85.63402} + m_Children: [] + m_Father: {fileID: 3218397595738205000} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &71968105059914684 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939863161591235221} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 440db2e8ae6ea41b792d56600b0532f3, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 2.61 + m_Points: + - {x: 0.07831237, y: 0.0019857544} + - {x: 0.0508193, y: -0.020667206} + - {x: 0.035089638, y: -0.028409138} + - {x: 0.012053529, y: -0.034262266} + - {x: -0.017523682, y: -0.031982258} + - {x: -0.04153408, y: -0.023042984} + - {x: -0.060010493, y: -0.009420026} + - {x: -0.06249666, y: 0.008998046} --- !u!1 &6031284905392100201 GameObject: m_ObjectHideFlags: 0 @@ -9750,6 +9914,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3218397595738205000} + - component: {fileID: 6144151140781756319} m_Layer: 0 m_Name: PanCollider m_TagString: Untagged @@ -9771,9 +9936,84 @@ Transform: - {fileID: 1453251557352552632} - {fileID: 746482762447314123} - {fileID: 1453251556405238013} + - {fileID: 2437908282195913342} + - {fileID: 7252290375963454523} + - {fileID: 3756107145556210927} + - {fileID: 4694130269973048913} m_Father: {fileID: 1453251556377932393} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6144151140781756319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6031284905392100201} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0921292620c649ef8f75f013ff51c349, type: 3} + m_Name: + m_EditorClassIdentifier: + topCollider: {fileID: 5108982195909872126} + topWillFinishCollider: {fileID: 6422771557208889528} + topFinishCollider: {fileID: 8695774672704424618} + willFinishValue: 0.6 + finishValue: 0.8 +--- !u!1 &6648197844505394857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2437908282195913342} + - component: {fileID: 5108982195909872126} + m_Layer: 0 + m_Name: PanEdge Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2437908282195913342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6648197844505394857} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.38, y: -0.78, z: 0} + m_LocalScale: {x: 102.03828, y: 110.093575, z: 85.63402} + m_Children: [] + m_Father: {fileID: 3218397595738205000} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!68 &5108982195909872126 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6648197844505394857} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 440db2e8ae6ea41b792d56600b0532f3, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 2.61 + m_Points: + - {x: -0.06249666, y: 0.008998046} + - {x: -0.051591836, y: 0.025973067} + - {x: -0.027804706, y: 0.042549714} + - {x: 0.0025015222, y: 0.04699563} + - {x: 0.038333848, y: 0.04032514} + - {x: 0.058061335, y: 0.025281195} + - {x: 0.06824917, y: 0.0029303213} --- !u!1 &7627312333739799308 GameObject: m_ObjectHideFlags: 0 @@ -9821,7 +10061,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &746482762447314123 Transform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs index 20b5966b..f7ef2f91 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs @@ -99,6 +99,12 @@ public class Corn : MonoBehaviour case CornCondition.Seed: break; case CornCondition.Simple: + // コーンが弾けたとき、GrowSpeedを再設定する + // ThermalCondition.Hot以外では焦げ進行なし + if (!isHot) + { + ChangeGrowSpeed(0f); + } CornPop(); break; case CornCondition.Burnt: diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index 793b5be6..8f13aa8f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -32,13 +32,19 @@ public class CornManager : MonoBehaviour [Space] [SerializeField, Range(0,1)] private float screenKoProbability; [SerializeField] private int maxScreenKoCount; + [Header("演出で増やすコーン")] + [SerializeField, Range(0, 1)] private float willFinishValue = 0.6f; + [SerializeField] private int cornAddCount = 40; public IReadOnlyReactiveProperty Result => result; private readonly ReactiveProperty result = new ReactiveProperty(); public ReactiveProperty GameState => gameState; private readonly ReactiveProperty gameState = new ReactiveProperty(); - + + public IReadOnlyReactiveProperty Progress => progress; + private readonly ReactiveProperty progress = new ReactiveProperty(0f); + private Corn[] cornArray; private bool isHot; private bool isCompleted; @@ -65,6 +71,8 @@ public class CornManager : MonoBehaviour { cornArray = new Corn[cornSpawnCount]; result.AddTo(this); + gameState.AddTo(this); + progress.AddTo(this); cornGrowSpeed.AddTo(this); compositeDisposable.AddTo(this); } @@ -126,18 +134,14 @@ public class CornManager : MonoBehaviour isCompleted = false; compositeDisposable.Clear(); cornConditions.Clear(); - for (int i = 0; i < cornArray.Length; i++) - { - if (cornArray[i] != null) - { - Destroy(cornArray[i].gameObject); - } - } + progress.Value = 0f; + cornSpawnTarget.DestroyAllChildrens(); cornArray = new Corn[cornSpawnCount]; // コーン生成 - var shuffledArray = Enumerable.Range(0, cornSpawnCount).OrderBy(_ => Random.value).ToArray(); - for (int i = 0; i < cornSpawnCount; i++) + var shuffledArray = Enumerable.Range(0, cornArray.Length).OrderBy(_ => Random.value).ToArray(); + + for (int i = 0; i < cornArray.Length; i++) { var corn = Instantiate(cornPrefab, cornSpawnTarget); cornArray[i] = corn; @@ -173,12 +177,6 @@ public class CornManager : MonoBehaviour case CornCondition.Seed: break; case CornCondition.Simple: - // コーンが弾けたとき、GrowSpeedを再設定する - // ThermalCondition.Hot以外では焦げ進行なし - if (!isHot) - { - corn.ChangeGrowSpeed(0f); - } break; case CornCondition.Burnt: // ミス数加算 @@ -195,7 +193,15 @@ public class CornManager : MonoBehaviour cornConditions.Add(corn.Condition); } - var cornConditionsObservable = Observable.CombineLatest(cornConditions).Publish().RefCount(); + var cornConditionsObservable = cornConditions.CombineLatest().Publish().RefCount(); + + // コーン全体の進捗 + cornConditionsObservable + .Select(x => x.Count(cond => cond != CornCondition.Seed)) + .Subscribe(x => + { + progress.Value = (float)x / cornArray.Length; + }).AddTo(compositeDisposable); // すべてのコーンがSeedではなくなった場合 cornConditionsObservable @@ -217,6 +223,36 @@ public class CornManager : MonoBehaviour SetResult(CornResult.Good); } }).AddTo(compositeDisposable); + + // 進捗によってコーンを増やす（演出用） + var amount = 5; + var times = cornAddCount / amount; + progress + .Where(x => x >= willFinishValue) + .Take(1) + .AsUnitObservable() + .Concat(Observable.TimerFrame(0,1).AsUnitObservable()) + .Take(times) + .Subscribe(_ => + { + Observable.Range(0, amount).Subscribe(__ => + { + var corn = Instantiate(cornPrefab, cornSpawnTarget); + corn.SetCornProperty(0f, isHot ? 0f : 3f, cornSpillSpeed, cornPopSpeed); + cornGrowSpeed.TakeWhile(x => !isCompleted).Subscribe(x => + { + // コーンが弾けた後はRedの場合のみ焦げ進行する + if (corn.Condition.Value == CornCondition.Simple && !isHot) + { + corn.ChangeGrowSpeed(0f); + return; + } + + corn.ChangeGrowSpeed(x); + corn.ChangeHotStatus(isHot); + }).AddTo(compositeDisposable); + }).AddTo(compositeDisposable); + }).AddTo(compositeDisposable); } public void ChangeGrowSpeed(ThermalCondition condition) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs index 2d49aa2f..a0d71fbd 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugParameter.cs @@ -8,29 +8,32 @@ using UnityEngine.UI; public class MainGameDebugParameter : MonoBehaviour { [SerializeField] private Text text; - [SerializeField] private Text value; + [SerializeField] private InputField inputField; [SerializeField] private Slider slider; [SerializeField] private float minValue; [SerializeField] private float maxValue; - // [SerializeField] private String paramName; - + + public IObservable OnValueChange => slider.OnValueChangedAsObservable() + .Merge(inputField.OnEndEditAsObservable().Select(float.Parse)) + .TakeUntilDestroy(this); + void Awake() { slider.minValue = minValue; slider.maxValue = maxValue; // text.text = paramName; - slider.OnValueChangedAsObservable().SubscribeToText(value, f => $"{f:F3}"); + OnValueChange.Subscribe(x => + { + inputField.text = $"{x:0.######}"; + SetValue(x); + }).AddTo(this); } public void SetValue(float value) { + // maxValueを超えた値が来た場合そちらを優先する + slider.maxValue = Mathf.Max(slider.maxValue, value); slider.value = value; } - - // Update is called once per frame - void Update() - { - - } } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs index e9152cc7..356534e9 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/MainGameDebugView.cs @@ -1,6 +1,8 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -16,6 +18,12 @@ public class MainGameDebugView : MonoBehaviour [SerializeField] private Button pattern1; [SerializeField] private Button pattern2; + [SerializeField] private MainGameDebugParameter[] panDataParameters; + [SerializeField] private PopcornGameManager gameManager; + [SerializeField] private ThermalControl thermalControl; + + private readonly PanData debugPanData = new PanData(); + private void Awake() { #if DEVELOPMENT_BUILD || UNITY_EDITOR @@ -34,21 +42,33 @@ public class MainGameDebugView : MonoBehaviour // Start is called before the first frame update void Start() + { + Initialize(); + } + + [Conditional("DEVELOPMENT_BUILD"), Conditional("UNITY_EDITOR")] + private void Initialize() { showDebugButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 0f; view.SetActive(true); }).AddTo(this); closeDebugButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 1f; view.SetActive(false); }).AddTo(this); gameResetButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 1f; view.SetActive(false); + TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); + gameManager.ResetGame(debugPanData); }).AddTo(this); backMainButton.OnClickAsObservable().Subscribe(_ => { + Time.timeScale = 1f; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); // pattern1.OnClickAsObservable().Subscribe(_ => @@ -59,6 +79,45 @@ public class MainGameDebugView : MonoBehaviour // { // SetPreset(preset2); // }).AddTo(this); + + // panData取得 + var originalPanData = LocalCacheManager.Load(PopcornGameManager.PanDataTag); + debugPanData.id = originalPanData.id; + debugPanData.rarity = originalPanData.rarity; + debugPanData.prefabName = originalPanData.prefabName; + SetPanDataToParam(originalPanData); + panDataParameters.Select(param => param.OnValueChange).CombineLatest() + .ThrottleFrame(1) + // .Debug("debugParameter") + .Subscribe(x => + { + SetParamToPanData(x); + thermalControl.SetPanData(debugPanData); + }).AddTo(this); + } + + private void SetParamToPanData(IList parameters) + { + debugPanData.panFactor = parameters[0]; + debugPanData.deadZone = parameters[1]; + debugPanData.baseIncreaseSpeed = parameters[2]; + debugPanData.coldIncreaseSpeed = parameters[3]; + debugPanData.hotIncreaseSpeed = parameters[4]; + debugPanData.maxDecreaseSpeed = parameters[5]; + debugPanData.yellowSize = parameters[6]; + debugPanData.randomRange = parameters[7]; + } + + private void SetPanDataToParam(PanData panData) + { + panDataParameters[0].SetValue(panData.panFactor); + panDataParameters[1].SetValue(panData.deadZone); + panDataParameters[2].SetValue(panData.baseIncreaseSpeed); + panDataParameters[3].SetValue(panData.coldIncreaseSpeed); + panDataParameters[4].SetValue(panData.hotIncreaseSpeed); + panDataParameters[5].SetValue(panData.maxDecreaseSpeed); + panDataParameters[6].SetValue(panData.yellowSize); + panDataParameters[7].SetValue(panData.randomRange); } private float[] preset1 = @@ -112,10 +171,4 @@ public class MainGameDebugView : MonoBehaviour } } - - // Update is called once per frame - void Update() - { - - } } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanColliderChanger.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanColliderChanger.cs new file mode 100644 index 00000000..b2d52abd --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanColliderChanger.cs @@ -0,0 +1,84 @@ +using System; +using UniRx; +using UnityEngine; + +namespace MyGame.Scenes.Cooking.Scripts +{ + public enum PanChangerState + { + Init, + WillFinish, + Finish + } + public class PanColliderChanger : MonoBehaviour + { + [SerializeField] private Collider2D topCollider; + [SerializeField] private Collider2D topWillFinishCollider; + [SerializeField] private Collider2D topFinishCollider; + [SerializeField, Range(0f, 1f)] private float willFinishValue = 1f; + [SerializeField, Range(0f, 1f)] private float finishValue = 1f; + private ReactiveProperty panChangerState = new ReactiveProperty(); + + private void Start() + { + panChangerState.AddTo(this); + panChangerState.Value = PanChangerState.Init; + panChangerState.Subscribe(x => + { + switch (x) + { + case PanChangerState.Init: + Init(); + break; + case PanChangerState.WillFinish: + WillFinish(); + break; + case PanChangerState.Finish: + Finish(); + break; + default: + throw new ArgumentOutOfRangeException(nameof(x), x, null); + } + }).AddTo(this); + } + + public void Reset() + { + panChangerState.Value = PanChangerState.Init; + } + + public void ChangeState(float value) + { + if (value >= finishValue) + { + panChangerState.Value = PanChangerState.Finish; + } + else if (value >= willFinishValue) + { + panChangerState.Value = PanChangerState.WillFinish; + } + + } + + private void Init() + { + topCollider.enabled = true; + topWillFinishCollider.enabled = false; + topFinishCollider.enabled = false; + } + + private void WillFinish() + { + topCollider.enabled = false; + topWillFinishCollider.enabled = true; + topFinishCollider.enabled = false; + } + + private void Finish() + { + topCollider.enabled = false; + topWillFinishCollider.enabled = false; + topFinishCollider.enabled = true; + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanColliderChanger.cs.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanColliderChanger.cs.meta new file mode 100644 index 00000000..0f09ad00 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanColliderChanger.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0921292620c649ef8f75f013ff51c349 +timeCreated: 1650607663 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs index daeec27a..7fc4138b 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornGameManager.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; +using MyGame.Scenes.Cooking.Scripts; using MyGame.Scripts; using UniRx; +using UniRx.Diagnostics; using UniRx.Triggers; using UnityEngine; using UnityEngine.EventSystems; @@ -28,11 +30,12 @@ public class PopcornGameManager : MonoBehaviour [SerializeField] private ThermalControl thermalControl; [SerializeField] private ThermoMeter thermoMeter; [SerializeField] private CornManager cornManager; + [SerializeField] private PanColliderChanger panColliderChanger; + + [Space] + [SerializeField, ReadOnly] private float gameProgress; + [SerializeField] private float resultDelay = 1.2f; -#if DEVELOPMENT_BUILD || UNITY_EDITOR - [SerializeField] private Button resetButton; -#endif - private readonly ReactiveProperty state = new ReactiveProperty(GameState.Guide); private readonly CompositeDisposable compositeDisposable = new CompositeDisposable(); @@ -73,6 +76,12 @@ public class PopcornGameManager : MonoBehaviour throw new ArgumentOutOfRangeException(nameof(x), x, null); } }); + + cornManager.Progress.Subscribe(x => + { + gameProgress = x; + panColliderChanger.ChangeState(x); + }).AddTo(this); ResetGame(); @@ -86,14 +95,6 @@ public class PopcornGameManager : MonoBehaviour cornManager.SetCornsActive(true); }); } - -#if DEVELOPMENT_BUILD || UNITY_EDITOR - resetButton.OnClickAsObservable().Subscribe(_ => - { - TransitionManager.Instance.UnloadScene(GameScenes.CookingResults); - ResetGame(); - }).AddTo(this); -#endif #if UNITY_EDITOR this.UpdateAsObservable() @@ -112,48 +113,39 @@ public class PopcornGameManager : MonoBehaviour cornManager.Result .SkipLatestValueOnSubscribe() - // .DistinctUntilChanged() - .Materialize() - .Subscribe(x => { Debug.Log(x); }).AddTo(this); + .Debug("Result") + .Subscribe(x => { }).AddTo(this); #endif } private void ResetGame() { var panData = LocalCacheManager.Load(PanDataTag); + ResetGame(panData); + } + + public void ResetGame(PanData panData) + { var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.RarityDataSheet); var rarityData = rarityList.First(data => data.Rarity == panData.Rarity); // フライパン設定 gameView.SetPan(panData.GetPrefab()); thermalControl.SetPanData(panData); -#if UNITY_EDITOR - Debug.Log($@" -name = {panData.Name} -panFactor = {panData.panFactor} -deadZone = {panData.deadZone} -baseIncreaseSpeed = {panData.baseIncreaseSpeed} -coldIncreaseSpeed = {panData.coldIncreaseSpeed} -hotIncreaseSpeed = {panData.hotIncreaseSpeed} -maxDecreaseSpeed = {panData.maxDecreaseSpeed} -yellowSize = {panData.yellowSize} -randomRange = {panData.randomRange} -"); -#endif cornManager.SetCornsActive(true); + panColliderChanger.Reset(); compositeDisposable.Clear(); cornManager.Result.SkipLatestValueOnSubscribe() - .FirstOrDefault() - .DelayFrame(1) // Disposeタイミング調整 + .Take(1) .Subscribe(result => { state.Value = GameState.Result; // リザルト表示遅延 - this.CallWaitForSeconds(1.2f, () => + Observable.Timer(TimeSpan.FromSeconds(resultDelay)).Subscribe(_ => { LocalCacheManager.Save(CookingResultDataTag, (rarityData, result, new Action(() => cornManager.SetCornsActive(false)))); LocalCacheManager.Save(RestartCallbackTag, new Action(ResetGame)); TransitionManager.Instance.LoadSceneAdditive(GameScenes.CookingResults); - }); + }).AddTo(compositeDisposable); }).AddTo(compositeDisposable); // 画面タップでスタート diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index 10a6ca43..c19c4b83 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -43,47 +43,18 @@ public class ThermalControl : MonoBehaviour private bool isMove; public IReadOnlyReactiveProperty Condition => condition; - private readonly ReactiveProperty condition = new ReactiveProperty(ThermalCondition.Cold); - -#if DEVELOPMENT_BUILD || UNITY_EDITOR - [SerializeField] private Slider factorSlider; - [SerializeField] private Slider deadZoneSlider; - [SerializeField] private Slider baseSpeedSlider; - [SerializeField] private Slider coldSpeedSlider; - [SerializeField] private Slider hotSpeedSlider; - [SerializeField] private Slider decreaseSpeedSlider; - [SerializeField] private Slider yellowSizeSlider; - [SerializeField] private Slider randomRangeSlider; -#endif + private readonly ReactiveProperty condition = new ReactiveProperty(ThermalCondition.Cold); private void Start() { condition.AddTo(this); #if UNITY_EDITOR - condition.Subscribe(x => - { - Debug.Log($"cond :{x} temp: {temperature}"); - }).AddTo(this); -#endif - -#if DEVELOPMENT_BUILD || UNITY_EDITOR - factorSlider.value = panFactor; - deadZoneSlider.value = deadZone; - baseSpeedSlider.value = baseIncreaseSpeed; - coldSpeedSlider.value = coldIncreaseSpeed; - hotSpeedSlider.value = hotIncreaseSpeed; - decreaseSpeedSlider.value = maxDecreaseSpeed; - yellowSizeSlider.value = yellowSize; - randomRangeSlider.value = randomRange; - factorSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => panFactor = x).AddTo(this); - deadZoneSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => deadZone = x).AddTo(this); - baseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => baseIncreaseSpeed = x).AddTo(this); - coldSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => coldIncreaseSpeed = x).AddTo(this); - hotSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => hotIncreaseSpeed = x).AddTo(this); - decreaseSpeedSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => maxDecreaseSpeed = x).AddTo(this); - yellowSizeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => yellowSize = x).AddTo(this); - randomRangeSlider.OnValueChangedAsObservable().Skip(1).Subscribe(x => randomRange = x).AddTo(this); + // condition.Subscribe(x => + // { + // Debug.Log($"cond :{x} temp: {temperature}"); + // }).AddTo(this); #endif + } private void Update() @@ -190,6 +161,18 @@ public class ThermalControl : MonoBehaviour public void SetPanData(PanData panData) { +#if UNITY_EDITOR + Debug.Log($@"SetPanData +name = {panData.Name} +panFactor = {panData.panFactor} +deadZone = {panData.deadZone} +baseIncreaseSpeed = {panData.baseIncreaseSpeed} +coldIncreaseSpeed = {panData.coldIncreaseSpeed} +hotIncreaseSpeed = {panData.hotIncreaseSpeed} +maxDecreaseSpeed = {panData.maxDecreaseSpeed} +yellowSize = {panData.yellowSize} +randomRange = {panData.randomRange}"); +#endif panFactor = panData.panFactor; deadZone = panData.deadZone; baseIncreaseSpeed = panData.baseIncreaseSpeed; @@ -198,15 +181,5 @@ public class ThermalControl : MonoBehaviour maxDecreaseSpeed = panData.maxDecreaseSpeed; yellowSize = panData.yellowSize; randomRange = panData.randomRange; -#if UNITY_EDITOR || DEVELOPMENT_BUILD - factorSlider.value = panFactor; - deadZoneSlider.value = deadZone; - baseSpeedSlider.value = baseIncreaseSpeed; - coldSpeedSlider.value = coldIncreaseSpeed; - hotSpeedSlider.value = hotIncreaseSpeed; - decreaseSpeedSlider.value = maxDecreaseSpeed; - yellowSizeSlider.value = yellowSize; - randomRangeSlider.value = randomRange; -#endif } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs index d23d7ff3..ded61967 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookCompleteView.cs @@ -58,10 +58,16 @@ namespace MyGame.Scenes.Main.Scripts } else { - if (gameData.StorageTanks.Exists(data => data.FlavorId == productData.id && data.Capacity - data.Stock >= productData.volume)) + // 空以外の補充可能な空きがあるタンクを優先して判定する + if (gameData.StorageTanks.Exists(data => !data.IsEmpty && data.FlavorId == productData.id && data.Capacity - data.Stock >= productData.volume)) { continue; } + if (emptyTankCount > 0) + { + emptyTankCount--; + continue; + } discardProductList.Add(productData); } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs index f9fb3535..2957de5d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs @@ -58,7 +58,7 @@ namespace MyGame.Scenes.Main.Scripts }); }).AddTo(this); - cookerLevelText.text = $"{gameData.AutoCookLevel}"; + cookerLevelText.text = isMaxLevel ? "MAX" : $"{gameData.AutoCookLevel}"; earnCountText.text = $"{autoCookData.earnCount}{ScriptLocalization.Unit.Amount}"; durationText.text = $"{autoCookData.duration}{ScriptLocalization.Unit.Hours}"; usesCountText.text = isMaxLevel ? "--/--" : $"{gameData.AutoCookUsesCount}/{autoCookData.clearCount}"; diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index df766db2..1022ece6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -298,7 +298,7 @@ public class KitchenManager : MonoBehaviour if (!result.newOrder) { - if (gameData.OrderIdInProgress != gameData.CancelOrderId) + if (!cancelled) { SetPhoneTap(); } @@ -381,26 +381,20 @@ public class KitchenManager : MonoBehaviour { return (false, nextOrderId, nextOrderLevel); } - var achieved = gameData.DeliveredOrder.Contains(gameData.OrderIdInProgress); + var canceled = gameData.OrderIdInProgress == gameData.CancelOrderId; var nextOrderList = bulkOrderList.Where(data => data.shopLevel == nextOrderLevel).ToList(); if (!nextOrderList.Exists(data => data.id == gameData.OrderIdInProgress)) { // まだ次のオーダーが設定されてない場合nextOrderListの一番若いIDを設定 nextOrderId = nextOrderList.First().id; } - else if (achieved || gameData.OrderIdInProgress == gameData.CancelOrderId && gameData.CancelOrderId > 0) + else if (achieved || canceled) { // 達成済みか、キャンセルされた場合次のIDを設定 // 未達成のオーダー var orderList = nextOrderList.Where(data => !gameData.DeliveredOrder.Contains(data.id)).ToList(); - - if (orderList.Count > 0) - { - var nextIndex = orderList.FindIndex(data => data.id > gameData.OrderIdInProgress); - nextOrderId = orderList[Mathf.Max(0, nextIndex)].id; - } - else + if (orderList.Count <= 0) { #if UNITY_EDITOR // オーダーリストがすべて達成済みの場合エラー @@ -409,8 +403,14 @@ public class KitchenManager : MonoBehaviour $"delivered:{gameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}")}\n" + $"orderList:{nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.id}")}"); #endif + return (false, nextOrderId, nextOrderLevel); } + + var nextIndex = orderList.FindIndex(data => data.id > gameData.OrderIdInProgress); + nextOrderId = orderList[Mathf.Max(0, nextIndex)].id; } + + if (gameData.OrderIdInProgress == nextOrderId) { @@ -418,9 +418,11 @@ public class KitchenManager : MonoBehaviour } var orderData = nextOrderList.First(data => data.id == nextOrderId); - var isFirst = !nextOrderList.Exists(data => data.id == gameData.CancelOrderId); - var condition = isFirst ? orderData.firstOrderCondition : orderData.retryCondition; - + // キャンセル時retryConditionを使う + var condition = canceled ? orderData.retryCondition : orderData.firstOrderCondition; +#if UNITY_EDITOR + Debug.Log($"nextOrderId: {nextOrderId} use {(canceled ? "retryCondition" : "firstOrderCondition")} ({gameData.OrderConditionCount}/{condition})"); +#endif // 条件チェック return (condition <= gameData.OrderConditionCount, nextOrderId, nextOrderLevel); } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index e00700c0..c8f908c5 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using MyGame.Scripts; using UniRx; using UnityEngine; @@ -85,16 +84,11 @@ public class ProductManagement : MonoBehaviour if (tankView.TankNumber > gameData.StorageTanks.Count) { // 価格の一番小さいタンクのみ購入できるようにする - if (tankView.TankNumber == gameData.StorageTanks.Count + 1) - { - tankView.SetState(TankState.Lock); - } - else - { - tankView.SetState(TankState.Unavailable); - } + var isSmallest = tankView.TankNumber == gameData.StorageTanks.Count + 1; + tankView.SetState(isSmallest ? TankState.Lock : TankState.Unavailable); // タンク購入 var shopData = shopDataList.First(data => data.id == Const.ShopTankId); + shopData.price = PriceList[tankView.TankNumber - 1]; // 購入可否 tankView.SetCanBuy(shopData.price <= CoinManager.Instance.OwnCoin); @@ -104,10 +98,10 @@ public class ProductManagement : MonoBehaviour .TakeWhile(_ => tankView.State.Value == TankState.Lock || tankView.State.Value == TankState.Unavailable) .Subscribe(_ => { - Action purchaseAction = amount => + void PurchaseAction(int amount) { // タンク追加 - gameData.StorageTanks.Add(new StorageTank() {Capacity = Const.TankCapacity}); + gameData.StorageTanks.Add(new StorageTank { Capacity = Const.TankCapacity }); tankView.SetData(gameData.StorageTanks[tankView.TankNumber - 1]); tankView.SetState(TankState.Unlock); CoinManager.Instance.SubCoin(shopData.price); @@ -119,9 +113,10 @@ public class ProductManagement : MonoBehaviour tankList[tankView.TankNumber].SetState(TankState.Lock); tankList[tankView.TankNumber].SetCanBuy(PriceList[tankView.TankNumber] <= CoinManager.Instance.OwnCoin); } - }; + } + shopData.price = PriceList[tankView.TankNumber - 1]; - ShopItemPurchaseView.ShowDialog((shopData, 0), purchaseAction); + ShopItemPurchaseView.ShowDialog((shopData, 0), PurchaseAction); }).AddTo(tankView); } else @@ -156,31 +151,38 @@ public class ProductManagement : MonoBehaviour { case ManagementState.None: ChangeAllTankInteractable(tankList, true); - ClearSelectedTank(tankList); break; case ManagementState.Replacing: break; case ManagementState.Tasting: - // 空以外のタンクを選択 - var index = gameData.StorageTanks.FindIndex(tank => tank.Stock > 0); + // ストックのあるタンクのIndex取得。なければ試食モード中止。 + var index = gameData.StorageTanks.FindIndex(tank => !tank.IsEmpty); if (index == -1) { state.Value = ManagementState.None; return; } + // 選択中のタンクにストックがあればIndex更新 + var selectedIndex = tankList.FindIndex(tankView => tankView.State.Value == TankState.Selected); + if (selectedIndex != -1 && !gameData.StorageTanks[selectedIndex].IsEmpty) + { + index = selectedIndex; + } + ChangeAllTankInteractable(tankList, false); ClearSelectedTank(tankList); tankList[index].SetState(TankState.Selected); + var tankData = gameData.StorageTanks[index]; - selectedTank.Value = (tankList[index].TankNumber, productList.FirstOrDefault(data => data.id == tankData.FlavorId)); - Action tastingAction = () => + selectedTank.Value = (index + 1, productList.FirstOrDefault(data => data.id == tankData.FlavorId)); + void TastingAction() { + state.Value = ManagementState.None; Tasting(selectedTank.Value.num); tankList[selectedTank.Value.num - 1].SetData(gameData.StorageTanks[selectedTank.Value.num - 1]); SetActiveTastingButton(gameData.StorageTanks.Any(tank => !tank.IsEmpty)); - }; - LocalCacheManager.Save(TastingView.TastingDataTag, (selectedTank.AsObservable(), new Action(() => state.Value = ManagementState.None), tastingAction)); - TransitionManager.Instance.LoadSceneAdditive(GameScenes.Tasting); + } + TastingView.ShowDialog(selectedTank.AsObservable(), () => state.Value = ManagementState.None, TastingAction); break; default: throw new ArgumentOutOfRangeException(nameof(mState), mState, null); @@ -188,10 +190,10 @@ public class ProductManagement : MonoBehaviour }).AddTo(this); // タンククリック検知 - Observable.Merge(tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView))) + var tankClickStream = tankList.Select(tankView => tankView.TankClickObservable.Select(_ => tankView)).Merge(); + tankClickStream .Where(tankView => tankView.State.Value != TankState.Lock) .Where(tankView => tankView.State.Value != TankState.Unavailable) - .Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0) .Subscribe(tankView => { switch (state.Value) @@ -204,9 +206,13 @@ public class ProductManagement : MonoBehaviour case ManagementState.Replacing: break; case ManagementState.Tasting: + var tankData = gameData.StorageTanks[tankView.TankNumber - 1]; + if (tankData.IsEmpty) + { + break; + } ClearSelectedTank(tankList); tankView.SetState(TankState.Selected); - var tankData = gameData.StorageTanks[tankView.TankNumber - 1]; selectedTank.Value = (tankView.TankNumber, productList.FirstOrDefault(data => data.id == tankData.FlavorId)); break; default: @@ -215,10 +221,7 @@ public class ProductManagement : MonoBehaviour }).AddTo(this); // 2連続でクリックされたViewがまとめて取得できるストリーム - var replacingObservable = Observable.Merge(tankList.Select(x => x.TankClickObservable.Select(_ => x))) - .Where(x => x.State.Value != TankState.Lock) - .Where(x => x.State.Value != TankState.Unavailable) - .Where(tankView => gameData.StorageTanks[tankView.TankNumber - 1].Stock > 0) + var replacingObservable = tankClickStream .TakeWhile(_ => state.Value != ManagementState.Tasting) .Pairwise(); // タンク入れ替え @@ -237,11 +240,13 @@ public class ProductManagement : MonoBehaviour tanks.Current.SetData(gameData.StorageTanks[tanks.Current.TankNumber - 1]); GameDataManager.SaveGameData(); } + ClearSelectedTank(tankList); state.Value = ManagementState.None; }).AddTo(this); - // 試食ボタン + // 空以外のタンクが1つでもあれば有効 SetActiveTastingButton(gameData.StorageTanks.Any(tank => !tank.IsEmpty)); + // 試食ボタン tastingButton.OnClickAsObservable().Subscribe(_ => { state.Value = ManagementState.Tasting; @@ -250,10 +255,6 @@ public class ProductManagement : MonoBehaviour // 商品補充タイプ切替 view.RefillType.Subscribe(mode => { - if (state.Value != ManagementState.Tasting) - { - state.Value = ManagementState.None; - } // 補充方法変更 gameData.RefillMode = mode; GameDataManager.SaveGameData(); @@ -291,7 +292,6 @@ public class ProductManagement : MonoBehaviour private void Tasting(int tankNumber) { - state.Value = ManagementState.None; // 試食フラグに終了時間を設定 var tank = GameDataManager.GameData.StorageTanks[tankNumber - 1]; GameDataManager.GameData.AddTastingCustomerCount(tank.Stock); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs index 1a02c385..8653b887 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; public class TastingView : MonoBehaviour { - public static readonly string TastingDataTag = "TastingData"; + private static readonly string TastingDataTag = "TastingData"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); @@ -44,4 +44,10 @@ public class TastingView : MonoBehaviour }); }).AddTo(this); } + + public static void ShowDialog(IObservable<(int tankNum, ProductData productData)> selectedObservable, Action closeButtonAction, Action tastingButtonAction) + { + LocalCacheManager.Save(TastingDataTag, (selectedObservable, closeButtonAction, tastingButtonAction)); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.Tasting); + } } \ No newline at end of file