From d70556b94b82922f89cbd7f3ae838e4db7c5c02a Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 14 Feb 2022 20:41:41 +0900 Subject: [PATCH] =?UTF-8?q?i2=E3=81=AE=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/CookingResults.unity | 26 +- .../Scenes/CornField/Prefabs/detail.prefab | 9 +- .../Scenes/CornField/Reinforcement.unity | 161 ++++++------- .../CornField/ReinforcementDetail.unity | 39 +-- .../MyGame/Scenes/Main/BulkOrderCancel.unity | 50 ---- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 5 + .../Assets/MyGame/Scenes/Main/Mission.unity | 225 ------------------ .../Main/Prefabs/BulkOrder/Canvas.prefab | 39 +-- .../BulkOrder/CanvasAchievement.prefab | 20 +- .../Prefabs/BulkOrder/CanvasCancel.prefab | 7 +- .../Prefabs/BulkOrder/Frame_BulkOrder.prefab | 16 +- .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 12 +- .../Prefabs/Mission/AchievementCanvas.prefab | 6 +- .../Main/Prefabs/Mission/MissionCanvas.prefab | 9 +- .../MyGame/Scenes/Main/WatchMovieCoin.unity | 6 +- .../Scenes/Main/WatchMovieCoinGet.unity | 3 +- .../Scenes/Main/WatchMovieFailure.unity | 3 +- 17 files changed, 196 insertions(+), 440 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index 5eb91b9e..c3afba58 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -188,19 +188,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1906782496} ---- !u!114 &203538560 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1459407280} --- !u!224 &237413689 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3402059229817004136, guid: 9cd0f85cb815c374a913cf9c1a825d1b, @@ -1483,6 +1470,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 207} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &832956694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1459407280} --- !u!1 &885194169 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index 645085fa..5f6ea098 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -250,7 +250,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 219e2813d99bd6746abadbbb1ca5efba, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2028,7 +2029,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2179,7 +2181,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: bab63488a87726d4a8ee6b6cb34c40f0, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index e177f743..0a294813 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -236,7 +236,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 670145871} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &234630219 +--- !u!114 &194516385 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -248,7 +248,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 275189772} + mTarget: {fileID: 8736114270285166818} --- !u!114 &250939657 MonoBehaviour: m_ObjectHideFlags: 0 @@ -262,19 +262,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1720684620} ---- !u!114 &251702813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 298872042} --- !u!1001 &275189768 PrefabInstance: m_ObjectHideFlags: 0 @@ -746,6 +733,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 +--- !u!114 &384015389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 8736114270285166814} --- !u!1 &528402688 GameObject: m_ObjectHideFlags: 0 @@ -933,20 +933,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 1470} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1037376757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166814} ---- !u!114 &1178287656 +--- !u!114 &1252932184 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -958,8 +945,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166813} ---- !u!114 &1210012512 + mTarget: {fileID: 8736114270285166817} +--- !u!114 &1333700465 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -972,19 +959,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 8736114270285166816} ---- !u!114 &1405286472 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166818} --- !u!1 &1440832243 GameObject: m_ObjectHideFlags: 0 @@ -1121,7 +1095,26 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 ---- !u!114 &1524050338 +--- !u!224 &1530261473 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2616693360086915591, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + m_PrefabInstance: {fileID: 2616693359400416742} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1656272764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 8736114270285166813} +--- !u!114 &1712297005 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1134,38 +1127,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 298872043} ---- !u!224 &1530261473 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2616693360086915591, guid: 8990d570a96764364823ea362803dfcf, - type: 3} - m_PrefabInstance: {fileID: 2616693359400416742} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1532097413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 275189771} ---- !u!114 &1720334080 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166815} --- !u!1 &1720684618 GameObject: m_ObjectHideFlags: 0 @@ -1267,7 +1228,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1497,7 +1459,20 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2049154665 +--- !u!114 &1918005794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 275189772} +--- !u!114 &1987922511 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1509,7 +1484,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166817} + mTarget: {fileID: 275189771} +--- !u!114 &2003342434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 8736114270285166815} +--- !u!114 &2011053212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 298872042} --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index a6a9bff3..b60a7f5e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -305,7 +305,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 ---- !u!114 &344555753 +--- !u!114 &317708928 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -317,7 +317,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1402887490} + mTarget: {fileID: 1766466141} --- !u!114 &442970493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -597,7 +597,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -610,6 +611,19 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 442970493} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &598404965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1402887490} --- !u!1 &653404265 GameObject: m_ObjectHideFlags: 0 @@ -1356,7 +1370,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1624,7 +1639,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -3115,19 +3131,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 560871796} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text ---- !u!114 &2015154686 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1766466141} --- !u!1 &2072348679 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity index 6e23210b..8f2c39cf 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity @@ -196,56 +196,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 306200262} m_PrefabAsset: {fileID: 0} ---- !u!114 &568548335 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4187074210099131601, guid: c2d6a4625b62147e080e95799c45c8ad, - type: 3} - m_PrefabInstance: {fileID: 4187074209805441001} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &793470389 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1494804295} ---- !u!114 &820931282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 568548335} ---- !u!114 &1494804295 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, - type: 3} - m_PrefabInstance: {fileID: 4187074209805441001} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &4187074209805441001 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 9dc44bed..6442f5ee 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -6277,6 +6277,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -22 objectReference: {fileID: 0} + - target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 77e2f2c4..daa2b846 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -654,114 +654,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &55686911 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 518689044540430268, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686912 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686913 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686914 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686915 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686916 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639677480706697, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686917 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686918 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639679015166989, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &55686919 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639678739049204, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &55686920 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2362301707389979568, guid: 66c0408cd45e7422cb6d59d2bdf4e998, @@ -786,45 +678,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &68131808 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686915} ---- !u!114 &223758780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686918} ---- !u!114 &358220413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686914} --- !u!114 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -838,45 +691,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686921} ---- !u!114 &765361694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686917} ---- !u!114 &936008269 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686919} ---- !u!114 &1037588221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686916} --- !u!114 &1526372568 MonoBehaviour: m_ObjectHideFlags: 0 @@ -890,19 +704,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686910} ---- !u!114 &1856100852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686913} --- !u!114 &1877237825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -916,19 +717,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686920} ---- !u!114 &1901491067 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686912} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 @@ -1004,16 +792,3 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1944170687} m_PrefabAsset: {fileID: 0} ---- !u!114 &1971812952 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 55686911} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 917d6feb..0b340a84 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -177,7 +177,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8433b258c2bfd447787ed80c48da8a3c, type: 3} + m_Sprite: {fileID: 21300000, guid: 3427e8ca8d0104e48931345970086635, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -444,7 +444,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a44ad4ea0a19042fc88f84bbe5b86f22, type: 3} + m_Sprite: {fileID: 21300000, guid: 274b9e3453e45cb42952f9bf572e625b, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -747,7 +747,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -864,7 +864,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, type: 3} + m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1035,7 +1035,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8934f039c9ff3492aa8714915bc4741d, type: 3} + m_Sprite: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2041,7 +2041,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, type: 3} + m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2180,7 +2180,7 @@ GameObject: - component: {fileID: 4082915279112502090} - component: {fileID: 4082915279112502088} - component: {fileID: 4082915279112502089} - - component: {fileID: 6695182775914966871} + - component: {fileID: 6938651532631129083} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -2234,7 +2234,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2244,7 +2244,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6695182775914966871 +--- !u!114 &6938651532631129083 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2270,7 +2270,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2938,7 +2939,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, type: 3} - target: {fileID: 3658417434568161586, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2954,13 +2955,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3108,19 +3109,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, type: 3} - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3268,19 +3269,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, type: 3} - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab index 67ccf4dc..a48aa9ad 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab @@ -155,10 +155,6 @@ MonoBehaviour: orderCharacterImage: {fileID: 2377818823009469880} heartIconTransform: {fileID: 2377818824019765601} coinIconTransform: {fileID: 2377818823916755441} - heartPrefab: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84, - type: 3} - coinPrefab: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0, - type: 3} --- !u!1 &2377818823009469882 GameObject: m_ObjectHideFlags: 0 @@ -951,7 +947,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1473,7 +1470,7 @@ GameObject: - component: {fileID: 2377818824163143829} - component: {fileID: 2377818824163143827} - component: {fileID: 2377818824163143826} - - component: {fileID: 5082025825469027718} + - component: {fileID: 6836361763963443703} m_Layer: 5 m_Name: ImageText m_TagString: Untagged @@ -1537,7 +1534,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5082025825469027718 +--- !u!114 &6836361763963443703 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1563,7 +1560,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1677,7 +1675,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 6c7a1316274f767489221ac9165a0148, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1996,7 +1995,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index b4d52c01..c2673559 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -87,7 +87,7 @@ GameObject: - component: {fileID: 4187074208686454129} - component: {fileID: 4187074208686454131} - component: {fileID: 4187074208686454128} - - component: {fileID: 7063888299359505536} + - component: {fileID: 8362803958090260425} m_Layer: 5 m_Name: explanation m_TagString: Untagged @@ -151,7 +151,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7063888299359505536 +--- !u!114 &8362803958090260425 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1632,7 +1632,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index b97ed9a3..01790a03 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -1108,7 +1108,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 35f44428c7e9fd74eae90f656268d858, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1132,7 +1133,7 @@ GameObject: - component: {fileID: 3658417436044435503} - component: {fileID: 3658417436044435497} - component: {fileID: 3658417436044435502} - - component: {fileID: 3492958125710759010} + - component: {fileID: 4073833788007938223} m_Layer: 5 m_Name: Text_purchase m_TagString: Untagged @@ -1196,7 +1197,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3492958125710759010 +--- !u!114 &4073833788007938223 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1222,7 +1223,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: cfb90a2d77f52f8449f001ae3c506486, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1412,7 +1414,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -1644,7 +1646,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} + m_Sprite: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1936,7 +1938,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, type: 3} + m_Sprite: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index c5603ff5..24111b13 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -450,7 +450,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: + mTerm: ui_button_Blue_logo mTermSecondary: PrimaryTermModifier: 0 SecondaryTermModifier: 0 @@ -464,7 +464,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 49ccadb8669df11469e259812f5b0e30, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -476,7 +477,7 @@ MonoBehaviour: mGUI_ShowTems: 1 mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} - mLocalizeTargetName: + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &1823819594 GameObject: m_ObjectHideFlags: 0 @@ -2522,6 +2523,11 @@ MonoBehaviour: m_EditorClassIdentifier: vipButton: {fileID: 7453407021347122718} buttonAnimator: {fileID: 2570027885372274640} + vipCustomerAnimator: {fileID: 0} + customerDirection: {fileID: 0} + vipSpeechBubbleObject: {fileID: 0} + vipStayPosTransform: {fileID: 0} + vipMoveSpeed: 0 --- !u!95 &2570027885372274640 Animator: serializedVersion: 3 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 682199a4..1011f1ab 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -973,7 +973,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1220,7 +1221,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 12f5f9a7..ee5baf5a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -2877,7 +2877,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -3047,7 +3048,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -3235,7 +3237,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index 042b440e..d458942f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -1932,7 +1932,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 490f9ea68882b7b48bcc2974a41f8bcd, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2548,7 +2549,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index f66554f5..5ded38bc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -518,7 +518,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity index 4e6e91fd..4b8de082 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieFailure.unity @@ -707,7 +707,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: []