diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index b1bd075d..f488c073 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -121,6 +121,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &48717369 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &55686909 PrefabInstance: m_ObjectHideFlags: 0 @@ -173,7 +185,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 671564200103447854, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -189,7 +201,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 2660639677052336234, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -300,7 +312,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b5c3dfe5e499b418a991f497696772cb, + objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -331,7 +343,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -357,7 +369,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: f66393b99b4174dddb6d82c1953a414e, + objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -493,7 +505,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 3664918248288857012, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -528,13 +540,13 @@ PrefabInstance: - target: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Text - value: "\u53BB\u5B8C\u6210\u65E5\u5E38\u4EFB\u52A1\u5427\uFF01" + value: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" objectReference: {fileID: 0} - target: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -560,7 +572,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 6700388378296198159, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -584,6 +596,219 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} +--- !u!114 &73758579 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &230435945 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639678739049204, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &341744830 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 518689044540430268, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &360061174 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639679015166989, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &885865648 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &1032004766 +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: 1092775355} +--- !u!114 &1064145805 +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: 230435945} +--- !u!114 &1089516913 +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: 48717369} +--- !u!114 &1092338131 +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: 73758579} +--- !u!114 &1092775355 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &1178903781 +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: 885865648} +--- !u!114 &1200797307 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &1479870730 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639677480706697, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + 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 &1538003472 +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: 360061174} +--- !u!114 &1660846284 +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: 1200797307} +--- !u!114 &1868087303 +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: 341744830} +--- !u!114 &1895385517 +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: 1479870730} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 95847f87..eb8c6ab5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -87,7 +87,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: + mTerm: ui_Main_Mission_icon_Achievement mTermSecondary: PrimaryTermModifier: 0 SecondaryTermModifier: 0 @@ -113,7 +113,7 @@ MonoBehaviour: mGUI_ShowTems: 1 mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} - mLocalizeTargetName: + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &291830786869993872 GameObject: m_ObjectHideFlags: 0 @@ -2011,7 +2011,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: 40 m_FontStyle: 1 m_BestFit: 0 @@ -2840,7 +2840,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b5c3dfe5e499b418a991f497696772cb, type: 3} + m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3198,7 +3198,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3773,7 +3773,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f66393b99b4174dddb6d82c1953a414e, type: 3} + m_Sprite: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5636,7 +5636,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} + m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6796,7 +6796,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} + m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6910,7 +6910,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} + m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7354,13 +7354,13 @@ PrefabInstance: - target: {fileID: 1565904717471002110, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_Text - value: "\u53BB\u5B8C\u6210\u65E5\u5E38\u4EFB\u52A1\u5427\uFF01" + value: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" objectReference: {fileID: 0} - target: {fileID: 1565904717471002110, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 7706147672656590141, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7371,7 +7371,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, + objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} - target: {fileID: 8610769905762339287, guid: 5efec1563da076e43b72d4631cb86748, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab index 0116e9cd..aa1bc51c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab @@ -293,7 +293,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 @@ -305,7 +305,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u53BB\u5B8C\u6210\u65E5\u5E38\u4EFB\u52A1\u5427\uFF01" + m_Text: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" --- !u!114 &8610769905762339287 MonoBehaviour: m_ObjectHideFlags: 0