diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 6e82a027..95994d6b 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &20673560 -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 &24537252 GameObject: m_ObjectHideFlags: 0 @@ -327,6 +314,19 @@ 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,6 +405,19 @@ 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 @@ -778,7 +791,7 @@ MonoBehaviour: cullCornRate: 0.9 firstCornLimit: 160 secondCornLimit: 250 ---- !u!114 &295669250 +--- !u!114 &297313211 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -790,7 +803,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 387414348} + mTarget: {fileID: 387414351} --- !u!1 &315104241 GameObject: m_ObjectHideFlags: 0 @@ -1111,6 +1124,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1339603270, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 741f033558955407a8e984177cdaa542, + type: 3} - target: {fileID: 1453424322, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: @@ -1149,6 +1167,18 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + type: 3} + - target: {fileID: 521511634720853184, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 75660155791874c1a90201391c63b5c1, + type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1254,6 +1284,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: 3e8106fd24f7946e2a20ebd081ebb0b9, + type: 3} + - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -1399,6 +1441,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: 0469694e83769479fa737c3a3b9f6b06, + type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.x @@ -1429,6 +1477,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + type: 3} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1454,6 +1508,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4466880344787820340, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f0d95384ae70e49898e6133bbf35d0c0, + type: 3} - target: {fileID: 4852160585447148657, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: onClickPlaySEFilename @@ -1815,7 +1875,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a64b1cc6e08eb5849a45654b25ba55bf, type: 3} + m_Sprite: {fileID: 21300000, guid: 909dbdbc1bab04cd480030ddb03c14a6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2198,6 +2258,19 @@ 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, @@ -2210,19 +2283,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &587442298 -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 &619114158 GameObject: m_ObjectHideFlags: 0 @@ -2289,19 +2349,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &637579180 -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 &640256889 GameObject: m_ObjectHideFlags: 0 @@ -2993,6 +3040,19 @@ 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, @@ -3016,6 +3076,19 @@ 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 @@ -4678,6 +4751,19 @@ 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 @@ -4839,6 +4925,19 @@ 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 @@ -4871,6 +4970,19 @@ 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 @@ -5370,32 +5482,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1677113307 -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!114 &1732535030 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414345} --- !u!1 &1734228464 GameObject: m_ObjectHideFlags: 0 @@ -5564,19 +5650,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1776187204 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414349} --- !u!1 &1792733265 GameObject: m_ObjectHideFlags: 0 @@ -16007,19 +16080,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30 ---- !u!114 &2032518862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 387414344} --- !u!1 &2040636315 GameObject: m_ObjectHideFlags: 0 @@ -16610,19 +16670,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &2130715328 -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!4 &2138129848 stripped Transform: m_CorrespondingSourceObject: {fileID: 47850826084813397, guid: 178fc213f1f0b465daddb592038c9210, @@ -16735,6 +16782,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1507187604136703913, guid: 21599f8e6d1104a07b0b14b49f8c1429, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8ad8575772ae2472ea7e1378ce241fe8, + type: 3} - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} propertyPath: m_Pivot.x diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index 48e4def7..f419cff3 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -196,6 +196,19 @@ 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 @@ -228,6 +241,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4082915277351343690, guid: b8ac6f588d2964e04be0f3469f01b21d, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3a7dcb6c37b1246629fc990bfa98be30, + type: 3} - target: {fileID: 4082915277351343700, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} propertyPath: m_IsActive @@ -395,3 +414,15 @@ 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/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index 8c8fa87b..cfa1e0bb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -787,6 +787,7 @@ GameObject: - component: {fileID: 3658417434568161581} - component: {fileID: 3658417434568161583} - component: {fileID: 3658417434568161580} + - component: {fileID: 2605838321747887477} m_Layer: 5 m_Name: Cooked_bouns m_TagString: Untagged @@ -852,6 +853,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2605838321747887477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3658417434568161586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_Main_BulkOrder_detail_Cooked + 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: 016a4d1058a82e64899a7e1776a6a3e3, 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 &3658417434859902285 GameObject: m_ObjectHideFlags: 0 @@ -1291,7 +1332,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: 1 m_BestFit: 0 @@ -1523,7 +1564,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} + m_Sprite: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1815,7 +1856,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, type: 3} + m_Sprite: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2362,6 +2403,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c82036225f2d453cac3ff9fb07fae4d, type: 3} +--- !u!224 &5676996117682643678 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, + type: 3} + m_PrefabInstance: {fileID: 5112378705130438364} + m_PrefabAsset: {fileID: 0} --- !u!114 &5676996117682643677 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 592905858299255809, guid: 2c82036225f2d453cac3ff9fb07fae4d, @@ -2398,9 +2445,3 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5112378705130438364} m_PrefabAsset: {fileID: 0} ---- !u!224 &5676996117682643678 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 592905858299255810, guid: 2c82036225f2d453cac3ff9fb07fae4d, - type: 3} - m_PrefabInstance: {fileID: 5112378705130438364} - m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 0f48815c..2d6c2380 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -2842,7 +2842,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 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index 773bf525..61f5375f 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: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, 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: "\u3057\u3070\u3089\u304F\u306E\u9593\u8CFC\u5165\u3059\u308B\u304A\u5BA2\u3055\u3093\u304C\n\u5C11\u3057\u5897\u3048\u308B\u3088" + m_Text: "\u53EF\u4EE5\u77ED\u65F6\u95F4\u5185\u589E\u957F\u5BA2\u6D41\u91CF" --- !u!114 &1424299160027476878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -538,6 +538,7 @@ GameObject: - component: {fileID: 2011446731384957262} - component: {fileID: 7492023257525246333} - component: {fileID: 1883006365929839107} + - component: {fileID: 1721548377695355669} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -591,9 +592,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 @@ -601,6 +602,45 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1721548377695355669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025492179711668415} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_button_icon_Tasting_logo + 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: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &4541750384092308576 GameObject: m_ObjectHideFlags: 0 @@ -666,9 +706,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ed8b1627a2d343c43a520c5c0496cf82, type: 3} + m_Sprite: {fileID: 21300000, guid: 31e6fb14761094676b211436f927ef92, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1539,7 +1579,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: eca622205a7dc214384aad3d918584bd, type: 3} + m_Sprite: {fileID: 21300000, guid: 7929c6099b8cb411fb44a6a77ac9834f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1674,6 +1714,7 @@ GameObject: - component: {fileID: 6654190480124523475} - component: {fileID: 1104163593313499312} - component: {fileID: 4534594761780962508} + - component: {fileID: 1047848409904683956} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -1729,7 +1770,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 25e87dbf8c9dca34884b8267401b0a2a, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1737,6 +1778,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1047848409904683956 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9169750603911259639} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_button_icon_Tasting_logo_gray + 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: 25e87dbf8c9dca34884b8267401b0a2a, 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!1001 &3351496265046666703 PrefabInstance: m_ObjectHideFlags: 0 @@ -1939,16 +2020,34 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2705466136904129037, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 2705466136985562315, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 2705466137018817750, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 2705466137083800160, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 2705466137303619764, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 2705466137392089852, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_Layer @@ -2474,11 +2573,35 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6124127957932188848, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, + type: 3} - target: {fileID: 6124127957932188863, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6124127958415964740, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} + - target: {fileID: 6124127958617077932, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 69a7fb681f31948029049f3df46aa576, + type: 3} + - target: {fileID: 6124127958769025434, guid: b24d8537ddbd94882ad379e4b679f044, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, + type: 3} - target: {fileID: 6134734927453340133, guid: b24d8537ddbd94882ad379e4b679f044, type: 3} propertyPath: m_SizeDelta.x diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 70bb5efc..a60a49fd 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -627,7 +627,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5669304b3d9643b489cc2f08d1699160, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -740,9 +740,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} + m_Sprite: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -857,7 +857,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 39d00b01cf9866c449ee01e331f4a52b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1331,9 +1331,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c981e97ae7f318346906c68c0c2dfcc6, type: 3} + m_Sprite: {fileID: 21300000, guid: 69a7fb681f31948029049f3df46aa576, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1656,9 +1656,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} + m_Sprite: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2033,6 +2033,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8175998083605669215, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} --- !u!224 &6124127957488033513 stripped @@ -2462,6 +2468,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8175998083605669215, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} --- !u!114 &7410006873326190942 stripped @@ -3036,6 +3048,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8175998083605669215, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} --- !u!114 &7410006873414403973 stripped @@ -3465,6 +3483,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8175998083605669215, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} --- !u!224 &2705466138491599897 stripped diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index e39acf38..e5e20f8b 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -195,6 +195,19 @@ 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 @@ -215,6 +228,12 @@ PrefabInstance: propertyPath: m_RootOrder value: 12 objectReference: {fileID: 0} + - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -350,6 +369,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: 3e8106fd24f7946e2a20ebd081ebb0b9, + type: 3} + - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -495,6 +526,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: 0469694e83769479fa737c3a3b9f6b06, + type: 3} - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -535,6 +572,12 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x @@ -638,6 +681,66 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &219610915 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + 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 &219610916 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + 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 &219610917 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + 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 &219610918 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + 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 &219610919 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 219610911} + 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 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -1156,6 +1259,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 +--- !u!114 &968184469 +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!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} --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1304,6 +1446,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405932574} m_CullTransparentMesh: 0 +--- !u!114 &1905166163 +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: 219610917} --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1594,6 +1749,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1883006365929839107, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, + type: 3} - target: {fileID: 2118578838188127427, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_AnchorMax.y @@ -1825,6 +1986,12 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 042c53e40617f144dba8c8d8baca3d0d, type: 3} + - target: {fileID: 4560236508152718986, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7929c6099b8cb411fb44a6a77ac9834f, + type: 3} - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_AnchorMax.y @@ -1885,6 +2052,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5979409424124981824, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 31e6fb14761094676b211436f927ef92, + type: 3} - target: {fileID: 6040599672751541160, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_AnchorMax.y @@ -1965,6 +2138,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Text + value: "\u53EF\u4EE5\u77ED\u65F6\u95F4\u5185\u589E\u957F\u5BA2\u6D41\u91CF" + objectReference: {fileID: 0} + - target: {fileID: 6285806631461451457, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 7786810388559140403, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_AnchorMax.y @@ -2005,6 +2189,24 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8826965070428866943, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, + type: 3} + - target: {fileID: 8826965070724525141, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, + type: 3} + - target: {fileID: 8826965070841845091, guid: 0b1e1a744f3d5447d88970ba4f22d761, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 69a7fb681f31948029049f3df46aa576, + type: 3} - target: {fileID: 8908151885642361585, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_SizeDelta.x diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 6b26041f..88a2bf28 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -283,6 +283,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &9971978 +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: 714437468} --- !u!1 &40039601 GameObject: m_ObjectHideFlags: 0 @@ -3006,6 +3019,7 @@ GameObject: m_Component: - component: {fileID: 668553843} - component: {fileID: 668553844} + - component: {fileID: 668553845} m_Layer: 0 m_Name: signboard m_TagString: Untagged @@ -3077,6 +3091,46 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &668553845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668553842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: marketing_cart_closed + 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: 3701e496689e4054d84bdcb34a4b8603, 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: 796602059} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityStandard_SpriteRenderer --- !u!1 &676633148 GameObject: m_ObjectHideFlags: 0 @@ -3672,6 +3726,12 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, + type: 3} - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_fontColor.a @@ -3797,6 +3857,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: 3e8106fd24f7946e2a20ebd081ebb0b9, + type: 3} + - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, + type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchorMax.y @@ -3942,6 +4014,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: 0469694e83769479fa737c3a3b9f6b06, + type: 3} - target: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -3977,6 +4055,12 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, + type: 3} - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_LocalPosition.x @@ -4032,6 +4116,12 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8117515348220274205, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b128a700ffcf24ec29e2a2ce7af50858, + type: 3} - target: {fileID: 8591874021033984247, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -4051,6 +4141,78 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 714437464} m_PrefabAsset: {fileID: 0} +--- !u!114 &714437466 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + 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 &714437467 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + 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 &714437468 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + 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 &714437469 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + 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 &714437470 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + 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 &714437471 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8117515348220274205, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + 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 &716489324 GameObject: m_ObjectHideFlags: 0 @@ -4659,6 +4821,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &796602059 +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: 668553844} --- !u!114 &820175261 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4251265789366133276, guid: caaa748dbeed576499e8cae74d33f689, @@ -5011,6 +5186,19 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &947907946 +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: 714437469} --- !u!1 &966116774 GameObject: m_ObjectHideFlags: 0 @@ -7049,6 +7237,19 @@ Transform: m_Father: {fileID: 443832894} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1368532232 +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: 714437467} --- !u!1 &1384972636 GameObject: m_ObjectHideFlags: 0 @@ -7202,7 +7403,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: 688415c91be28344abb30a8b3354982b, type: 3} + m_Sprite: {fileID: 21300000, guid: f7e63e1fe3182469eaf65d7e512f598e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -13249,7 +13450,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: 52 m_FontStyle: 1 m_BestFit: 0 @@ -13498,6 +13699,19 @@ Transform: m_Father: {fileID: 994450684} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.479} +--- !u!114 &1675220492 +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: 714437471} --- !u!114 &1698628546 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14073,7 +14287,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3} + m_Sprite: {fileID: 21300000, guid: d777942e8381b48d48b282ceb6a85cd6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -19488,6 +19702,19 @@ Transform: m_Father: {fileID: 760797061} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1966513518 +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: 714437470} --- !u!1 &1987982869 GameObject: m_ObjectHideFlags: 0 @@ -19559,7 +19786,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 6 - m_Sprite: {fileID: 21300000, guid: 4717ef924abc849e18f0fa060a7420d3, type: 3} + m_Sprite: {fileID: 21300000, guid: 18091741dfe7f47e28f17bb1a5320de4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -19685,6 +19912,19 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2011193247} m_PrefabAsset: {fileID: 0} +--- !u!114 &2027522116 +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: 714437466} --- !u!1 &2031857953 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 074caa71..e734bac8 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: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: 25e64ef92e8a441ef8f2eaaedf36bc02, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -459,7 +459,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -574,7 +575,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 @@ -766,7 +767,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 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index f166505a..96de5cc3 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &1538055347 -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: 3033445368273631174} --- !u!1001 &3033445368273631173 PrefabInstance: m_ObjectHideFlags: 0 @@ -145,7 +132,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} - target: {fileID: 3033445369676262432, guid: a1b406baf09004616b436c242e3a474f, type: 3} @@ -259,15 +246,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1b406baf09004616b436c242e3a474f, type: 3} ---- !u!114 &3033445368273631174 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3033445368104864265, guid: a1b406baf09004616b436c242e3a474f, - type: 3} - m_PrefabInstance: {fileID: 3033445368273631173} - 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/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index ae4a8145..8bfbe816 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -7373,8 +7373,8 @@ MonoBehaviour: TermType: 5 Description: Languages: - - ui_button_icon_Exchange_logo - - Material/shopping/ui_button_icon_Exchange_logo_zh[ui_button_icon_Exchange_logo_zh] + - ui_button_icon_close_logo + - Material/Main/recipe/ui_button_icon_close_logo_zh[ui_button_icon_close_logo_zh] - - Flags: 00000000 @@ -8299,6 +8299,36 @@ MonoBehaviour: - Flags: 00000000 Languages_Touch: [] + - Term: ui_Main_BulkOrder_detail_Cooked + TermType: 5 + Description: + Languages: + - ui_Main_BulkOrder_detail_Cooked + - Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_zh[ui_Main_BulkOrder_detail_Cooked_zh] + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: ui_button_icon_Tasting_logo_gray + TermType: 5 + Description: + Languages: + - ui_button_icon_Tasting_logo_gray + - Material/marketing/ProductManagement/ui_button_icon_Tasting_logo_gray[ui_button_icon_Tasting_logo_gray] + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: marketing_cart_closed + TermType: 5 + Description: + Languages: + - marketing_cart_closed + - Material/marketing/marketing_cart_closed_zh[marketing_cart_closed_zh] + - + - + Flags: 00000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 1 mTerm_AppName: