From b16c0c2ec3145967e380fc1f8a4e29dd09b9df6a Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 19 Jan 2022 15:01:06 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=B9=E3=83=9A=E3=82=AF=E3=83=88?= =?UTF-8?q?=E6=AF=94=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/CornField/CornField.unity | 225 --------------- .../Assets/MyGame/Scenes/Main/BulkOrder.unity | 82 ++++-- .../MyGame/Scenes/Main/BulkOrderCancel.unity | 32 ++- .../Assets/MyGame/Scenes/Main/Mission.unity | 228 +++++++++++++++ .../Main/Prefabs/BulkOrder/Canvas.prefab | 20 +- .../Prefabs/BulkOrder/CanvasCancel.prefab | 18 +- .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 24 +- .../BulkOrder/Information/Canvas.prefab | 212 +++++++++++--- .../Prefabs/Mission/AchievementCanvas.prefab | 8 +- .../Main/Prefabs/Mission/MissionCanvas.prefab | 14 +- .../MyGame/Scenes/Main/WatchMovieCoin.unity | 6 +- .../Scenes/Main/WatchMovieCoinGet.unity | 6 +- .../Assets/MyGame/Scenes/Main/update.unity | 10 +- .../Assets/MyGame/Scenes/Title/Title.unity | 117 +++++++- .../Scenes/marketing/PopcornDescription.unity | 262 +----------------- .../marketing/Prefabs/Description.prefab | 79 +++++- .../marketing/Prefabs/MainCanvas.prefab | 24 +- .../marketing/Prefabs/ShopLevel/Canvas.prefab | 16 +- .../marketing/Prefabs/TastingWindow.prefab | 14 +- .../Scenes/marketing/ProductManagement.unity | 162 +++++++---- .../MyGame/Scenes/marketing/StoreLevel.unity | 30 ++ .../MyGame/Scenes/marketing/Tasting.unity | 125 +++++++++ .../Assets/MyGame/Scenes/recipe/recipe.unity | 156 ++++++++++- .../Scenes/shopping/ExchangeAchievement.unity | 10 +- .../Scenes/shopping/Prefabs/Frame.prefab | 3 +- .../Scenes/shopping/Prefabs/ItemDetail.prefab | 6 +- .../Scenes/shopping/Prefabs/MainCanvas.prefab | 170 +++++++++++- .../Scenes/shopping/Prefabs/Window.prefab | 180 +++++++++++- .../Scenes/shopping/ShoppingExplanation.unity | 2 +- .../MyGame/Scenes/shopping/shopping.unity | 259 ++++++++++++++++- popcorn/Assets/Resources/I2Languages.asset | 20 ++ 31 files changed, 1818 insertions(+), 702 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 95994d6b..c798829e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -314,19 +314,6 @@ Transform: m_Father: {fileID: 2040636316} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &143241400 -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!1 &149181930 GameObject: m_ObjectHideFlags: 0 @@ -405,19 +392,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 457045031} ---- !u!114 &271573624 -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!1001 &279224989 PrefabInstance: m_ObjectHideFlags: 0 @@ -791,19 +765,6 @@ MonoBehaviour: cullCornRate: 0.9 firstCornLimit: 160 secondCornLimit: 250 ---- !u!114 &297313211 -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 &315104241 GameObject: m_ObjectHideFlags: 0 @@ -1679,102 +1640,6 @@ 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 @@ -2258,19 +2123,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &545788891 -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!114 &556316131 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3767471200807653374, guid: 0949d70c1a73342ca8955c7f59c04fe0, @@ -3040,19 +2892,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &784028550 -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 &790124635 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8883079979800818979, guid: 5e326851a49dc4fd9b51d54fb58f4e02, @@ -3076,19 +2915,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4107102217382154191} m_PrefabAsset: {fileID: 0} ---- !u!114 &830469312 -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 &877205765 GameObject: m_ObjectHideFlags: 0 @@ -4751,19 +4577,6 @@ Transform: m_Father: {fileID: 1194872049} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1459652122 -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!1 &1491597819 GameObject: m_ObjectHideFlags: 0 @@ -4925,19 +4738,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1507608971 -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 &1537737291 GameObject: m_ObjectHideFlags: 0 @@ -4970,19 +4770,6 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1560579013 -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!1001 &1589622939 PrefabInstance: m_ObjectHideFlags: 0 @@ -16937,18 +16724,6 @@ 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/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index f419cff3..8601adb9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -196,19 +196,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 759556296} m_PrefabAsset: {fileID: 0} ---- !u!114 &1567790697 -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 &4082915279172730651 PrefabInstance: m_ObjectHideFlags: 0 @@ -241,6 +228,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4082915277333916916, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b511c0ea71cf24e24bf0f980ec198080, + type: 3} - target: {fileID: 4082915277351343690, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Sprite @@ -252,6 +245,40 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4082915277424874095, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8433b258c2bfd447787ed80c48da8a3c, + type: 3} + - target: {fileID: 4082915277796665065, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a44ad4ea0a19042fc88f84bbe5b86f22, + type: 3} + - target: {fileID: 4082915277796665065, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4082915278008547936, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, + type: 3} + - target: {fileID: 4082915278124182473, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8934f039c9ff3492aa8714915bc4741d, + type: 3} + - target: {fileID: 4082915278124182473, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4082915278280054884, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_SizeDelta.x @@ -277,6 +304,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4082915279096126312, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, + type: 3} + - target: {fileID: 4082915279112502089, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 4082915279371560208, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_Name @@ -407,6 +446,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 32.199997 objectReference: {fileID: 0} + - target: {fileID: 5365738830651822489, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8853301888902362100, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_AnchoredPosition.x @@ -414,15 +458,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} ---- !u!114 &4082915279172730652 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4082915277351343690, 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 ec9dabd2..6e16f4cc 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderCancel.unity @@ -203,6 +203,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4187074208686454128, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 733488beb928e4664be989505eac8416, + type: 3} - target: {fileID: 4187074209012466681, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Name @@ -326,13 +332,37 @@ PrefabInstance: - target: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_Text - 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" + 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" objectReference: {fileID: 0} + - target: {fileID: 4187074209167193817, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 4187074209291994453, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_AnchoredPosition.y value: 125.100006 objectReference: {fileID: 0} + - target: {fileID: 4187074209478010268, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fb79f0ba31f2a471da31f53e0290b568, + type: 3} + - target: {fileID: 4187074209620482715, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 206ef16fb33d8433c9aad773f6f06367, + type: 3} + - target: {fileID: 4187074210099131601, guid: c2d6a4625b62147e080e95799c45c8ad, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, + type: 3} - target: {fileID: 4187074210099131614, guid: c2d6a4625b62147e080e95799c45c8ad, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 98854621..ac2282f2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -169,6 +169,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 518689044540430268, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 671564200103447854, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -179,6 +185,12 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 2660639677052336234, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.y @@ -284,6 +296,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, + type: 3} - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchoredPosition.y @@ -309,6 +327,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2660639678739049204, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.y @@ -329,6 +353,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2660639679015166989, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, + type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -459,6 +489,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 3664918248288857012, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -489,6 +525,17 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Text + value: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" + objectReference: {fileID: 0} + - target: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.y @@ -509,6 +556,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 6700388378296198159, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -531,6 +584,181 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} +--- !u!114 &297372918 +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: 1556136478} +--- !u!114 &316964578 +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: 439249517} +--- !u!114 &439249517 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 &771529810 +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: 1614911828} +--- !u!114 &791726450 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 &939695368 +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: 1150667240} +--- !u!114 &1072811300 +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: 1900675268} +--- !u!114 &1122205379 +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: 791726450} +--- !u!114 &1150667240 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 &1178818524 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639678752994312, 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 &1556136478 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 &1614911828 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 &1619395587 +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: 1178818524} +--- !u!114 &1900675268 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!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 7312db36..0b500298 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: 3427e8ca8d0104e48931345970086635, type: 3} + m_Sprite: {fileID: 21300000, guid: 8433b258c2bfd447787ed80c48da8a3c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -444,9 +444,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 274b9e3453e45cb42952f9bf572e625b, type: 3} + m_Sprite: {fileID: 21300000, guid: a44ad4ea0a19042fc88f84bbe5b86f22, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -747,7 +747,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, 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: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1035,9 +1035,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 8934f039c9ff3492aa8714915bc4741d, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2041,7 +2041,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, 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: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2805,7 +2805,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: d3f848d0fe697f7449c0f721658c5030, 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/Main/Prefabs/BulkOrder/CanvasCancel.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab index 04bab986..e4535a77 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasCancel.prefab @@ -141,9 +141,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6992356671f4ba241abd42710ad93123, type: 3} + m_Sprite: {fileID: 21300000, guid: 733488beb928e4664be989505eac8416, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -567,7 +567,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, 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: "\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" + 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" --- !u!114 &1307251323072932719 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1047,9 +1047,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: adf4494c1d0b1084eac5d0b1310ecbf7, type: 3} + m_Sprite: {fileID: 21300000, guid: fb79f0ba31f2a471da31f53e0290b568, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1240,9 +1240,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: db3a5113bce41a3408381d04fbd53a92, type: 3} + m_Sprite: {fileID: 21300000, guid: 206ef16fb33d8433c9aad773f6f06367, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1596,7 +1596,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 5c1575d0..4f3e1000 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -117,7 +117,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -309,7 +309,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -824,7 +824,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -1484,9 +1484,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 48243d820b7c5bd43ba50a88f69a8c05, type: 3} + m_Sprite: {fileID: 21300000, guid: c6f198817e0e9474facf0c1a36b1baf6, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1843,7 +1843,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2146,6 +2146,12 @@ PrefabInstance: propertyPath: m_Name value: Orde objectReference: {fileID: 0} + - target: {fileID: 1266659963782799786, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} --- !u!224 &4315754688526726639 stripped @@ -2430,6 +2436,12 @@ PrefabInstance: propertyPath: m_Name value: Orde (1) objectReference: {fileID: 0} + - target: {fileID: 1266659963782799786, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} --- !u!224 &3058138224988021536 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index 47c01471..b0fcb14c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -222,9 +222,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} + m_Sprite: {fileID: 21300000, guid: 5110cb836fda4417b89051c3d3f8509b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -696,7 +696,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1187,7 +1187,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} + m_Sprite: {fileID: 21300000, guid: 94bfd479e68964f438c9c619fc7e88f1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2039,7 +2039,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2051,7 +2051,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08\u30ED\u30B0\u30A4\u30F3\u6570" + m_Text: "\u7D2F\u8BA1\u767B\u9646\u6570" --- !u!114 &6641915190159818204 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2195,7 +2195,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2207,7 +2207,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08" + m_Text: "\u7D2F\u8BA1" --- !u!114 &8484226659470063900 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2313,7 +2313,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2325,7 +2325,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u304A\u5E97\u306E\u6B69\u307F" + m_Text: "\u5E97\u94FA\u53D1\u5C55\u53F2" --- !u!114 &2516843243683150584 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2951,7 +2951,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2963,7 +2963,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" + m_Text: "\u5E97\u94FA\u7B49\u7EA7" --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3181,7 +3181,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3377,7 +3377,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3389,7 +3389,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3570,7 +3570,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -3582,7 +3582,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5546\u54C1\u5728\u5EAB" + m_Text: "\u5546\u54C1\u5E93\u5B58" --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3688,7 +3688,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3917,7 +3917,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3929,7 +3929,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08\u8CA9\u58F2\u6570" + m_Text: "\u7D2F\u8BA1\u9500\u552E\u6570" --- !u!114 &2853590059505424815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4036,7 +4036,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4149,7 +4149,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4161,7 +4161,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u79F0\u53F7" + m_Text: "\u79F0\u8C13" --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4267,7 +4267,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -4462,7 +4462,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4815,7 +4815,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4827,7 +4827,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6750\u6599\u5728\u5EAB" + m_Text: "\u6750\u6599\u5E93\u5B58" --- !u!114 &2317717004034477971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4932,9 +4932,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} + m_Sprite: {fileID: 21300000, guid: 83a5b0d11178145cfb6950bec9e6efc4, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -5362,7 +5362,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5374,7 +5374,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" + m_Text: "\u5E97\u94FA\u7B49\u7EA7" --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5971,7 +5971,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5983,7 +5983,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8A08\u53D6\u5F97\u30B3\u30A4\u30F3" + m_Text: "\u7D2F\u8BA1\u83B7\u5F97\u91D1\u5E01" --- !u!114 &2645931646123064803 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6429,7 +6429,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -6887,6 +6887,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &6859128401904989762 stripped @@ -7022,6 +7028,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &5121082739885023266 stripped @@ -7037,6 +7049,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2283608498504545933} m_Modifications: + - target: {fileID: 4260782103114427595, guid: 1c539a17d4daa5649ab703e163ba1b6d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} propertyPath: m_Name @@ -7152,6 +7170,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4260782104779803627, guid: 1c539a17d4daa5649ab703e163ba1b6d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} --- !u!224 &2054314707049269807 stripped @@ -7167,6 +7191,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 41559837514718277} m_Modifications: + - target: {fileID: 1140500466731938224, guid: a557fa0433dcbb04abebf8f0bb9a2f85, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} propertyPath: m_Pivot.x @@ -7282,6 +7312,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1140500467660440448, guid: a557fa0433dcbb04abebf8f0bb9a2f85, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} --- !u!224 &2895616179257992943 stripped @@ -7297,6 +7333,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 41559837514718277} m_Modifications: + - target: {fileID: 1140500466731938224, guid: a557fa0433dcbb04abebf8f0bb9a2f85, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} propertyPath: m_Pivot.x @@ -7407,6 +7449,12 @@ PrefabInstance: propertyPath: m_Name value: detail_MaterialInventory objectReference: {fileID: 0} + - target: {fileID: 1140500467660440448, guid: a557fa0433dcbb04abebf8f0bb9a2f85, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} --- !u!224 &6859128402571301033 stripped @@ -7532,6 +7580,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (4) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407342906232102 stripped @@ -7657,6 +7711,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (2) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407343031133921 stripped @@ -7792,6 +7852,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407343090410679 stripped @@ -7917,6 +7983,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (7) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407343213651452 stripped @@ -8042,6 +8114,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (10) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407342576997737 stripped @@ -8167,6 +8245,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (14) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407342674737168 stripped @@ -8292,6 +8376,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (5) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407342728028100 stripped @@ -8417,6 +8507,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (12) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407343915371337 stripped @@ -8542,6 +8638,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (8) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407344022878165 stripped @@ -8667,6 +8769,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (11) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407344137759794 stripped @@ -8792,6 +8900,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (3) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407344202678344 stripped @@ -8917,6 +9031,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (6) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407344382242825 stripped @@ -9042,6 +9162,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (13) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407344405709638 stripped @@ -9167,6 +9293,12 @@ PrefabInstance: propertyPath: m_Name value: detail_histoy (9) objectReference: {fileID: 0} + - target: {fileID: 6878252345909755294, guid: 1247e9d6e57be4a49819f11b7e60acec, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} --- !u!224 &19407343749616327 stripped @@ -9182,6 +9314,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2283608498504545933} m_Modifications: + - target: {fileID: 4260782103114427595, guid: 1c539a17d4daa5649ab703e163ba1b6d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} propertyPath: m_Name @@ -9292,6 +9430,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4260782104779803627, guid: 1c539a17d4daa5649ab703e163ba1b6d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} --- !u!224 &6859128402064307067 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab index 60a109ab..e6e749d8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab @@ -671,9 +671,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8a4a83b58fd845d4c8c98fd67fde9139, type: 3} + m_Sprite: {fileID: 21300000, guid: c8f6e6ccb2d3f40a7bfb3bbdcf3479ce, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -937,7 +937,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, 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: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 2d6c2380..9f181b8f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -3314,7 +3314,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -7356,11 +7356,23 @@ PrefabInstance: propertyPath: m_Text value: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" objectReference: {fileID: 0} + - target: {fileID: 1565904717471002110, guid: 5efec1563da076e43b72d4631cb86748, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 7706147672656590141, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_Name value: detail_Mission_daily objectReference: {fileID: 0} + - target: {fileID: 8571419451803588585, guid: 5efec1563da076e43b72d4631cb86748, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + type: 3} - target: {fileID: 8610769905762339287, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: mLocalizeTarget diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity index a3af2486..a2c01cdf 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoin.unity @@ -1770,7 +1770,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c7c75e9f60f2456e9e49a6f81181b90, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2088,7 +2088,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2764,7 +2764,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 490f9ea68882b7b48bcc2974a41f8bcd, type: 3} + m_Sprite: {fileID: 21300000, guid: ba037169854dc4c1db3853c4700f027c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index 0823cf89..9c25a52f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -474,7 +474,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1097,9 +1097,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f247faa75d88e5c40a92444ba0e075c3, type: 3} + m_Sprite: {fileID: 21300000, guid: 33153abe11e8f48e1a209b7ef77a2f01, 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/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 2a09d349..611eb3e0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -655,7 +655,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 37 m_FontStyle: 0 m_BestFit: 0 @@ -667,7 +667,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB15\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" + m_Text: "\u5E97\u94FA\u7B49\u7EA7\u5728\u8FBE\u523015\u7EA7\u4EE5\u540E\u6B22\u8FCE\u60A8\u7B49\u5F85\u6211\u4EEC\u7684\u6E38\u620F\u5185\u5BB9\u66F4\u65B0\uFF01" --- !u!222 &575189314 CanvasRenderer: m_ObjectHideFlags: 0 @@ -868,7 +868,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1606,9 +1606,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2aa09e79e9eb3d74cb962b15849648f3, type: 3} + m_Sprite: {fileID: 21300000, guid: 0bb3005af5c7e495c98789eb993f7e7c, 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/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index 929d0f9b..b301a0ca 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -3186,6 +3186,7 @@ GameObject: m_Component: - component: {fileID: 947610808} - component: {fileID: 947610809} + - component: {fileID: 947610810} m_Layer: 0 m_Name: 'logo_TapToStart ' m_TagString: Untagged @@ -3246,7 +3247,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 151 - m_Sprite: {fileID: 21300000, guid: 0f6fa6e29967c9b4d963817afc7844bc, type: 3} + m_Sprite: {fileID: 21300000, guid: 46fbdcc59c26e4d5ba73c5e3aef6783f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -3257,6 +3258,46 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &947610810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 947610807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: title_tapToStart + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 0f6fa6e29967c9b4d963817afc7844bc, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1158915919} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityStandard_SpriteRenderer --- !u!1 &990585523 GameObject: m_ObjectHideFlags: 0 @@ -3782,6 +3823,7 @@ GameObject: m_Component: - component: {fileID: 1129719413} - component: {fileID: 1129719414} + - component: {fileID: 1129719415} m_Layer: 0 m_Name: Signboard m_TagString: Untagged @@ -3842,7 +3884,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: f46abf72670f570469e3612d368201be, type: 3} + m_Sprite: {fileID: 21300000, guid: 1a4ee9902abee47b19e5f0e9cc26f774, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -3853,6 +3895,58 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &1129719415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129719412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: marketing_background_Signboard + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1637106857} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityStandard_SpriteRenderer +--- !u!114 &1158915919 +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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 947610809} --- !u!1001 &1165589898 PrefabInstance: m_ObjectHideFlags: 0 @@ -4255,7 +4349,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: cee29e082ddcf9743ab95cb745d03b2f, type: 3} + m_Sprite: {fileID: 21300000, guid: 6eae6687f0cb34a8fba4dc2dcf8ed817, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -4647,7 +4741,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 39 - m_Sprite: {fileID: 21300000, guid: f2960b87658156c45b5b574c3da9a1c7, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -4655,7 +4749,7 @@ SpriteRenderer: m_Size: {x: 8.62, y: 3.66} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!114 &1363440383 @@ -10097,6 +10191,19 @@ MonoBehaviour: - {fileID: 1134751513859088931, guid: 09a4786fa1ab00e4b9c5bf9cebf256bc, type: 3} specialCustomerList: - {fileID: 5301193561386860206, guid: 72f4243f8f258bc48b42e3ae5e1ba2b5, type: 3} +--- !u!114 &1637106857 +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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1129719414} --- !u!1 &1650380469 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity index ebb23da6..f1933136 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/PopcornDescription.unity @@ -121,84 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &234708341 -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: 3856012874773314177} ---- !u!114 &600609719 -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: 3856012874773314173} ---- !u!114 &1091189328 -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: 3856012874773314180} ---- !u!114 &1491358160 -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: 3856012874773314174} ---- !u!114 &1545905777 -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: 3856012874773314175} ---- !u!114 &1687118069 -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: 3856012874773314172} --- !u!1001 &1908326069 PrefabInstance: m_ObjectHideFlags: 0 @@ -294,58 +216,6 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1908326069} m_PrefabAsset: {fileID: 0} ---- !u!114 &1917412752 -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: 3856012874773314178} ---- !u!114 &1978729080 -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: 3856012874773314171} ---- !u!114 &2043689998 -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: 3856012874773314176} ---- !u!114 &2056386407 -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: 3856012874773314179} --- !u!1001 &3856012874773314169 PrefabInstance: m_ObjectHideFlags: 0 @@ -678,6 +548,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 15 objectReference: {fileID: 0} + - target: {fileID: 3856012875109116650, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8a75bf24b0fd54922b97392ab7473f70, + type: 3} - target: {fileID: 3856012875109116651, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_AnchoredPosition.x @@ -833,6 +709,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 22 objectReference: {fileID: 0} + - target: {fileID: 3856012875620007256, guid: 6592613d31e034734bea16833d6345c1, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, + type: 3} - target: {fileID: 3856012876379087770, guid: 6592613d31e034734bea16833d6345c1, type: 3} propertyPath: m_AnchoredPosition.y @@ -901,123 +783,3 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3856012874773314169} m_PrefabAsset: {fileID: 0} ---- !u!114 &3856012874773314171 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1897779238024453986, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314172 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1897779239782364448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314173 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1897779239418182969, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314174 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1897779238963660448, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314175 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1897779239415966422, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314176 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 197347668256104338, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314177 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3856012875694233262, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314178 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3856012875338846987, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314179 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3856012875805691666, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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 &3856012874773314180 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3856012875645848067, guid: 6592613d31e034734bea16833d6345c1, - type: 3} - m_PrefabInstance: {fileID: 3856012874773314169} - 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: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 7dbce3b9..224ce2a1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -759,6 +759,7 @@ GameObject: - component: {fileID: 3856012875109116651} - component: {fileID: 3856012875109116653} - component: {fileID: 3856012875109116650} + - component: {fileID: 1340074487379676819} m_Layer: 5 m_Name: Text_title m_TagString: Untagged @@ -812,9 +813,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, type: 3} + m_Sprite: {fileID: 21300000, guid: 8a75bf24b0fd54922b97392ab7473f70, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -822,6 +823,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1340074487379676819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3856012875109116648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_marketing_ProductManagement_explanation_rare_text + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: 409c5760e22df3a4b9dab699899fb95c, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &3856012875199795008 GameObject: m_ObjectHideFlags: 0 @@ -1000,7 +1041,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 @@ -1478,7 +1519,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1593,7 +1634,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 0 @@ -1711,7 +1752,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -1829,7 +1870,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 29 m_FontStyle: 0 m_BestFit: 1 @@ -2695,6 +2736,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3446673658581084022, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3044,6 +3091,12 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 3446673658581084022, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3216,6 +3269,12 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 3446673658581084022, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3413,6 +3472,12 @@ PrefabInstance: propertyPath: moveWithTransform value: 0 objectReference: {fileID: 0} + - target: {fileID: 3446673658581084022, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 4755900518491743640, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index 61f5375f..ad7575be 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -141,7 +141,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: 40 m_FontStyle: 1 m_BestFit: 0 @@ -153,7 +153,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.25 - m_Text: "\u53EF\u4EE5\u77ED\u65F6\u95F4\u5185\u589E\u957F\u5BA2\u6D41\u91CF" + m_Text: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\u304A\u5BA2\u3055\u3093\u304C\n\u5C11\u3057\u5897\u3048\u308B\u3088" --- !u!114 &1424299160027476878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -592,7 +592,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, type: 3} + m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -706,7 +706,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 31e6fb14761094676b211436f927ef92, type: 3} + m_Sprite: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1579,7 +1579,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7929c6099b8cb411fb44a6a77ac9834f, type: 3} + m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2024,7 +2024,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2705466136985562315, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2035,7 +2035,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2705466137083800160, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2046,7 +2046,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 2705466137392089852, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2577,7 +2577,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, + objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} @@ -2588,19 +2588,19 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 6124127958617077932, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 69a7fb681f31948029049f3df46aa576, + objectReference: {fileID: 21300000, guid: c981e97ae7f318346906c68c0c2dfcc6, type: 3} - target: {fileID: 6124127958769025434, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, + objectReference: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} - target: {fileID: 6134734927453340133, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index d01caa24..c64f64a7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -330,7 +330,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ed2ddfb0a2ddd2945af65cd7881b97e0, type: 3} + m_Sprite: {fileID: 21300000, guid: 95995de0573834141b72741b08c59351, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -860,7 +860,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1817140589b2aa3449e3972236b874c5, type: 3} + m_Sprite: {fileID: 21300000, guid: ddcb7afd00edf40b580ff0578ba769ca, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -976,7 +976,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -1130,9 +1130,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 41d4ecc9e2cefff4babb89fa78a5ac78, type: 3} + m_Sprite: {fileID: 21300000, guid: 3b156ec0dd4c7425f959eb5daba597cc, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -11265,7 +11265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ad8dde46c91fc7f4db2b42e6983fb2d6, type: 3} + m_Sprite: {fileID: 21300000, guid: 94d801fb3907346e98212732d7267807, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11381,7 +11381,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 35 m_FontStyle: 1 m_BestFit: 1 @@ -11498,7 +11498,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index 626c614c..01d8e5b4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -192,7 +192,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -204,7 +204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - m_Text: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" + m_Text: "\u98DF\u54C1\u7BB1\u4F1A\u7ACB\u523B\u6E05\u7A7A\uFF0C\u4F46\u662F\u91D1\u5E01\u548C\u7231\u5FC3\u4E5F\u65E0\u6CD5\u83B7\u5F97\u4E86\u54E6" --- !u!114 &7887033067418340973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -593,7 +593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f438a31f7ef146c29a828987af58ea7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1265,7 +1265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1823,7 +1823,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -1940,9 +1940,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} + m_Sprite: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, 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/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index e5e20f8b..ae6ad07c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -121,6 +121,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &145719434 +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: 219610916} --- !u!1 &189791791 GameObject: m_ObjectHideFlags: 0 @@ -195,19 +208,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 189791791} m_CullTransparentMesh: 0 ---- !u!114 &210795029 -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: 219610916} --- !u!1001 &219610911 PrefabInstance: m_ObjectHideFlags: 0 @@ -232,7 +232,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -373,13 +373,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -530,7 +530,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -576,7 +576,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -741,6 +741,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &379970042 +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: 219610918} --- !u!114 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -1111,6 +1124,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639508187} m_CullTransparentMesh: 0 +--- !u!114 &658606303 +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: 2701980939299648205} --- !u!1 &748884348 GameObject: m_ObjectHideFlags: 0 @@ -1185,6 +1211,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 748884348} m_CullTransparentMesh: 0 +--- !u!114 &935379235 +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: 219610915} --- !u!1 &935850165 GameObject: m_ObjectHideFlags: 0 @@ -1259,7 +1298,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 ---- !u!114 &968184469 +--- !u!114 &1089103595 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1271,33 +1310,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 219610915} ---- !u!114 &969340430 -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: 219610919} ---- !u!114 &1011415590 -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: 219610918} + mTarget: {fileID: 219610917} --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1446,7 +1459,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405932574} m_CullTransparentMesh: 0 ---- !u!114 &1905166163 +--- !u!114 &1733963194 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1458,7 +1471,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 219610917} + mTarget: {fileID: 219610919} --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1542,6 +1555,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2039133496 +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: 2701980939299648206} --- !u!1001 &2701980939299648204 PrefabInstance: m_ObjectHideFlags: 0 @@ -1753,7 +1779,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, + objectReference: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} - target: {fileID: 2118578838188127427, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -1990,7 +2016,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7929c6099b8cb411fb44a6a77ac9834f, + objectReference: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2056,7 +2082,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 31e6fb14761094676b211436f927ef92, + objectReference: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} - target: {fileID: 6040599672751541160, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2141,13 +2167,13 @@ PrefabInstance: - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Text - value: "\u53EF\u4EE5\u77ED\u65F6\u95F4\u5185\u589E\u957F\u5BA2\u6D41\u91CF" + value: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\u304A\u5BA2\u3055\u3093\u304C\n\u5C11\u3057\u5897\u3048\u308B\u3088" objectReference: {fileID: 0} - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 7786810388559140403, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2193,19 +2219,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, + objectReference: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} - target: {fileID: 8826965070724525141, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, + objectReference: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} - target: {fileID: 8826965070841845091, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 69a7fb681f31948029049f3df46aa576, + objectReference: {fileID: 21300000, guid: c981e97ae7f318346906c68c0c2dfcc6, type: 3} - target: {fileID: 8908151885642361585, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} @@ -2284,3 +2310,27 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} +--- !u!114 &2701980939299648205 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4534594761780962508, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + 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 &2701980939299648206 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1883006365929839107, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + m_PrefabInstance: {fileID: 2701980939299648204} + 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/marketing/StoreLevel.unity b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity index fb4a002c..073ccbf0 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity @@ -203,6 +203,24 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 8660695104205462540, guid: 7a0e45165860f4e5099d690b636937a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 95995de0573834141b72741b08c59351, + type: 3} + - target: {fileID: 8660695104521205934, guid: 7a0e45165860f4e5099d690b636937a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ddcb7afd00edf40b580ff0578ba769ca, + type: 3} + - target: {fileID: 8660695104846840910, guid: 7a0e45165860f4e5099d690b636937a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3b156ec0dd4c7425f959eb5daba597cc, + type: 3} - target: {fileID: 8660695104952201896, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_SortingOrder @@ -358,5 +376,17 @@ PrefabInstance: propertyPath: m_SortingOrder value: 200 objectReference: {fileID: 0} + - target: {fileID: 8660695105580868201, guid: 7a0e45165860f4e5099d690b636937a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 94d801fb3907346e98212732d7267807, + type: 3} + - target: {fileID: 8660695105894842743, guid: 7a0e45165860f4e5099d690b636937a8, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity index 900cf0ba..a853390b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity @@ -121,6 +121,131 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &14271496 +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: 1240625622} +--- !u!114 &28137624 +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: 449567760} +--- !u!114 &307005459 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5089467467985140646, guid: 0da1dd32f93cb4fe4881d732047679ec, + type: 3} + m_PrefabInstance: {fileID: 5089467467794925111} + 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 &326175531 +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: 611773674} +--- !u!114 &449567760 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, + type: 3} + m_PrefabInstance: {fileID: 5089467467794925111} + 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 &578393844 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5089467468128331485, guid: 0da1dd32f93cb4fe4881d732047679ec, + type: 3} + m_PrefabInstance: {fileID: 5089467467794925111} + 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 &611773674 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5089467466529880991, guid: 0da1dd32f93cb4fe4881d732047679ec, + type: 3} + m_PrefabInstance: {fileID: 5089467467794925111} + 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 &1240625622 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5089467467555811495, guid: 0da1dd32f93cb4fe4881d732047679ec, + type: 3} + m_PrefabInstance: {fileID: 5089467467794925111} + 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 &1568768064 +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: 307005459} +--- !u!114 &1806668544 +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: 578393844} --- !u!224 &1989384000 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5089467466543878519, guid: 0da1dd32f93cb4fe4881d732047679ec, diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index a7615ad4..972d7a64 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -430,7 +430,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1040,6 +1040,32 @@ MonoBehaviour: m_EditorClassIdentifier: scrollRect: {fileID: 203585999} verticalSlider: {fileID: 409545283} +--- !u!114 &204242329 +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: 914692727} +--- !u!114 &222000625 +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: 1582513103} --- !u!1001 &275912788 PrefabInstance: m_ObjectHideFlags: 0 @@ -1189,6 +1215,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 277152052} m_CullTransparentMesh: 0 +--- !u!114 &280952010 +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: 1380624351} --- !u!1 &329292689 GameObject: m_ObjectHideFlags: 0 @@ -1908,12 +1947,37 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!114 &618681325 +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: 1512403929} --- !u!224 &701105333 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} m_PrefabInstance: {fileID: 2929932626674485991} m_PrefabAsset: {fileID: 0} +--- !u!114 &721804044 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1139637482908115965, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1771084670} + 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 &759959152 PrefabInstance: m_ObjectHideFlags: 0 @@ -2174,6 +2238,31 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 759959152} m_PrefabAsset: {fileID: 0} +--- !u!114 &814786140 +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: 1282215901} +--- !u!114 &914692727 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1771084670} + 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!1 &968322475 GameObject: m_ObjectHideFlags: 0 @@ -2606,6 +2695,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1125343915 +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: 721804044} --- !u!1001 &1193300603 PrefabInstance: m_ObjectHideFlags: 0 @@ -2860,6 +2962,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!114 &1282215901 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 2929932626674485991} + 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 &1380624351 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 425834632} + 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!224 &1396650753 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, @@ -3444,6 +3570,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2beb2d436ad55734186e797d315796b3, type: 3} +--- !u!114 &1512403929 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 1568730406} + 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!1 &1554563048 GameObject: m_ObjectHideFlags: 0 @@ -3501,9 +3639,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 52a7196ac9b13a14e8d03cc8fa84866e, type: 3} + m_Sprite: {fileID: 21300000, guid: 8d639b06b37a34f7db928b456c0791c7, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3856,6 +3994,18 @@ RectTransform: m_AnchoredPosition: {x: -33.149994, y: -2.1000366} m_SizeDelta: {x: -42.69995, y: 40} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1582513103 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2929932626752093611, guid: 2beb2d436ad55734186e797d315796b3, + type: 3} + m_PrefabInstance: {fileID: 759959152} + 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!1 &1594398329 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity index 9fdf4ecc..3c00913c 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity @@ -272,7 +272,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -895,7 +895,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 17} + m_AnchoredPosition: {x: 0, y: 26} m_SizeDelta: {x: 450, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1193390270 @@ -917,9 +917,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 05c5b7e900206b442b94d0e96066685d, type: 3} + m_Sprite: {fileID: 21300000, guid: 76868ab3024de4b6f91d6a1d92c9a4df, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1034,7 +1034,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 1 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index e6399e12..00d5cb90 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -1101,8 +1101,7 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: - - {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} + TranslatedObjects: [] LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index e734bac8..6cd63126 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -423,7 +423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -575,7 +575,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: 40 m_FontStyle: 1 m_BestFit: 1 @@ -767,7 +767,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: 32 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab index 21350e9b..8ff00cfc 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab @@ -349,7 +349,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -515,6 +515,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1757697756341227570} m_Modifications: + - target: {fileID: 751536655852793358, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, + type: 3} + - target: {fileID: 1429324070929694813, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, + type: 3} - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -705,6 +717,18 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2912042419413397810, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 2912042419494869166, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 2912042419929665552, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.x @@ -735,16 +759,88 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 1150 objectReference: {fileID: 0} + - target: {fileID: 4144702814490772973, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} + - target: {fileID: 4144702814767940876, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} + - target: {fileID: 4144702815021412257, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} + - target: {fileID: 4144702816120709472, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} + - target: {fileID: 4144702816214109051, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} + - target: {fileID: 4144702816297785787, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c7c9afad32a9e6a4d935b3469ba30dd9, + type: 3} - target: {fileID: 6778406391240801571, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 6778406391272459118, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} - target: {fileID: 6778406391319654371, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 6778406391355087278, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} + - target: {fileID: 6778406391359986651, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6778406391449809845, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} + - target: {fileID: 6778406391528862144, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6778406391602078464, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -770,6 +866,18 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 6778406391799384732, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} + - target: {fileID: 6778406391868414044, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 6778406391892073053, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -790,6 +898,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6778406391974638151, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 6778406392151677628, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -830,6 +944,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6778406392282945067, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} + - target: {fileID: 6778406392475276570, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6778406392476026602, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -850,6 +976,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6778406392548851060, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} + - target: {fileID: 6778406392559949514, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 6778406392636603953, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y @@ -875,16 +1013,46 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 6778406392802564057, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} - target: {fileID: 6778406392981877588, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 6778406393018367830, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6778406393073679494, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} + - target: {fileID: 6778406393079469880, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} - target: {fileID: 6778406393242006453, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 6778406393295568823, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} --- !u!224 &203041985174341361 stripped diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index c8e4b979..e1b3ae4c 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -1716,7 +1716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, type: 3} + m_Sprite: {fileID: 21300000, guid: e3b6a72f824094cea83f59c2919c9b1f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1831,9 +1831,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, type: 3} + m_Sprite: {fileID: 21300000, guid: deeef3dcf68f1400cadb20c48776d6a8, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1888,6 +1888,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042418150870077} m_Modifications: + - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, + type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Pivot.x @@ -2003,16 +2009,35 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424714656549, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392151677628 stripped @@ -2028,6 +2053,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042418150870077} m_Modifications: + - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, + type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Pivot.x @@ -2143,16 +2174,35 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424714656549, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406391892073053 stripped @@ -2168,6 +2218,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042418150870077} m_Modifications: + - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, + type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Pivot.x @@ -2283,16 +2339,35 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424714656549, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406391604408560 stripped @@ -2308,6 +2383,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042418150870077} m_Modifications: + - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, + type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Pivot.x @@ -2423,16 +2504,35 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424714656549, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392636603953 stripped @@ -2448,6 +2548,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042418150870077} m_Modifications: + - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, + type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Pivot.x @@ -2563,16 +2669,35 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424714656549, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392265446442 stripped @@ -2588,6 +2713,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2912042418150870077} m_Modifications: + - target: {fileID: 1291783666383837680, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6346e6c1153c5404bb15d16a26bd0ef3, + type: 3} - target: {fileID: 8536603423520130721, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Pivot.x @@ -2703,16 +2834,35 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424476639144, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424714656549, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e83b46ee25b4b41669e0e18c63b3059e, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} --- !u!224 &6778406392476026602 stripped @@ -2992,6 +3142,18 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8536603424202476247, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b439432c614c94c5b8a8569189ca794f, + type: 3} + - target: {fileID: 8536603424255746891, guid: 907730abf7bed70469027e0e8aba6fd9, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 8536603424418812070, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index 96de5cc3..8f816544 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -132,7 +132,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 3033445369676262432, guid: a1b406baf09004616b436c242e3a474f, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 4badbec2..b9cb3016 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -187,6 +187,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &276887139 +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: 1098091308} --- !u!1 &553363513 GameObject: m_ObjectHideFlags: 0 @@ -270,6 +283,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &557112705 +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: 1098091309} --- !u!114 &715888784 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4826861628800619564, guid: 667a93fb2929943078b944050cddd464, @@ -333,6 +359,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1035225573 +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: 1098091310} --- !u!1001 &1098091307 PrefabInstance: m_ObjectHideFlags: 0 @@ -348,6 +387,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -473,6 +518,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + type: 3} + - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -618,6 +675,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.x @@ -633,6 +696,12 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + type: 3} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -670,6 +739,79 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} +--- !u!114 &1098091308 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + 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 &1098091309 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + 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 &1098091310 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + 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 &1098091311 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + 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 &1098091312 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + 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 &1217294393 +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: 1098091312} --- !u!1001 &1450416387 PrefabInstance: m_ObjectHideFlags: 0 @@ -745,6 +887,19 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1450416387} m_PrefabAsset: {fileID: 0} +--- !u!114 &2044536576 +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: 1098091311} --- !u!1001 &3078490422721459368 PrefabInstance: m_ObjectHideFlags: 0 @@ -842,6 +997,12 @@ PrefabInstance: propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 203041986372112404, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.x @@ -1118,11 +1279,23 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2365797324462302900, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: cb53b5ccd2d52784a86e49652e65aee7, + type: 3} - target: {fileID: 3971030752033893388, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 0} + - target: {fileID: 4137968107648010471, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, + type: 3} - target: {fileID: 4432729544473559518, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_SizeDelta.x @@ -1173,6 +1346,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 816 objectReference: {fileID: 0} + - target: {fileID: 5709465544360413450, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, + type: 3} - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite @@ -1182,13 +1361,29 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 0} + - target: {fileID: 8406322788165944276, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322788187973465, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 0} + - target: {fileID: 8406322788219638036, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} + - target: {fileID: 8406322788326259471, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1214,7 +1409,18 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 0} + - target: {fileID: 8406322788681368102, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} + - target: {fileID: 8406322788744466662, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322788756460263, guid: 667a93fb2929943078b944050cddd464, type: 3} @@ -1236,6 +1442,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8406322788839586557, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 8406322789033660934, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.y @@ -1276,6 +1488,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8406322789168733841, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} - target: {fileID: 8406322789344742992, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.y @@ -1296,6 +1514,18 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8406322789428665968, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, + type: 3} + - target: {fileID: 8406322789441811918, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} - target: {fileID: 8406322789521831563, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.y @@ -1320,20 +1550,35 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 0} + - target: {fileID: 8406322789691465571, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, type: 3} - target: {fileID: 8406322789845613550, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + objectReference: {fileID: 0} + - target: {fileID: 8406322789951364994, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1ed7a6eade5a3af4c962706dec098104, + type: 3} + - target: {fileID: 8406322789955138620, guid: 667a93fb2929943078b944050cddd464, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - target: {fileID: 8406322790122289935, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, - type: 3} + objectReference: {fileID: 0} - target: {fileID: 8977841923261503225, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.x diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 8bfbe816..fe4701d8 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -8329,6 +8329,26 @@ MonoBehaviour: - Flags: 00000000 Languages_Touch: [] + - Term: title_tapToStart + TermType: 5 + Description: + Languages: + - title_tapToStart + - Material/title/title_tapToStart_zh[title_tapToStart_zh] + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: ui_marketing_ProductManagement_explanation_rare_text + TermType: 5 + Description: + Languages: + - ui_marketing_ProductManagement_explanation_rare_text + - Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_rare_text_zh[ui_marketing_ProductManagement_explanation_rare_text_zh] + - + - + Flags: 00000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 1 mTerm_AppName: