From 11964ac51c075c692f906484abeab73917b54d04 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 10 Feb 2022 14:58:44 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E7=94=BB?= =?UTF-8?q?=E5=83=8F=E6=8A=9C=E3=81=91=E5=86=8D=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/BulkOrderTelephone.unity | 8 ++-- .../Prefabs/BulkOrder/CanvasTelePhone.prefab | 37 +++++++++++++------ .../Scenes/Main/Prefabs/BulkOrder/Orde.prefab | 11 +++--- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity index a1e6f3a9..39d1e718 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity @@ -207,7 +207,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 3058138224889858367, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -253,7 +253,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} - target: {fileID: 4315754686575543077, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -265,7 +265,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, + objectReference: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} - target: {fileID: 4315754687099534943, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} @@ -422,7 +422,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, + objectReference: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index d50e4be0..959f11e7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -63,7 +63,7 @@ GameObject: - component: {fileID: 4315754686575543076} - component: {fileID: 4315754686575543082} - component: {fileID: 4315754686575543077} - - component: {fileID: 1931934228493670004} + - component: {fileID: 3727009157270843534} m_Layer: 5 m_Name: ImageText m_TagString: Untagged @@ -127,7 +127,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1931934228493670004 +--- !u!114 &3727009157270843534 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -153,7 +153,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -255,7 +256,7 @@ GameObject: - component: {fileID: 4315754686625492740} - component: {fileID: 4315754686625492746} - component: {fileID: 4315754686625492741} - - component: {fileID: 4396818125454913582} + - component: {fileID: 5857165429278816774} m_Layer: 0 m_Name: TextNumbers m_TagString: Untagged @@ -319,7 +320,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4396818125454913582 +--- !u!114 &5857165429278816774 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -345,7 +346,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -1430,7 +1432,7 @@ GameObject: - component: {fileID: 4315754688123097769} - component: {fileID: 4315754688123097775} - component: {fileID: 4315754688123097774} - - component: {fileID: 3819418277862516739} + - component: {fileID: 3385639572842821530} m_Layer: 5 m_Name: explanation m_TagString: Untagged @@ -1494,7 +1496,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3819418277862516739 +--- !u!114 &3385639572842821530 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1789,7 +1791,7 @@ GameObject: - component: {fileID: 4315754688581755602} - component: {fileID: 4315754688581755600} - component: {fileID: 4315754688581755603} - - component: {fileID: 1988795563765258032} + - component: {fileID: 1403928058872617926} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -1853,7 +1855,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1988795563765258032 +--- !u!114 &1403928058872617926 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1879,7 +1881,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2036,6 +2039,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4315754687099534943} m_Modifications: + - target: {fileID: 626758044086132379, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} propertyPath: m_Pivot.x @@ -2326,6 +2335,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4315754687099534943} m_Modifications: + - target: {fileID: 626758044086132379, guid: 7c3046c0280714d4bb45d41bcbb71ce1, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + type: 3} - target: {fileID: 1266659963694843888, guid: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} propertyPath: m_Pivot.x diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index f89185d9..ca704d6b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -121,7 +121,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -407,7 +407,7 @@ GameObject: - component: {fileID: 7119651629168984665} - component: {fileID: 1127519249548814916} - component: {fileID: 626758044086132379} - - component: {fileID: 164359427652092799} + - component: {fileID: 7918152304108384414} m_Layer: 0 m_Name: Frame m_TagString: Untagged @@ -462,7 +462,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} + m_Sprite: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -472,7 +472,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &164359427652092799 +--- !u!114 &7918152304108384414 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -498,7 +498,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: []