From 1498a3d4f779929c2c9660dfe631ff1dc02b5800 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 10 Feb 2022 17:03:50 +0900 Subject: [PATCH] =?UTF-8?q?=E6=8A=9C=E3=81=91=E3=81=9F=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E5=86=8D=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/Main/Mission.unity | 135 ++++++++---------- .../Prefabs/Mission/detail_Mission.prefab | 6 +- 2 files changed, 64 insertions(+), 77 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 1c0f0e5c..77e2f2c4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -786,7 +786,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &289108742 +--- !u!114 &68131808 +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: 55686915} +--- !u!114 &223758780 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -798,8 +811,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686912} ---- !u!114 &420869077 + mTarget: {fileID: 55686918} +--- !u!114 &358220413 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -811,7 +824,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686921} + mTarget: {fileID: 55686914} --- !u!114 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -825,59 +838,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686921} ---- !u!114 &630757454 -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: 55686913} ---- !u!114 &807882696 -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: 55686914} ---- !u!114 &900096721 -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: 55686915} ---- !u!114 &1100311687 -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: 55686918} ---- !u!114 &1367802505 +--- !u!114 &765361694 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -890,6 +851,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686917} +--- !u!114 &936008269 +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: 55686919} +--- !u!114 &1037588221 +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: 55686916} --- !u!114 &1526372568 MonoBehaviour: m_ObjectHideFlags: 0 @@ -903,7 +890,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686910} ---- !u!114 &1841430514 +--- !u!114 &1856100852 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -912,10 +899,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686916} + mTarget: {fileID: 55686913} --- !u!114 &1877237825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -929,6 +916,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686920} +--- !u!114 &1901491067 +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: 55686912} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 @@ -1004,20 +1004,7 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1944170687} m_PrefabAsset: {fileID: 0} ---- !u!114 &1964113741 -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: 55686919} ---- !u!114 &2131480984 +--- !u!114 &1971812952 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} 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 1bbd18dd..b91c3c82 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab @@ -245,7 +245,7 @@ GameObject: - component: {fileID: 1628107518883220804} - component: {fileID: 1628107518883220806} - component: {fileID: 1628107518883220805} - - component: {fileID: 7214902411073109396} + - component: {fileID: 2735614943922727968} m_Layer: 5 m_Name: Cooked m_TagString: Untagged @@ -309,7 +309,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7214902411073109396 +--- !u!114 &2735614943922727968 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -321,7 +321,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: ui_Main_Mission_icon_Achievement_zh + mTerm: ui_Main_Mission_icon_Achievement mTermSecondary: PrimaryTermModifier: 0 SecondaryTermModifier: 0