From b2f44a6a806d81dc3d301422978cfca2e883e99c Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 2 May 2022 20:49:04 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BC=B7=E5=8C=96=E6=96=87=E5=AD=97=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/CornField/Prefabs/machine.prefab | 4 +- .../Scenes/CornField/Reinforcement.unity | 260 +----------------- 2 files changed, 12 insertions(+), 252 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab index a7620e32..3cc17319 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/machine.prefab @@ -229,13 +229,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\uAC00\uACF5\uBA38\uC2E0" + m_Text: "\uAC00\uACF5\uBA38\uC2E0" --- !u!114 &1134178393517056210 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index cc9c2230..193d2384 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -236,19 +236,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 670145871} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &120592051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 298872042} --- !u!114 &250939657 MonoBehaviour: m_ObjectHideFlags: 0 @@ -462,30 +449,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &275189771 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271738746592, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 275189768} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &275189772 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 275189768} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &298872039 PrefabInstance: m_ObjectHideFlags: 0 @@ -681,30 +644,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &298872042 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271533156906, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 298872039} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &298872043 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 298872039} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &308891212 GameObject: m_ObjectHideFlags: 0 @@ -779,32 +718,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 308891212} m_CullTransparentMesh: 0 ---- !u!114 &311325123 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 275189771} ---- !u!114 &446981722 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166813} --- !u!1 &528402688 GameObject: m_ObjectHideFlags: 0 @@ -992,45 +905,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 1470} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &969354162 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166816} ---- !u!114 &1186017371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166815} ---- !u!114 &1365259213 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166814} --- !u!1 &1440832243 GameObject: m_ObjectHideFlags: 0 @@ -1167,38 +1041,12 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 ---- !u!114 &1472403857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 275189772} --- !u!224 &1530261473 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2616693360086915591, guid: 8990d570a96764364823ea362803dfcf, type: 3} m_PrefabInstance: {fileID: 2616693359400416742} m_PrefabAsset: {fileID: 0} ---- !u!114 &1545512310 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166818} --- !u!114 &1562658123 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1544,32 +1392,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1879364843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 298872043} ---- !u!114 &2035333639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 8736114270285166817} --- !u!1 &2144327473 GameObject: m_ObjectHideFlags: 0 @@ -1683,6 +1505,16 @@ PrefabInstance: propertyPath: mLocalizeTarget value: objectReference: {fileID: 1562658123} + - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_Text + value: "\uAC00\uACF5\uBA38\uC2E0" + objectReference: {fileID: 0} + - target: {fileID: 2616693359242844618, guid: 8990d570a96764364823ea362803dfcf, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} - target: {fileID: 2616693360086915590, guid: 8990d570a96764364823ea362803dfcf, type: 3} propertyPath: m_Name @@ -2035,75 +1867,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8736114270285166813 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1892666986697089498, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8736114270285166814 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4882929337143975819, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8736114270285166815 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271738746592, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8736114270285166816 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271781323281, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8736114270285166817 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271533156906, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8736114270285166818 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8736114271397819353, guid: 3b83b2dcff1e08e4da1ac3efa5bd349c, - type: 3} - m_PrefabInstance: {fileID: 8736114270285166811} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: