diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab index de3c75a5..10b45c77 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab @@ -2118,6 +2118,7 @@ GameObject: - component: {fileID: 8736114271533156907} - component: {fileID: 8736114271533156905} - component: {fileID: 8736114271533156906} + - component: {fileID: 931083913532298343} m_Layer: 5 m_Name: Text_explanation m_TagString: Untagged @@ -2185,6 +2186,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "1\u682A\u304B\u30892\u672C\u53CE\u7A6B\u3067\u304D\u307E\u3059" +--- !u!114 &931083913532298343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8736114271533156916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8736114271597640545 GameObject: m_ObjectHideFlags: 0 @@ -2498,6 +2538,7 @@ GameObject: - component: {fileID: 8736114271738746593} - component: {fileID: 8736114271738746599} - component: {fileID: 8736114271738746592} + - component: {fileID: 1346909108977100701} m_Layer: 5 m_Name: Text_explanation m_TagString: Untagged @@ -2565,6 +2606,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7551\u306E\u4E0A\u6BB5\u304C\u8015\u3055\u308C\u307E\u3059\r\n1\u682A\u304B\u30891\u672C\u53CE\u7A6B\u3067\u304D\u307E\u3059" +--- !u!114 &1346909108977100701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8736114271738746594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8736114271781323283 GameObject: m_ObjectHideFlags: 0 @@ -3112,12 +3192,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3} ---- !u!224 &8736114270235223148 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, - type: 3} - m_PrefabInstance: {fileID: 7159613405573062692} - m_PrefabAsset: {fileID: 0} --- !u!114 &5298427820679491484 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3088275765983924152, guid: 9ebb93e1ff784e2419d2996e1ee519bf, @@ -3130,6 +3204,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &8736114270235223148 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, + type: 3} + m_PrefabInstance: {fileID: 7159613405573062692} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114270722190697 PrefabInstance: m_ObjectHideFlags: 0 @@ -3374,12 +3454,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ebb93e1ff784e2419d2996e1ee519bf, type: 3} ---- !u!224 &7159613406184650565 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, - type: 3} - m_PrefabInstance: {fileID: 8736114270831080205} - m_PrefabAsset: {fileID: 0} --- !u!114 &6045849226816011445 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3088275765983924152, guid: 9ebb93e1ff784e2419d2996e1ee519bf, @@ -3392,6 +3466,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e220d0668504fe99a65270586553f5a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7159613406184650565 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1900773928035009608, guid: 9ebb93e1ff784e2419d2996e1ee519bf, + type: 3} + m_PrefabInstance: {fileID: 8736114270831080205} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114271242800391 PrefabInstance: m_ObjectHideFlags: 0 @@ -3526,12 +3606,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} ---- !u!224 &5404513298107476707 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, - type: 3} - m_PrefabInstance: {fileID: 8736114271242800391} - m_PrefabAsset: {fileID: 0} --- !u!114 &5404513298100535288 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, @@ -3544,6 +3618,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5404513298107476707 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, + type: 3} + m_PrefabInstance: {fileID: 8736114271242800391} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114271678039720 PrefabInstance: m_ObjectHideFlags: 0 @@ -3678,12 +3758,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, type: 3} ---- !u!224 &5404513298611757388 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, - type: 3} - m_PrefabInstance: {fileID: 8736114271678039720} - m_PrefabAsset: {fileID: 0} --- !u!114 &5404513298602980439 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3619866680266453759, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, @@ -3696,6 +3770,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5404513298611757388 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3619866680260814820, guid: 2d9eb4dcfbc9bdc4f9c87de5814b1606, + type: 3} + m_PrefabInstance: {fileID: 8736114271678039720} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8736114271969069798 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity index 5692fa87..75e4bc26 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity @@ -372,6 +372,18 @@ 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!1001 &298872039 PrefabInstance: m_ObjectHideFlags: 0 @@ -792,6 +804,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1000, y: 1470} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1272738804 +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 &1440832243 GameObject: m_ObjectHideFlags: 0 @@ -1326,6 +1351,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &2145178949 +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!1001 &2616693359400416742 PrefabInstance: m_ObjectHideFlags: 0 @@ -1653,3 +1691,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 420b443627944f0cb76fdb18505b5ee2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8736114270285166813 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: diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 0d4c2c34..fbf38c7e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -457,6 +457,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 535532088} m_CullTransparentMesh: 0 +--- !u!114 &560871796 +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: 1977897798} --- !u!1 &575026009 GameObject: m_ObjectHideFlags: 0 @@ -2799,6 +2812,7 @@ GameObject: - component: {fileID: 1977897797} - component: {fileID: 1977897799} - component: {fileID: 1977897798} + - component: {fileID: 1977897800} m_Layer: 5 m_Name: explanation m_TagString: Untagged @@ -2866,6 +2880,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1977897796} m_CullTransparentMesh: 0 +--- !u!114 &1977897800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1977897796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 560871796} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &2072348679 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs index d943c34b..3034d6e1 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using I2.Loc; using TMPro; using UniRx; using UnityEngine; @@ -8,8 +9,6 @@ using UnityEngine.UI; public class CornFieldReinforcementDetailView : MonoBehaviour { private static readonly string harvestedTextFormat = "{0}"; - private static readonly string ReinforceFormat = "強化しますか?"; - private static readonly string ReleaseFormat = "開放しますか?"; private static readonly string SigbBoardFormat = "x{0}"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); @@ -93,7 +92,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour purchaseButton.gameObject.SetActive(false); releaseButton.gameObject.SetActive(true); releasePriceText.text = price.ToString(); - messageText.text = ReleaseFormat; + messageText.text = ScriptLocalization.UI.CornFiledUpgradePopup; } else { @@ -112,7 +111,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour currentSignBoard.text = string.Format(SigbBoardFormat, currentHarvestCount); nextSeedling.SetSeedling(nextRank); nextSignBoard.text = string.Format(SigbBoardFormat, nextHarvestCount); - messageText.text = ReinforceFormat; + messageText.text = ScriptLocalization.UI.CornFieldReleasePopup; } } private void SetMachineData(int machineLevel, int price) @@ -135,6 +134,6 @@ public class CornFieldReinforcementDetailView : MonoBehaviour currentHarvestedText.text = string.Format(harvestedTextFormat, currentHarvestedCorn.ToString()); nextHarvestedText.text = string.Format(harvestedTextFormat, nextHarvestedCorn.ToString()); machinePriceText.text = price.ToString(); - messageText.text = ReinforceFormat; + messageText.text = ScriptLocalization.UI.CornFiledUpgradePopup; } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 95538745..23bc1091 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -1689,6 +1689,7 @@ GameObject: - component: {fileID: 3664916833050583563} - component: {fileID: 3664916833050583565} - component: {fileID: 3664916833050583564} + - component: {fileID: 8656611109552527547} m_Layer: 5 m_Name: Text_Make m_TagString: Untagged @@ -1756,6 +1757,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u4F5C\u308B" +--- !u!114 &8656611109552527547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3664916833050583562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/MainMake + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &3664916834121473267 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index 11ac5e92..adc0ee42 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -839,6 +839,7 @@ GameObject: - component: {fileID: 8660695104801603082} - component: {fileID: 8660695104801603080} - component: {fileID: 8660695104801603081} + - component: {fileID: 8191719758166110849} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -906,6 +907,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30B3\u30C3\u30B3\u30BB\u30EC\u30AF\u30B7\u30E7\u30F3\u9285\u8CDE\u53D7\u8CDE" +--- !u!114 &8191719758166110849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8660695104801603083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8660695104834774515 GameObject: m_ObjectHideFlags: 0 @@ -11122,6 +11162,7 @@ GameObject: - component: {fileID: 8660695105669835446} - component: {fileID: 8660695105669835444} - component: {fileID: 8660695105669835445} + - component: {fileID: 7998197267577402775} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -11189,6 +11230,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30D6\u30E9\u30C3\u30AF\u30DA\u30C3\u30D1\u30FC\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" +--- !u!114 &7998197267577402775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8660695105669835447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8660695105894842729 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index bb1a2ec7..12a1f701 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -137,6 +137,7 @@ GameObject: - component: {fileID: 5089467466247093046} - component: {fileID: 5089467466247093044} - component: {fileID: 5089467466247093045} + - component: {fileID: 7887033067418340973} m_Layer: 5 m_Name: Text_explanation m_TagString: Untagged @@ -204,6 +205,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1.3 m_Text: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" +--- !u!114 &7887033067418340973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089467466247093047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: System/TastingText + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &5089467466339732559 GameObject: m_ObjectHideFlags: 0 @@ -1646,6 +1686,7 @@ GameObject: - component: {fileID: 5089467467985140647} - component: {fileID: 5089467467985140645} - component: {fileID: 5089467467985140646} + - component: {fileID: 5974128374532235101} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1713,6 +1754,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30BD\u30EB\u30C8\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" +--- !u!114 &5974128374532235101 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089467467985140664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &5089467468128331487 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 3e3c2b9b..430f5656 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -1108,6 +1108,7 @@ GameObject: - component: {fileID: 7133607635952815046} - component: {fileID: 6381813996878165073} - component: {fileID: 953401080106444321} + - component: {fileID: 1285946725444220175} m_Layer: 5 m_Name: Text_detail m_TagString: Untagged @@ -1175,6 +1176,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" +--- !u!114 &1285946725444220175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8357299350562842281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/ShoppingExchangeItem + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8536603422629144349 GameObject: m_ObjectHideFlags: 0 @@ -2031,6 +2071,7 @@ GameObject: - component: {fileID: 8536603424255746892} - component: {fileID: 8536603424255746890} - component: {fileID: 8536603424255746891} + - component: {fileID: 3395822870383577836} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2098,6 +2139,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5869\n" +--- !u!114 &3395822870383577836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8536603424255746893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8536603424418812070 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab index 331b567d..d4625e2e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/ItemDetail.prefab @@ -479,6 +479,7 @@ GameObject: - component: {fileID: 3033445368460925996} - component: {fileID: 3033445368460925998} - component: {fileID: 3033445368460925999} + - component: {fileID: 3260809382041794287} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -546,6 +547,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5869" +--- !u!114 &3260809382041794287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3033445368460925997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &3033445368573299216 GameObject: m_ObjectHideFlags: 0 @@ -631,6 +671,7 @@ GameObject: - component: {fileID: 3033445368657787319} - component: {fileID: 3033445368657787313} - component: {fileID: 3033445368657787318} + - component: {fileID: 3218905408749787199} m_Layer: 5 m_Name: Text_explanation m_TagString: Untagged @@ -698,6 +739,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1.3 m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\u7279\u7523\u306E\u5869\r\n\u3068\u3066\u3082\u307E\u308D\u3084\u304B\u306A\u5869\u3067\r\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306B\u5408\u3046\u3053\u3068\u9593\u9055\u3044\u306A\u3057" +--- !u!114 &3218905408749787199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3033445368657787316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &3033445368710878713 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 3ce35067..14078045 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -107,6 +107,46 @@ MonoBehaviour: - Flags: 0000 Languages_Touch: [] + - Term: System/TastingText + TermType: 0 + Description: + Languages: + - "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" + - + Flags: 0000 + Languages_Touch: [] + - Term: UI/MainMake + TermType: 0 + Description: + Languages: + - "\u4F5C\u308B" + - + Flags: 0000 + Languages_Touch: [] + - Term: UI/ShoppingExchangeItem + TermType: 0 + Description: + Languages: + - "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + - + Flags: 0000 + Languages_Touch: [] + - Term: UI/CornFieldReleasePopup + TermType: 0 + Description: + Languages: + - "\u958B\u653E\u3057\u307E\u3059\u304B\uFF1F" + - + Flags: 0000 + Languages_Touch: [] + - Term: UI/CornFiledUpgradePopup + TermType: 0 + Description: + Languages: + - "\u5F37\u5316\u3057\u307E\u3059\u304B\uFF1F" + - + Flags: 0000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 1 mTerm_AppName: diff --git a/popcorn/Assets/ScriptLocalization.cs b/popcorn/Assets/ScriptLocalization.cs index 214708ae..8f170341 100644 --- a/popcorn/Assets/ScriptLocalization.cs +++ b/popcorn/Assets/ScriptLocalization.cs @@ -12,6 +12,12 @@ namespace I2.Loc public static string IncreaseCustomerMessage { get{ return LocalizationManager.GetTranslation ("System/IncreaseCustomerMessage"); } } public static string PerfectPopcornMessage { get{ return LocalizationManager.GetTranslation ("System/PerfectPopcornMessage"); } } } + + public static class UI + { + public static string CornFieldReleasePopup { get{ return LocalizationManager.GetTranslation ("UI/CornFieldReleasePopup"); } } + public static string CornFiledUpgradePopup { get{ return LocalizationManager.GetTranslation ("UI/CornFiledUpgradePopup"); } } + } } public static class ScriptTerms @@ -24,5 +30,11 @@ namespace I2.Loc public const string IncreaseCustomerMessage = "System/IncreaseCustomerMessage"; public const string PerfectPopcornMessage = "System/PerfectPopcornMessage"; } + + public static class UI + { + public const string CornFieldReleasePopup = "UI/CornFieldReleasePopup"; + public const string CornFiledUpgradePopup = "UI/CornFiledUpgradePopup"; + } } } \ No newline at end of file