diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 071f0ee8..f96de1b2 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -2623,7 +2623,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: UnityWhite + mTerm: ui_button_icon_Learned_logo mTermSecondary: PrimaryTermModifier: 0 SecondaryTermModifier: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 6cd63126..6d0a4c7f 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -445,7 +445,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: UnityWhite + mTerm: ui_button_icon_close_logo mTermSecondary: PrimaryTermModifier: 0 SecondaryTermModifier: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity index be25f4a1..eff65b19 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity @@ -121,7 +121,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &1221398339 +--- !u!114 &1415080140 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -134,6 +134,32 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 3033445368273631175} +--- !u!114 &1631662059 +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: 3033445368273631176} +--- !u!114 &1958370263 +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: 3033445368273631174} --- !u!1001 &3033445368273631173 PrefabInstance: m_ObjectHideFlags: 0 @@ -251,64 +277,46 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4309693721348116327, guid: a1b406baf09004616b436c242e3a474f, type: 3} + - target: {fileID: 4309693721348116327, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 1415080140} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1b406baf09004616b436c242e3a474f, type: 3} ---- !u!1 &3033445368273631174 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3033445368104864271, guid: a1b406baf09004616b436c242e3a474f, +--- !u!114 &3033445368273631174 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3033445368657787318, guid: a1b406baf09004616b436c242e3a474f, type: 3} m_PrefabInstance: {fileID: 3033445368273631173} 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 &3033445368273631175 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3033445368104864265, guid: a1b406baf09004616b436c242e3a474f, type: 3} m_PrefabInstance: {fileID: 3033445368273631173} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3033445368273631174} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3033445368273631176 +--- !u!114 &3033445368273631176 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3033445368460925999, guid: a1b406baf09004616b436c242e3a474f, + type: 3} + m_PrefabInstance: {fileID: 3033445368273631173} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3033445368273631174} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: ui_button_icon_close_logo - mTermSecondary: - PrimaryTermModifier: 0 - SecondaryTermModifier: 0 - TermPrefix: - TermSuffix: - LocalizeOnAwake: 1 - IgnoreRTL: 0 - MaxCharactersInRTL: 0 - IgnoreNumbersInRTL: 1 - CorrectAlignmentForRTL: 1 - AddSpacesToJoinedLanguages: 0 - AllowLocalizedParameters: 1 - AllowParameters: 1 - TranslatedObjects: - - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} - LocalizeEvent: - m_PersistentCalls: - m_Calls: [] - AlwaysForceLocalize: 0 - LocalizeCallBack: - Target: {fileID: 0} - MethodName: - mGUI_ShowReferences: 0 - mGUI_ShowTems: 1 - mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 1221398339} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image