diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 55bebb3f..09d2a0fb 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -121,32 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &5838204 -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: 1401507177} ---- !u!114 &16824281 -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: 1709156043} --- !u!1 &24537252 GameObject: m_ObjectHideFlags: 0 @@ -340,18 +314,6 @@ Transform: m_Father: {fileID: 2040636316} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &147614861 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!1 &149181930 GameObject: m_ObjectHideFlags: 0 @@ -417,19 +379,6 @@ Transform: m_Father: {fileID: 1866526865} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &220609990 -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: 1980930080} --- !u!114 &260671573 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1036,11 +985,7 @@ RectTransform: m_Children: - {fileID: 1106859980} m_Father: {fileID: 387414334} -<<<<<<< HEAD m_RootOrder: 11 -======= - m_RootOrder: 10 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1508,11 +1453,6 @@ PrefabInstance: propertyPath: onClickPlaySEFilename value: se_ButtonTap objectReference: {fileID: 0} - - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive @@ -1531,11 +1471,7 @@ PrefabInstance: - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder -<<<<<<< HEAD value: 9 -======= - value: 7 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 objectReference: {fileID: 0} - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1682,22 +1618,6 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 -<<<<<<< HEAD -======= ---- !u!114 &452908902 -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} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &457045027 GameObject: m_ObjectHideFlags: 0 @@ -1754,7 +1674,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 39 - m_Right: 78 + m_Right: 58 m_Top: 4 m_Bottom: 0 m_ChildAlignment: 0 @@ -1798,7 +1718,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3e6395a0cda798a47a6ddcc17370e27a, type: 3} + m_Sprite: {fileID: 21300000, guid: a64b1cc6e08eb5849a45654b25ba55bf, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2437,31 +2357,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &650946944 -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: 651479253} ---- !u!114 &651479253 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!1 &665770084 GameObject: m_ObjectHideFlags: 0 @@ -3444,18 +3339,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &984088744 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!1 &989323255 GameObject: m_ObjectHideFlags: 0 @@ -3849,18 +3732,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 27 ---- !u!114 &1144180163 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!1 &1164585267 GameObject: m_ObjectHideFlags: 0 @@ -4131,19 +4002,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1218410118 -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: 1516974627} --- !u!1001 &1226867710 PrefabInstance: m_ObjectHideFlags: 0 @@ -4504,18 +4362,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!114 &1401507177 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!1 &1406886287 GameObject: m_ObjectHideFlags: 0 @@ -4597,19 +4443,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1447526946 -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: 1144180163} --- !u!1 &1452091997 GameObject: m_ObjectHideFlags: 0 @@ -4765,19 +4598,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 31 ---- !u!114 &1497390460 -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: 984088744} --- !u!1 &1501215305 GameObject: m_ObjectHideFlags: 0 @@ -4896,34 +4716,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 -<<<<<<< HEAD -======= ---- !u!114 &1516974627 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!114 &1537144681 -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: 147614861} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &1537737291 GameObject: m_ObjectHideFlags: 0 @@ -5455,18 +5247,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1657f65ff2fe42ba87efbe278055bb7d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1709156043 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!1 &1734228464 GameObject: m_ObjectHideFlags: 0 @@ -15847,21 +15627,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1958951427} m_PrefabAsset: {fileID: 0} -<<<<<<< HEAD -======= ---- !u!114 &1980930080 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: ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &1989990597 GameObject: m_ObjectHideFlags: 0 @@ -16379,7 +16144,7 @@ PrefabInstance: - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} @@ -16782,12 +16547,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 1507187604136703913, guid: 21599f8e6d1104a07b0b14b49f8c1429, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 33965d17844ba2f4a813cf42bf932db0, - type: 3} - target: {fileID: 1507187604136703914, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3} propertyPath: m_Pivot.x @@ -16957,7 +16716,7 @@ PrefabInstance: - target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04, type: 3} propertyPath: m_RootOrder - value: 12 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1358427949382551085, guid: 307de4ac51c99479a95079dfa3713f04, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab index 1b8699d9..2fd6b04e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab @@ -814,11 +814,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] -<<<<<<< HEAD - m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} -======= m_Sprite: {fileID: 21300000, guid: ff32278fa02ebbe4aab807a618d780f1, type: 3} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1456,7 +1452,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index 244c5fb0..bddf3a37 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -298,7 +298,6 @@ RectTransform: m_Children: - {fileID: 1973484463} - {fileID: 1344990810} - - {fileID: 715728122} m_Father: {fileID: 827436435} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1230,12 +1229,6 @@ RectTransform: m_AnchoredPosition: {x: -155, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &715728122 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - m_PrefabInstance: {fileID: 1682034355685615894} - m_PrefabAsset: {fileID: 0} --- !u!114 &787553450 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2115,7 +2108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 0} + mTarget: {fileID: 1794914336} --- !u!1 &1283939611 GameObject: m_ObjectHideFlags: 0 @@ -2510,13 +2503,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} -<<<<<<< HEAD - m_AnchoredPosition: {x: 131, y: -14} - m_SizeDelta: {x: 250, y: 108} -======= m_AnchoredPosition: {x: 0, y: -14} m_SizeDelta: {x: 300, y: 108} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1344990811 MonoBehaviour: @@ -3827,122 +3815,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1894598663} ---- !u!1001 &1682034355685615894 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 162960811} - m_Modifications: - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_SizeDelta.x - value: 250 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_SizeDelta.y - value: 108 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -151 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -14 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069932, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1682034354971069935, guid: 5f5256670b31e433bb92e5ad53a05298, - type: 3} - propertyPath: m_Name - value: SettingPopViewButton - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5f5256670b31e433bb92e5ad53a05298, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index 8d466da4..674bee2f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -698,15 +698,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3ad134b74850c4ce4b72ff15afadfabd, type: 3} -<<<<<<< HEAD -======= --- !u!212 &293313977 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} m_PrefabInstance: {fileID: 6725113439449511083} m_PrefabAsset: {fileID: 0} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &319475418 GameObject: m_ObjectHideFlags: 0 @@ -2394,7 +2391,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 695678466} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: @@ -2413,7 +2410,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 1b1f56cd08f942645b331422171b2269, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2438,8 +2436,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD -======= mTarget: {fileID: 227427383} --- !u!114 &776291670 MonoBehaviour: @@ -2453,7 +2449,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 mTarget: {fileID: 527833883} --- !u!1001 &811473976 PrefabInstance: @@ -3806,8 +3801,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 956104263} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image -<<<<<<< HEAD -======= --- !u!114 &1153839208 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3834,7 +3827,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 336991183} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -4903,8 +4895,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895333847} m_CullTransparentMesh: 0 -<<<<<<< HEAD -======= --- !u!114 &1970854444 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4918,7 +4908,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 811473978} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!114 &2014261845 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 6fd34046..d67b58b1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -121,22 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} -<<<<<<< HEAD ---- !u!114 &3564198 -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: 2701980939299648208} -======= ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &189791791 GameObject: m_ObjectHideFlags: 0 @@ -684,11 +668,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 -<<<<<<< HEAD ---- !u!114 &388701216 -======= --- !u!114 &313910592 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -700,13 +680,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD - mTarget: {fileID: 2701980939299648207} ---- !u!114 &425791625 -======= mTarget: {fileID: 429638430} --- !u!114 &357254126 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -718,11 +693,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD - mTarget: {fileID: 2701980939299648210} -======= mTarget: {fileID: 1446845735} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!114 &429638430 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689, @@ -735,19 +706,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &464824602 -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: 1446845735} --- !u!114 &483734264 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4136975465723208433, guid: 0b1e1a744f3d5447d88970ba4f22d761, @@ -1192,19 +1150,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 748884348} m_CullTransparentMesh: 0 ---- !u!114 &795018802 -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: 429638430} --- !u!1 &935850165 GameObject: m_ObjectHideFlags: 0 @@ -1279,36 +1224,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935850165} m_CullTransparentMesh: 0 -<<<<<<< HEAD ---- !u!114 &1139655502 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 &1208667148 -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: 2701980939299648212} ---- !u!114 &1211869808 -======= --- !u!114 &1005979436 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1321,36 +1237,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1760930532} -<<<<<<< HEAD ---- !u!114 &1243354799 -======= --- !u!114 &1139655502 stripped ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + 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: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 2701980939299648215} ---- !u!114 &1264087945 -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: 2701980939299648214} --- !u!1 &1322368921 GameObject: m_ObjectHideFlags: 0 @@ -1425,22 +1323,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322368921} m_CullTransparentMesh: 0 -<<<<<<< HEAD ---- !u!114 &1395616245 -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: 2701980939299648206} -======= ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!1 &1405932574 GameObject: m_ObjectHideFlags: 0 @@ -1552,25 +1434,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD ---- !u!114 &1654834765 -======= --- !u!114 &1539992273 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 -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: -<<<<<<< HEAD - mTarget: {fileID: 1513025054} ---- !u!114 &1687162695 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1583,22 +1447,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1139655502} ---- !u!114 &1724250472 -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} -======= - mTarget: {fileID: 1139655502} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 --- !u!114 &1760930532 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, @@ -1611,19 +1459,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1924194386 -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: 2701980939299648216} --- !u!1 &1941251214 GameObject: m_ObjectHideFlags: 0 @@ -1707,58 +1542,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1947232547 -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: 2701980939299648217} ---- !u!114 &1952784028 -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: 2701980939299648209} ---- !u!114 &2014300460 -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: 2701980939299648211} ---- !u!114 &2142233585 -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: 2701980939299648213} --- !u!1001 &2701980939299648204 PrefabInstance: m_ObjectHideFlags: 0 @@ -2519,159 +2302,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} ---- !u!114 &2701980939299648205 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4560236508152718986, 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: 6285806631461451457, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2701980939299648207 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 &2701980939299648208 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: ---- !u!114 &2701980939299648209 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5979409424124981824, 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 &2701980939299648210 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8826965070428866943, 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 &2701980939299648211 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 795262495608747387, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2701980939299648212 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 795262494787334425, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2701980939299648213 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 795262494940821442, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2701980939299648214 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8826965070908774283, 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: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2701980939299648215 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8826965070472475005, 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 &2701980939299648216 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8826965070724525141, 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 &2701980939299648217 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8826965070414205926, 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/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index a4cf34da..b2d9ec1a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -452,7 +452,7 @@ PrefabInstance: - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -879,11 +879,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 66e94660ac6f7de41a7a5c8fbe58fce6, type: 3} - - target: {fileID: 583619684917774370, guid: 667a93fb2929943078b944050cddd464, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 788033435718677201, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_AnchorMax.x @@ -1364,28 +1359,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 84efab5b8d1b5274cb7510ddcb5b2187, type: 3} -<<<<<<< HEAD - - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 6776479234151870121, guid: 667a93fb2929943078b944050cddd464, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} -======= - target: {fileID: 6758377365589220451, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite @@ -1422,7 +1395,6 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 - target: {fileID: 7296979764273611571, guid: 667a93fb2929943078b944050cddd464, type: 3} propertyPath: m_Sprite diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index dc8c1fc8..7d827603 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -69,12 +69,8 @@ MonoBehaviour: - Material_zh/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - Material_zh/marketing/marketing_background_Signboard_EarlyType_zh[marketing_background_Signboard_EarlyType_zh] - Material_ko/marketing/marketing_background_Signboard_EarlyType_ko[marketing_background_Signboard_EarlyType_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/marketing_background_Signboard_EarlyType_en[marketing_background_Signboard_EarlyType_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: marketing_background_Signboard_Second TermType: 5 @@ -84,12 +80,8 @@ MonoBehaviour: - Material_zh/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - Material_zh/marketing/marketing_background_Signboard_Second_zh[marketing_background_Signboard_Second_zh] - Material_ko/marketing/marketing_background_Signboard_Second_ko[marketing_background_Signboard_Second_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/marketing_background_Signboard_Second_en[marketing_background_Signboard_Second_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: marketing_background_Signboard_Tasting TermType: 5 @@ -143,12 +135,8 @@ MonoBehaviour: - Material_zh/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - Material_zh/marketing/marketing_cart_logo_Second_zh_Dither[marketing_cart_logo_Second_zh_Dither] - Material_ko/marketing/marketing_cart_logo_Second_ko_Dither[marketing_cart_logo_Second_ko_Dither] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/marketing_cart_logo_Second_en_Dither[marketing_cart_logo_Second_en_Dither] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: shopping_background_title_logo TermType: 5 @@ -645,16 +633,6 @@ MonoBehaviour: - Material_en/marketing/Customize/ui_button_icon_Customize_completion_logo_en[ui_button_icon_Customize_completion_logo_en] Flags: 0000000000 Languages_Touch: [] - - Term: ui_button_icon_Customize_completion_logo - TermType: 0 - Description: - Languages: - - ui_button_icon_Customize_completion_logo - - Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh[ui_button_icon_Customize_completion_logo_zh] - - Material_zh/marketing/Customize/ui_button_icon_Customize_completion_logo_zh[ui_button_icon_Customize_completion_logo_zh] - - Material_ko/marketing/Customize/ui_button_icon_Customize_completion_logo_ko[ui_button_icon_Customize_completion_logo_ko] - Flags: 00000000 - Languages_Touch: [] - Term: ui_button_icon_DoNot_logo TermType: 5 Description: @@ -1246,12 +1224,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_CustomizationDetails_title_text_zh[ui_marketing_CustomizationDetails_title_text_zh] - Material_zh/marketing/Customize/ui_marketing_CustomizationDetails_title_text_zh[ui_marketing_CustomizationDetails_title_text_zh] - Material_ko/marketing/Customize/ui_marketing_CustomizationDetails_title_text_ko[ui_marketing_CustomizationDetails_title_text_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_CustomizationDetails_title_text_en[ui_marketing_CustomizationDetails_title_text_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_cart TermType: 5 @@ -1261,12 +1235,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_cart_zh[ui_marketing_Customize_button_icon_cart_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_cart_zh[ui_marketing_Customize_button_icon_cart_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_cart_ko[ui_marketing_Customize_button_icon_cart_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_button_icon_cart_en[ui_marketing_Customize_button_icon_cart_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_decoration_a TermType: 5 @@ -1276,12 +1246,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_zh[ui_marketing_Customize_button_icon_decoration_a_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_zh[ui_marketing_Customize_button_icon_decoration_a_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_ko[ui_marketing_Customize_button_icon_decoration_a_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_a_en[ui_marketing_Customize_button_icon_decoration_a_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_decoration_b TermType: 5 @@ -1291,12 +1257,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_zh[ui_marketing_Customize_button_icon_decoration_b_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_zh[ui_marketing_Customize_button_icon_decoration_b_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_ko[ui_marketing_Customize_button_icon_decoration_b_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_button_icon_decoration_b_en[ui_marketing_Customize_button_icon_decoration_b_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_signboard TermType: 5 @@ -1306,12 +1268,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_signboard_zh[ui_marketing_Customize_button_icon_signboard_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_signboard_zh[ui_marketing_Customize_button_icon_signboard_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_signboard_ko[ui_marketing_Customize_button_icon_signboard_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_button_icon_signboard_en[ui_marketing_Customize_button_icon_signboard_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_button_icon_stock TermType: 5 @@ -1321,12 +1279,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_stock_zh[ui_marketing_Customize_button_icon_stock_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_button_icon_stock_zh[ui_marketing_Customize_button_icon_stock_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_button_icon_stock_ko[ui_marketing_Customize_button_icon_stock_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_button_icon_stock_en[ui_marketing_Customize_button_icon_stock_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_explanation_text_Dither TermType: 5 @@ -1336,12 +1290,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_text_zh_Dither[ui_marketing_Customize_explanation_text_zh_Dither] - Material_ko/marketing/Customize/ui_marketing_Customize_explanation_text_ko_Dither[ui_marketing_Customize_explanation_text_ko_Dither] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_explanation_text_en_Dither[ui_marketing_Customize_explanation_text_en_Dither] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_explanation_title TermType: 5 @@ -1351,12 +1301,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_explanation_title_zh[ui_marketing_Customize_explanation_title_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_explanation_title_ko[ui_marketing_Customize_explanation_title_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_explanation_title_en[ui_marketing_Customize_explanation_title_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_a TermType: 5 @@ -1366,12 +1312,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_zh[ui_marketing_Customize_icon_decoration2_a_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_ko[ui_marketing_Customize_icon_decoration2_a_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_a_en[ui_marketing_Customize_icon_decoration2_a_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_b TermType: 5 @@ -1381,12 +1323,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_zh[ui_marketing_Customize_icon_decoration2_b_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_ko[ui_marketing_Customize_icon_decoration2_b_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_b_en[ui_marketing_Customize_icon_decoration2_b_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_icon_decoration2_c TermType: 5 @@ -1396,12 +1334,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_zh[ui_marketing_Customize_icon_decoration2_c_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_ko[ui_marketing_Customize_icon_decoration2_c_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_decoration2_c_en[ui_marketing_Customize_icon_decoration2_c_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_a TermType: 5 @@ -1411,12 +1345,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_zh[ui_marketing_Customize_icon_signboard_a_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_ko[ui_marketing_Customize_icon_signboard_a_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_a_en[ui_marketing_Customize_icon_signboard_a_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_b TermType: 5 @@ -1426,12 +1356,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_zh[ui_marketing_Customize_icon_signboard_b_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_ko[ui_marketing_Customize_icon_signboard_b_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_b_en[ui_marketing_Customize_icon_signboard_b_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_icon_signboard_c TermType: 5 @@ -1441,12 +1367,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - Material_zh/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_zh[ui_marketing_Customize_icon_signboard_c_zh] - Material_ko/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_ko[ui_marketing_Customize_icon_signboard_c_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/icon/ui_marketing_Customize_icon_signboard_c_en[ui_marketing_Customize_icon_signboard_c_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_text_InPlace TermType: 5 @@ -1456,12 +1378,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_text_InPlace_zh[ui_marketing_Customize_text_InPlace_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_text_InPlace_zh[ui_marketing_Customize_text_InPlace_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_text_InPlace_ko[ui_marketing_Customize_text_InPlace_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_text_InPlace_en[ui_marketing_Customize_text_InPlace_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_text_release TermType: 5 @@ -1471,12 +1389,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_text_release_zh[ui_marketing_Customize_text_release_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_text_release_zh[ui_marketing_Customize_text_release_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_text_release_ko[ui_marketing_Customize_text_release_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_text_release_en[ui_marketing_Customize_text_release_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_Customize_title TermType: 5 @@ -1486,12 +1400,8 @@ MonoBehaviour: - Material_zh/marketing/Customize/ui_marketing_Customize_title_zh[ui_marketing_Customize_title_zh] - Material_zh/marketing/Customize/ui_marketing_Customize_title_zh[ui_marketing_Customize_title_zh] - Material_ko/marketing/Customize/ui_marketing_Customize_title_ko[ui_marketing_Customize_title_ko] -<<<<<<< HEAD - Flags: 00000000 -======= - Material_en/marketing/Customize/ui_marketing_Customize_title_en[ui_marketing_Customize_title_en] Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: ui_marketing_ProductManagement_Tasting_text TermType: 5 @@ -1658,16 +1568,6 @@ MonoBehaviour: - Material_en/UI/ui_tutorial_FryingPanExplanation_en_Dither[ui_tutorial_FryingPanExplanation_en_Dither] Flags: 0000000000 Languages_Touch: [] - - Term: ']' - TermType: 5 - Description: - Languages: - - - - - - - - - Flags: 00000000 - Languages_Touch: [] - Term: Unit/Amount TermType: 0 Description: @@ -1709,12 +1609,8 @@ MonoBehaviour: - "\u5BA3\u4F20\u6548\u679C\u589E\u52A0" - "\u5BA3\u50B3\u6548\u679C\u589E\u52A0" - "\uD64D\uBCF4 \uD6A8\uACFC up" -<<<<<<< HEAD - Flags: 00000000 -======= - Increased advertising effectiveness Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: UI/AutoCookButton TermType: 0 @@ -1906,12 +1802,8 @@ MonoBehaviour: - "\u83B7\u5BA2\u91CF\u589E\u52A0" - "\u7372\u5BA2\u91CF\u589E\u52A0" - "\uACE0\uAC1D\uC218 \uC99D\uAC00" -<<<<<<< HEAD - Flags: 00000000 -======= - Increase the number of customers Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: UI/EarnPopcorns TermType: 0 @@ -1932,12 +1824,8 @@ MonoBehaviour: - "\u81EA\u52A8\u70F9\u996A\u7B49\u7EA7" - "\u81EA\u52D5\u70F9\u98EA\u7B49\u7D1A" - "\uC790\uB3D9\uC870\uB9AC \uB808\uBCA8" -<<<<<<< HEAD - Flags: 00000000 -======= - Automatic cooking level Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: UI/InfoCume TermType: 0 @@ -1991,12 +1879,8 @@ MonoBehaviour: - "\u7B49\u7EA7" - "\u7B49\u7D1A" - "\uB808\uBCA8" -<<<<<<< HEAD - Flags: 00000000 -======= - level Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: UI/InfoMaterialInventory TermType: 0 @@ -2061,12 +1945,8 @@ MonoBehaviour: - "\u5916\u89C2\u7B49\u7EA7" - "\u5916\u89C0\u7B49\u7D1A" - "\uC678\uAD00 \uB808\uBCA8" -<<<<<<< HEAD - Flags: 00000000 -======= - Appearance level Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: UI/InfoShopHistory TermType: 0 @@ -2268,12 +2148,8 @@ MonoBehaviour: - "\u552E\u4EF7\u5956\u52B1" - "\u552E\u50F9\u734E\u52F5" - "\uD310\uB9E4\uAC00 \uBCF4\uB108\uC2A4" -<<<<<<< HEAD - Flags: 00000000 -======= - Selling price bonus Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: UI/ShoppingExchangeItem TermType: 0 @@ -6852,12 +6728,8 @@ MonoBehaviour: - "\u5728\u7530\u5730\u91CC\u65BD\u80A5\u5427" - "\u5728\u7530\u5730\u88CF\u65BD\u80A5\u5427" - "\uBC2D\uC5D0 \uBE44\uB8CC\uB97C \uC0AC\uC6A9\uD574\uC694" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's use fertilizer in the field Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0341 TermType: 0 @@ -6867,12 +6739,8 @@ MonoBehaviour: - "\u8FDB\u884C\u9500\u552E\u5BA3\u4F20\u5427" - "\u9032\u884C\u92B7\u552E\u6587\u5BA3\u5427" - "\uD310\uB9E4 \uD64D\uBCF4\uB97C \uD574\uC694" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's advertise on sale Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0342 TermType: 0 @@ -6882,12 +6750,8 @@ MonoBehaviour: - "\u4F7F\u7528\u81EA\u52A8\u70F9\u996A\u5427" - "\u4F7F\u7528\u81EA\u52D5\u70F9\u98EA\u5427" - "\uC790\uB3D9\uC870\uB9AC\uB97C \uC0AC\uC6A9\uD574\uC694" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's use automatic cooking Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0343 TermType: 0 @@ -6897,12 +6761,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.1" - "\u89C0\u770B\u52D5\u756B\u5427Lv.1" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.1" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.1 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0344 TermType: 0 @@ -6912,12 +6772,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.2" - "\u89C0\u770B\u52D5\u756B\u5427Lv.2" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.2" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.2 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0345 TermType: 0 @@ -6927,12 +6783,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.3" - "\u89C0\u770B\u52D5\u756B\u5427Lv.3" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.3" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.3 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0346 TermType: 0 @@ -6942,12 +6794,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.4" - "\u89C0\u770B\u52D5\u756B\u5427Lv.4" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.4" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.4 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0347 TermType: 0 @@ -6957,12 +6805,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.5" - "\u89C0\u770B\u52D5\u756B\u5427Lv.5" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.5" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.5 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0348 TermType: 0 @@ -6972,12 +6816,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.6" - "\u89C0\u770B\u52D5\u756B\u5427Lv.6" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.6" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.6 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0349 TermType: 0 @@ -6987,12 +6827,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.7" - "\u89C0\u770B\u52D5\u756B\u5427Lv.7" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.7" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.7 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0350 TermType: 0 @@ -7002,12 +6838,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.8" - "\u89C0\u770B\u52D5\u756B\u5427Lv.8" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.8" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.8 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0351 TermType: 0 @@ -7017,12 +6849,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.9" - "\u89C0\u770B\u52D5\u756B\u5427Lv.9" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.9" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.9 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0352 TermType: 0 @@ -7032,12 +6860,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.10" - "\u89C0\u770B\u52D5\u756B\u5427Lv.10" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.10" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.10 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0353 TermType: 0 @@ -7047,12 +6871,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.11" - "\u89C0\u770B\u52D5\u756B\u5427Lv.11" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.11" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.11 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0354 TermType: 0 @@ -7062,12 +6882,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.12" - "\u89C0\u770B\u52D5\u756B\u5427Lv.12" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.12" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.12 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0355 TermType: 0 @@ -7077,12 +6893,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.13" - "\u89C0\u770B\u52D5\u756B\u5427Lv.13" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.13" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.13 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0356 TermType: 0 @@ -7092,12 +6904,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.14" - "\u89C0\u770B\u52D5\u756B\u5427Lv.14" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.14" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.14 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0357 TermType: 0 @@ -7107,12 +6915,8 @@ MonoBehaviour: - "\u89C2\u770B\u52A8\u753B\u5427Lv.15" - "\u89C0\u770B\u52D5\u756B\u5427Lv.15" - "\uB3D9\uC601\uC0C1\uC744 \uC2DC\uCCAD\uD574\uC694Lv.15" -<<<<<<< HEAD - Flags: 00000000 -======= - Let's watch the video Lv.15 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0358 TermType: 0 @@ -7123,12 +6927,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.1" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.1" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.1" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.1 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0359 TermType: 0 @@ -7139,12 +6939,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.2" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.2" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.2" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.2 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0360 TermType: 0 @@ -7155,12 +6951,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.3" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.3" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.3" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.3 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0361 TermType: 0 @@ -7171,12 +6963,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.4" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.4" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.4" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.4 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0362 TermType: 0 @@ -7187,12 +6975,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.5" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.5" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.5" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.5 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0363 TermType: 0 @@ -7203,12 +6987,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.6" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.6" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.6" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.6 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0364 TermType: 0 @@ -7219,12 +6999,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.7" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.7" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.7" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.7 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0365 TermType: 0 @@ -7235,12 +7011,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.8" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.8" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.8" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.8 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0366 TermType: 0 @@ -7251,12 +7023,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.9" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.9" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.9" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.9 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0367 TermType: 0 @@ -7267,12 +7035,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.10" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.10" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.10" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.10 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0368 TermType: 0 @@ -7283,12 +7047,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.11" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.11" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.11" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.11 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0369 TermType: 0 @@ -7299,12 +7059,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.12" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.12" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.12" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.12 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0370 TermType: 0 @@ -7315,12 +7071,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.13" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.13" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.13" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.13 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0371 TermType: 0 @@ -7331,12 +7083,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.14" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.14" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.14" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.14 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Mission/MissionText0372 TermType: 0 @@ -7347,12 +7095,8 @@ MonoBehaviour: - "\u8BA9VIP\u5BA2\u6237\u6765\u8D2D\u4E70\u5427 Lv.15" - "\u8B93VIP\u5BA2\u6236\u4F86\u8CFC\u8CB7\u5427 Lv.15" - "VIP \uACE0\uAC1D\uC774 \uAD6C\uB9E4\uD558\uB3C4\uB85D \uD574\uC694Lv.15" -<<<<<<< HEAD - Flags: 00000000 -======= - Let VIP customers buy it Lv.15 Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Script/BrotherScript10001 TermType: 0 @@ -12702,12 +12446,8 @@ MonoBehaviour: - "\u521D\u59CB\u5E7F\u544A\u724C" - "\u521D\u59CB\u5EE3\u544A\u724C" - "\uCD5C\uCD08\uC758 \uAC04\uD310" -<<<<<<< HEAD - Flags: 00000000 -======= - First sign Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0002 TermType: 0 @@ -12717,12 +12457,8 @@ MonoBehaviour: - "\u521D\u59CB\u88C5\u9970" - "\u521D\u59CB\u88DD\u98FE" - "\uCD5C\uCD08\uC758 \uC7A5\uC2DD" -<<<<<<< HEAD - Flags: 00000000 -======= - First decoration Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0003 TermType: 0 @@ -12732,12 +12468,8 @@ MonoBehaviour: - "\u521D\u59CB\u63A8\u8F66" - "\u521D\u59CB\u63A8\u8ECA" - "\uCD5C\uCD08\uC758 \uCE74\uD130" -<<<<<<< HEAD - Flags: 00000000 -======= - First cart Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0004 TermType: 0 @@ -12747,12 +12479,8 @@ MonoBehaviour: - "\u521D\u59CB\u5BB9\u5668" - "\u521D\u59CB\u5BB9\u5668" - "\uCD5C\uCD08\uC758 \uC6A9\uAE30" -<<<<<<< HEAD - Flags: 00000000 -======= - First container Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0005 TermType: 0 @@ -12762,12 +12490,8 @@ MonoBehaviour: - "\u521D\u59CB\u7ACB\u5F0F\u5E7F\u544A\u724C" - "\u521D\u59CB\u7ACB\u5F0F\u5EE3\u544A\u724C" - "\uCD5C\uCD08\uC758 \uC785\uC2DD \uAD11\uACE0\uD310" -<<<<<<< HEAD - Flags: 00000000 -======= - First signboard Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0006 TermType: 0 @@ -12777,12 +12501,8 @@ MonoBehaviour: - "\u516C\u56ED" - "\u516C\u5712" - "\uACF5\uC6D0" -<<<<<<< HEAD - Flags: 00000000 -======= - park Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0007 TermType: 0 @@ -12792,12 +12512,8 @@ MonoBehaviour: - "\u6728\u8D28\u5E7F\u544A\u724C" - "\u6728\u8CEA\u5EE3\u544A\u724C" - "\uB098\uBB34\uC7AC\uC9C8 \uAD11\uACE0\uD310" -<<<<<<< HEAD - Flags: 00000000 -======= - Wooden sign Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0008 TermType: 0 @@ -12807,12 +12523,8 @@ MonoBehaviour: - "\u6A59\u8272\u65D7\u5E1C" - "\u6A59\u8272\u65D7\u5E5F" - "\uC624\uB80C\uC9C0\uC0C9 \uBC30\uB108" -<<<<<<< HEAD - Flags: 00000000 -======= - Orange flag Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0009 TermType: 0 @@ -12822,12 +12534,8 @@ MonoBehaviour: - "\u84DD\u8272\u63A8\u8F66" - "\u85CD\u8272\u63A8\u8ECA" - "\uBE14\uB8E8\uCE7C\uB77C \uCE74\uD130" -<<<<<<< HEAD - Flags: 00000000 -======= - Blue cart Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0010 TermType: 0 @@ -12837,12 +12545,8 @@ MonoBehaviour: - "\u84DD\u8272\u5BB9\u5668" - "\u85CD\u8272\u5BB9\u5668" - "\uBE14\uB8E8\uCE7C\uB77C \uC6A9\uAE30" -<<<<<<< HEAD - Flags: 00000000 -======= - Blue container Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0011 TermType: 0 @@ -12852,12 +12556,8 @@ MonoBehaviour: - "\u5C0F\u6811\u679D\u5E7F\u544A\u724C" - "\u5C0F\u6A39\u679D\u5EE3\u544A\u724C" - "\uB098\uBB47\uAC00\uC9C0 \uAD11\uACE0\uD310 " -<<<<<<< HEAD - Flags: 00000000 -======= - Branch sign Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0012 TermType: 0 @@ -12867,12 +12567,8 @@ MonoBehaviour: - "\u6734\u7D20\u7684\u5E7F\u544A\u724C" - "\u6A38\u7D20\u7684\u5EE3\u544A\u724C" - "\uC2EC\uD50C\uD55C \uAD11\uACE0\uD310" -<<<<<<< HEAD - Flags: 00000000 -======= - Simple sign Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0013 TermType: 0 @@ -12882,12 +12578,8 @@ MonoBehaviour: - "\u9EC4\u8272\u906E\u9633\u4F1E" - "\u9EC3\u8272\u906E\u967D\u5098" - "\uB178\uB791\uC0C9 \uD30C\uB77C\uC194" -<<<<<<< HEAD - Flags: 00000000 -======= - Yellow umbrella Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0014 TermType: 0 @@ -12897,12 +12589,8 @@ MonoBehaviour: - "\u7C89\u8272\u63A8\u8F66" - "\u7C89\u8272\u63A8\u8ECA" - "\uD551\uD06C\uC0C9 \uCE74\uD130" -<<<<<<< HEAD - Flags: 00000000 -======= - Pink cart Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0015 TermType: 0 @@ -12912,12 +12600,8 @@ MonoBehaviour: - "\u7C89\u8272\u5BB9\u5668" - "\u7C89\u8272\u5BB9\u5668" - "\uD551\uD06C\uC0C9 \uC6A9\uAE30" -<<<<<<< HEAD - Flags: 00000000 -======= - Pink container Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeName0016 TermType: 0 @@ -12927,12 +12611,8 @@ MonoBehaviour: - "\u5C0F\u82B1\u5E7F\u544A\u724C" - "\u5C0F\u82B1\u5EE3\u544A\u724C" - "\uC791\uC740 \uAF43 \uAD11\uACE0\uD310" -<<<<<<< HEAD - Flags: 00000000 -======= - Flower stand sign Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0001 TermType: 0 @@ -12946,15 +12626,11 @@ MonoBehaviour: - "\uD770\uC0C9\uC73C\uB85C \uCE60\uD55C \uBAA9\uD310\uC73C\uB85C \uC81C\uC791\uD55C \uC2EC\uD50C\uD55C \uAC04\uD310 \uB85C\uACE0\uB294 \uBCD1\uC544\uB9AC \uD615\uC81C\uAC00 \uC815\uC131\uC744 \uB2E4\uD574 \uB514\uC790\uC778\uD55C \uAC83\uC785\uB2C8\uB2E4." -<<<<<<< HEAD - Flags: 00000000 -======= - 'A simple signboard made of white painted wooden boards The logo is a whole body design that my brothers thought about. ' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0002 TermType: 0 @@ -12966,15 +12642,11 @@ MonoBehaviour: - "\uC544\uC774\uB4E4\uC774 \uB3D9\uACBD\uD558\uB294 \uCEEC\uB7EC\uD480\uD55C \uD48D\uC120 \uC7A5\uC2DD \n\uC870\uC6A9\uD788 \uBD09\uC0AC\uD558\uAE30 \uC704\uD574 \uB9CC\uB2E8\uC758 \uC900\uBE44\uB97C \uD588\uC2B5\uB2C8\uB2E4." -<<<<<<< HEAD - Flags: 00000000 -======= - 'Colorful balloon decorations that children long for All the spares are ready for secret service. ' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0003 TermType: 0 @@ -12986,15 +12658,11 @@ MonoBehaviour: - "\uB9E4\uC7A5\uC744 \uC2DC\uC791\uD560\uB54C \uAD6C\uC785\uD55C \uC911\uACE0 \uCE74\uD2B8\uC785\uB2C8\uB2E4.\n\uD615\uC81C\uAC00 \uD568\uAED8 \uC190\uC9C8\uD55C \uC9C0\uBD95\uC740 \uB450 \uC0AC\uB78C\uC774 \uC88B\uC544\uD558\uB294 \uC2A4\uD0C0\uC77C\uC785\uB2C8\uB2E4. " -<<<<<<< HEAD - Flags: 00000000 -======= - 'Used sales carts purchased when opening a store The roof repaired by the brothers is their favorite ' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0004 TermType: 0 @@ -13006,15 +12674,11 @@ MonoBehaviour: - "\uB098\uBB34\uB85C \uB9CC\uB4E0 \uC2EC\uD50C\uD55C \uD31D\uCF58 \uADF8\uB987 \n\uC720\uB9AC \uB108\uBA38\uB85C \uC7AC\uACE0\uB7C9\uC744 \uC54C \uC218 \uC788\uC2B5\uB2C8\uB2E4" -<<<<<<< HEAD - Flags: 00000000 -======= - 'A simple wooden popcorn container You can see the amount of stock through the glass. ' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0005 TermType: 0 @@ -13026,15 +12690,11 @@ MonoBehaviour: - "\uD45C\uBA74\uC774 \uCE60\uD310\uC73C\uB85C \uB418\uC5B4 \uC788\uB294 \uC6D0\uBAA9 \uC218\uC9C1 \uAD11\uACE0\uD310 \n\uC0BD\uD654\uC640 \uBB38\uC790\uB294 \uD615\uC81C\uC758 \uC791\uD488\uC785\uB2C8\uB2E4." -<<<<<<< HEAD - Flags: 00000000 -======= - 'A wooden sign with a blackboard on the surface Illustrations and letters were drawn by brothers ' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0006 TermType: 0 @@ -13044,12 +12704,8 @@ MonoBehaviour: - "\u8001\u516C\u56ED" - "\u8001\u516C\u5712" - "\uC61B\uACF5\uC6D0" -<<<<<<< HEAD - Flags: 00000000 -======= - The usual park Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0007 TermType: 0 @@ -13062,9 +12718,6 @@ MonoBehaviour: \uAC04\uD310\uC785\uB2C8\uB2E4. \n\uB85C\uACE0\uB294 \uD615\uC81C\uAC00 \uB9C8\uC74C\uC744 \uB2F4\uC544 \uB514\uC790\uC778 \uD55C \uAC83\uC785\uB2C8\uB2E4. \n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +15" -<<<<<<< HEAD - Flags: 00000000 -======= - 'Natural signboard with oval wooden board The logo is a whole body @@ -13072,7 +12725,6 @@ MonoBehaviour: Appearance +15 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0008 TermType: 0 @@ -13085,9 +12737,6 @@ MonoBehaviour: \n\uD328\uD0A4\uC9C0\uC758 \uD30C\uB780\uC0C9\uC740 \uC138\uB828\uB41C \uC8FC\uD669\uC0C9\uC744 \uB3CB\uBCF4\uC774\uAC8C \uD569\uB2C8\uB2E4. \n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +20" -<<<<<<< HEAD - Flags: 00000000 -======= - 'A big flag with popcorn on it Discerning orange that the blue of @@ -13095,7 +12744,6 @@ MonoBehaviour: Appearance +20 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0009 TermType: 0 @@ -13107,9 +12755,6 @@ MonoBehaviour: - "\uC0C1\uD07C\uD55C \uD30C\uB780\uC0C9 \uCE74\uD2B8\uC785\uB2C8\uB2E4. \n\uC0C1\uD488 \uD328\uD0A4\uC9C0\uC640 \uC5B4\uC6B8\uB9AC\uB294 \uC2A4\uD2B8\uB77C\uC774\uD504 \uBB34\uB2AC\uC785\uB2C8\uB2E4.\n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +30 " -<<<<<<< HEAD - Flags: 00000000 -======= - 'A refreshing blue sales cart Striped pattern matching the product @@ -13117,7 +12762,6 @@ MonoBehaviour: Appearance +30 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0010 TermType: 0 @@ -13129,9 +12773,6 @@ MonoBehaviour: - "\uC0C1\uD07C\uD55C \uD30C\uB780\uC0C9 \uD31D\uCF58 \uADF8\uB987\uC785\uB2C8\uB2E4. \n\uC720\uB9AC \uB108\uBA38\uB85C \uC7AC\uACE0\uB7C9\uC744 \uC54C \uC218 \uC788\uC2B5\uB2C8\uB2E4. \n\uAD6C\uB9E4 \uC678\uAD00+25" -<<<<<<< HEAD - Flags: 00000000 -======= - 'A refreshing blue popcorn container You can see the amount of inventory @@ -13139,7 +12780,6 @@ MonoBehaviour: Appearance +25 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0011 TermType: 0 @@ -13152,9 +12792,6 @@ MonoBehaviour: \uC785\uC2DD \uAD11\uACE0\uD310\uC785\uB2C8\uB2E4. \n\uB3D9\uC0DD\uC740 \uD55C\uAC00\uD560 \uB54C \uB099\uC11C\uB97C \uC990\uAE30\uB294 \uAC83 \uAC19\uC2B5\uB2C8\uB2E4. \n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +15" -<<<<<<< HEAD - Flags: 00000000 -======= - 'Natural signboard using tree branches My brother seems to enjoy @@ -13162,7 +12799,6 @@ MonoBehaviour: Appearance +15 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0012 TermType: 0 @@ -13175,9 +12811,6 @@ MonoBehaviour: \n\uB85C\uACE0\uB294 \uD615\uC81C\uB4E4\uC774 \uB9C8\uC74C\uC744 \uB2F4\uC544 \uB514\uC790\uC778 \uD55C \uAC83\uC785\uB2C8\uB2E4. \n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +35" -<<<<<<< HEAD - Flags: 00000000 -======= - 'A simple sign cut out along the logo The logo is a whole body design @@ -13185,7 +12818,6 @@ MonoBehaviour: Appearance +35 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0013 TermType: 0 @@ -13198,9 +12830,6 @@ MonoBehaviour: \n\uAF2D\uB300\uAE30\uC758 \uD31D\uCF58 \uB514\uC790\uC778\uC774 \uD615\uC81C\uB4E4\uC758 \uB9C8\uC74C\uC5D0 \uB4ED\uB2C8\uB2E4.\n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +45" -<<<<<<< HEAD - Flags: 00000000 -======= - 'Large yellow and white umbrellas Top popcorn is my brother''s favorite @@ -13208,7 +12837,6 @@ MonoBehaviour: Appearance +45 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0014 TermType: 0 @@ -13220,9 +12848,6 @@ MonoBehaviour: - "\uC18C\uB140\uC2A4\uB7EC\uC6B4 \uC7A5\uC2DD\uC758 \uD654\uB824\uD55C \uBC30\uB108 \n\uADC0\uC5EC\uC6B4 \uBD84\uD64D\uC0C9 \uD310\uB9E4 \uCE74\uD2B8 \n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +50" -<<<<<<< HEAD - Flags: 00000000 -======= - 'With a colorful flag garland Cute pink sales cart @@ -13230,7 +12855,6 @@ MonoBehaviour: Appearance +50 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0015 TermType: 0 @@ -13242,9 +12866,6 @@ MonoBehaviour: - "\uADC0\uC5EC\uC6B4 \uD551\uD06C\uC0C9 \uD31D\uCF58 \uADF8\uB987\uC785\uB2C8\uB2E4. \n\uC720\uB9AC \uB108\uBA38\uB85C \uC7AC\uACE0\uB7C9\uC744 \uC54C \uC218 \uC788\uC2B5\uB2C8\uB2E4. \n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +45" -<<<<<<< HEAD - Flags: 00000000 -======= - 'Cute pink popcorn container You can see the amount of inventory @@ -13252,7 +12873,6 @@ MonoBehaviour: Appearance +45 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopCustomizeText0016 TermType: 0 @@ -13266,9 +12886,6 @@ MonoBehaviour: \uC4F0\uACE0 \uC2F6\uC740\uB370 \uC804\uBD80\uB97C \uCD94\uCC9C\uD558\uACE0 \uC2F6\uC5B4 \uACE0\uBBFC\uC785\uB2C8\uB2E4.\n\uAD6C\uB9E4 \uD6C4 \uC678\uAD00 +40 " -<<<<<<< HEAD - Flags: 00000000 -======= - 'A signboard with flowers in a simple frame I want to write recommended @@ -13276,7 +12893,6 @@ MonoBehaviour: Appearance +40 by purchase' Flags: 0000000000 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Languages_Touch: [] - Term: Item/ShopHistoryText0001 TermType: 0 @@ -13567,11 +13183,7 @@ MonoBehaviour: Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8 Google_SpreadsheetName: I2Loc popcorn Localization -<<<<<<< HEAD - Google_LastUpdatedVersion: 1653471476769 -======= Google_LastUpdatedVersion: 1655179018929 ->>>>>>> 4013289d7095cb8fe9b19ea8113083ae5ce3ae37 Google_Password: change_this GoogleUpdateFrequency: 1 GoogleInEditorCheckFrequency: 1