From 85d151c86e1936be3ead025674b50fa9c70669da Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 19 Jan 2022 17:39:26 +0900 Subject: [PATCH] =?UTF-8?q?=E6=8A=9C=E3=81=91=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=86=8D=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/CookingResults.unity | 34 +-- .../MyGame/Scenes/CornField/CornField.unity | 225 ++++++++++++++++ .../Scenes/CornField/Prefabs/detail.prefab | 8 +- .../Scenes/CornField/Prefabs/machine.prefab | 4 +- .../Scenes/CornField/Reinforcement.unity | 250 ++++++++++++++++++ .../CornField/ReinforcementDetail.unity | 58 ++-- .../Assets/MyGame/Scenes/Main/BulkOrder.unity | 71 ++++- .../MyGame/Scenes/Main/BulkOrderCancel.unity | 62 ++++- .../Scenes/Main/MissionAchievement.unity | 100 +++++++ .../Main/Prefabs/BulkOrder/Canvas.prefab | 68 ++++- .../Prefabs/BulkOrder/CanvasCancel.prefab | 12 +- .../Prefabs/Mission/AchievementCanvas.prefab | 6 +- 12 files changed, 816 insertions(+), 82 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index b5b5308f..5eb91b9e 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -188,6 +188,19 @@ 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, @@ -488,7 +501,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 171ed0d11d66f6a4d8c147aa7cd31fde, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1529,7 +1542,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 2dbe939557752344e969c5bf274bae45, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1759,7 +1772,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: be43441773844e241b0f8b046b68e8f8, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2807,7 +2820,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: a87a9337eaa8d394ab3e9f2a130777ee, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -7897,19 +7910,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1330096121} ---- !u!114 &1609035781 -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 &1667225190 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index c798829e..735cc40a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -379,6 +379,19 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &228163293 +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: 387414348} --- !u!114 &260671573 MonoBehaviour: m_ObjectHideFlags: 0 @@ -392,6 +405,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 457045031} +--- !u!114 &261459441 +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: 387414346} --- !u!1001 &279224989 PrefabInstance: m_ObjectHideFlags: 0 @@ -1640,6 +1666,102 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 +--- !u!114 &387414344 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414345 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414346 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414347 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414348 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414349 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414350 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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 &387414351 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 387414332} + 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!1 &457045027 GameObject: m_ObjectHideFlags: 0 @@ -2135,6 +2257,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &581316469 +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: 387414350} --- !u!1 &619114158 GameObject: m_ObjectHideFlags: 0 @@ -3094,6 +3229,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 42} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &926517399 +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: 387414344} --- !u!1 &927791470 GameObject: m_ObjectHideFlags: 0 @@ -3754,6 +3902,19 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 27 +--- !u!114 &1146034130 +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: 387414347} --- !u!1 &1164585267 GameObject: m_ObjectHideFlags: 0 @@ -4267,6 +4428,19 @@ Animator: type: 3} m_PrefabInstance: {fileID: 279224989} m_PrefabAsset: {fileID: 0} +--- !u!114 &1321384074 +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: 387414349} --- !u!1 &1321959278 GameObject: m_ObjectHideFlags: 0 @@ -4299,6 +4473,19 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1342249302 +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: 387414345} --- !u!1 &1355152263 GameObject: m_ObjectHideFlags: 0 @@ -15649,6 +15836,19 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1958951427} m_PrefabAsset: {fileID: 0} +--- !u!114 &1971092393 +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: 1507187603938887412} --- !u!1 &1989990597 GameObject: m_ObjectHideFlags: 0 @@ -16295,6 +16495,19 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} +--- !u!114 &2087869070 +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: 387414351} --- !u!1 &2113322130 GameObject: m_ObjectHideFlags: 0 @@ -16724,6 +16937,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5679af969476421ebe68e352455c525f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1507187603938887412 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1507187604136703913, guid: 21599f8e6d1104a07b0b14b49f8c1429, + type: 3} + m_PrefabInstance: {fileID: 1507187603938887410} + 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!1001 &4107102217382154191 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index aa5ddc8b..645085fa 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -1036,7 +1036,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e4cf5badc30c9c848961d83d0daefd2c, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1994,7 +1994,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2145,7 +2145,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: bab63488a87726d4a8ee6b6cb34c40f0, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2913,7 +2913,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index 2a6accea..4514b92b 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -626,7 +626,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: bab63488a87726d4a8ee6b6cb34c40f0, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -988,7 +988,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 3db8e35b..e177f743 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -236,6 +236,19 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 670145871} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &234630219 +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 &250939657 MonoBehaviour: m_ObjectHideFlags: 0 @@ -249,6 +262,19 @@ 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 @@ -426,6 +452,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &275189771 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271738746592, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 275189768} + 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 &275189772 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 275189768} + 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!1001 &298872039 PrefabInstance: m_ObjectHideFlags: 0 @@ -598,6 +648,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &298872042 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271533156906, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 298872039} + 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 &298872043 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 298872039} + 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!1 &308891212 GameObject: m_ObjectHideFlags: 0 @@ -859,6 +933,58 @@ 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 +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 &1210012512 +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: 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 @@ -995,12 +1121,51 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 +--- !u!114 &1524050338 +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: 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 @@ -1332,6 +1497,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2049154665 +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: 8736114270285166817} --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0 @@ -1760,3 +1938,75 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8736114270285166813 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + 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 &8736114270285166814 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4882929337143975819, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + 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 &8736114270285166815 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271738746592, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + 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 &8736114270285166816 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + 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 &8736114270285166817 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271533156906, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + 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 &8736114270285166818 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, + type: 3} + m_PrefabInstance: {fileID: 8736114270285166811} + 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: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 52b0a0c3..a6a9bff3 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -305,6 +305,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 +--- !u!114 &344555753 +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!114 &442970493 MonoBehaviour: m_ObjectHideFlags: 0 @@ -542,7 +555,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 786bec1a4a9cd2c48b0a3262a4dd049f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1301,7 +1314,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 4cfc30a3bf61af2468eff2d37a9e1b5e, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1569,7 +1582,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2344,19 +2357,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1486509090 -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 &1495795006 GameObject: m_ObjectHideFlags: 0 @@ -2723,19 +2723,6 @@ RectTransform: m_AnchoredPosition: {x: -7, y: 166.19997} m_SizeDelta: {x: 550, y: 300} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1754931169 -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!1001 &1766466137 PrefabInstance: m_ObjectHideFlags: 0 @@ -3128,6 +3115,19 @@ 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/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index 8601adb9..f9255dda 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -121,6 +121,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &748186694 +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: 4082915279172730652} --- !u!1001 &759556296 PrefabInstance: m_ObjectHideFlags: 0 @@ -223,6 +236,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3394136939217206474, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + type: 3} + - target: {fileID: 3394136939320170178, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + type: 3} - target: {fileID: 3412655375795948910, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_IsActive @@ -232,13 +257,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b511c0ea71cf24e24bf0f980ec198080, + objectReference: {fileID: 21300000, guid: 6c7a1316274f767489221ac9165a0148, type: 3} - target: {fileID: 4082915277351343690, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3a7dcb6c37b1246629fc990bfa98be30, + objectReference: {fileID: 21300000, guid: 016a4d1058a82e64899a7e1776a6a3e3, type: 3} - target: {fileID: 4082915277351343700, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -249,13 +274,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8433b258c2bfd447787ed80c48da8a3c, + objectReference: {fileID: 21300000, guid: 3427e8ca8d0104e48931345970086635, type: 3} - target: {fileID: 4082915277796665065, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a44ad4ea0a19042fc88f84bbe5b86f22, + objectReference: {fileID: 21300000, guid: 274b9e3453e45cb42952f9bf572e625b, type: 3} - target: {fileID: 4082915277796665065, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -266,13 +291,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, + objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} - target: {fileID: 4082915278124182473, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 8934f039c9ff3492aa8714915bc4741d, + objectReference: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, type: 3} - target: {fileID: 4082915278124182473, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -308,13 +333,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, + objectReference: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} - target: {fileID: 4082915279112502089, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 4082915279371560208, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} @@ -451,6 +476,24 @@ PrefabInstance: propertyPath: m_PreserveAspect value: 1 objectReference: {fileID: 0} + - target: {fileID: 6299910495612827599, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} + - target: {fileID: 7325254816367235996, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} + - target: {fileID: 7325254816537426324, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} - target: {fileID: 8853301888902362100, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_AnchoredPosition.x @@ -458,3 +501,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} +--- !u!114 &4082915279172730652 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4082915279112502089, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + m_PrefabInstance: {fileID: 4082915279172730651} + 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: diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity index 6e16f4cc..6e23210b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity @@ -196,6 +196,56 @@ 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 @@ -207,7 +257,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 733488beb928e4664be989505eac8416, + objectReference: {fileID: 21300000, guid: 6992356671f4ba241abd42710ad93123, type: 3} - target: {fileID: 4187074209012466681, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} @@ -332,13 +382,13 @@ PrefabInstance: - target: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Text - value: "\u4E00\u65E6\u9009\u62E9\u53D6\u6D88\uFF0C\n\u5B8C\u6210\u5956\u52B1\u4E5F\u968F\u4E4B\u53D6\u6D88\u3002\n\u5DF2\u505A\u597D\u7684\u7206\u7C73\u82B1\n\u4F1A\u88AB\u5B89\u6392\u4E3A\u8BD5\u5403\u54C1\u3002" + value: "\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u3059\u308B\u3068\n\u9054\u6210\u5831\u916C\u304C\u3082\u3089\u3048\u306A\u304F\u306A\u308A\n\u65E2\u306B\u8ABF\u7406\u3057\u305F\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306F\n\u8A66\u98DF\u306B\u56DE\u3055\u308C\u307E\u3059" objectReference: {fileID: 0} - target: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4187074209291994453, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} @@ -349,19 +399,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: fb79f0ba31f2a471da31f53e0290b568, + objectReference: {fileID: 21300000, guid: adf4494c1d0b1084eac5d0b1310ecbf7, type: 3} - target: {fileID: 4187074209620482715, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 206ef16fb33d8433c9aad773f6f06367, + objectReference: {fileID: 21300000, guid: db3a5113bce41a3408381d04fbd53a92, type: 3} - target: {fileID: 4187074210099131601, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, + objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} - target: {fileID: 4187074210099131614, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity index dd124365..c20dbedd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/MissionAchievement.unity @@ -121,6 +121,57 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &14450022 +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: 7864277047505245957} +--- !u!114 &88636772 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7864277048100900070, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + m_PrefabInstance: {fileID: 7864277047505245954} + 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 &263637616 +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: 7864277047505245955} +--- !u!114 &1348862323 +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: 88636772} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 @@ -196,6 +247,19 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1944170687} m_PrefabAsset: {fileID: 0} +--- !u!114 &1993555408 +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: 7864277047505245956} --- !u!1001 &7864277047505245954 PrefabInstance: m_ObjectHideFlags: 0 @@ -330,3 +394,39 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3} +--- !u!114 &7864277047505245955 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7864277047165460487, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + m_PrefabInstance: {fileID: 7864277047505245954} + 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 &7864277047505245956 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7864277047117909268, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + m_PrefabInstance: {fileID: 7864277047505245954} + 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 &7864277047505245957 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7864277046940800485, guid: a2309e5e619554230b1f6d3d9426ed51, + type: 3} + m_PrefabInstance: {fileID: 7864277047505245954} + 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: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 0b500298..3228eea2 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 @@ -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 @@ -2934,6 +2934,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4082915278229527154} m_Modifications: + - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + type: 3} - target: {fileID: 3658417434568161586, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_IsActive @@ -2944,6 +2950,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -7 objectReference: {fileID: 0} + - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Name @@ -3086,6 +3104,24 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4082915278229527154} m_Modifications: + - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + type: 3} + - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Name @@ -3228,6 +3264,24 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4082915278229527154} m_Modifications: + - target: {fileID: 1707717755900770303, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + type: 3} + - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Name diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index e4535a77..b4d52c01 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -141,7 +141,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 733488beb928e4664be989505eac8416, type: 3} + m_Sprite: {fileID: 21300000, guid: 6992356671f4ba241abd42710ad93123, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -567,7 +567,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -579,7 +579,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u4E00\u65E6\u9009\u62E9\u53D6\u6D88\uFF0C\n\u5B8C\u6210\u5956\u52B1\u4E5F\u968F\u4E4B\u53D6\u6D88\u3002\n\u5DF2\u505A\u597D\u7684\u7206\u7C73\u82B1\n\u4F1A\u88AB\u5B89\u6392\u4E3A\u8BD5\u5403\u54C1\u3002" + m_Text: "\u30AD\u30E3\u30F3\u30BB\u30EB\u3092\u3059\u308B\u3068\n\u9054\u6210\u5831\u916C\u304C\u3082\u3089\u3048\u306A\u304F\u306A\u308A\n\u65E2\u306B\u8ABF\u7406\u3057\u305F\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306F\n\u8A66\u98DF\u306B\u56DE\u3055\u308C\u307E\u3059" --- !u!114 &1307251323072932719 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1047,7 +1047,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fb79f0ba31f2a471da31f53e0290b568, type: 3} + m_Sprite: {fileID: 21300000, guid: adf4494c1d0b1084eac5d0b1310ecbf7, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1240,7 +1240,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 206ef16fb33d8433c9aad773f6f06367, type: 3} + m_Sprite: {fileID: 21300000, guid: db3a5113bce41a3408381d04fbd53a92, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1596,7 +1596,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 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index e6e749d8..682199a4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -671,7 +671,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8f6e6ccb2d3f40a7bfb3bbdcf3479ce, type: 3} + m_Sprite: {fileID: 21300000, guid: 8a4a83b58fd845d4c8c98fd67fde9139, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -937,7 +937,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 @@ -1184,7 +1184,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1