diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index 3a271f90..c9028cff 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -543,6 +543,7 @@ GameObject: - component: {fileID: 606941325} - component: {fileID: 606941327} - component: {fileID: 606941326} + - component: {fileID: 606941328} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -566,8 +567,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -3, y: -67} - m_SizeDelta: {x: 160, y: 60} + m_AnchoredPosition: {x: -3, y: -77} + m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &606941326 MonoBehaviour: @@ -589,10 +590,10 @@ 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: 45 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 45 m_Alignment: 4 @@ -610,6 +611,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 606941324} m_CullTransparentMesh: 0 +--- !u!114 &606941328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 606941324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: Joypac/ExcuseMe + 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: 1259757724} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &660781988 GameObject: m_ObjectHideFlags: 0 @@ -895,6 +935,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 47} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1259757724 +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: 606941326} --- !u!1 &1420869290 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs index ae6b3628..561a28cf 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopHeaderTabView.cs @@ -85,7 +85,7 @@ public class ShopHeaderTabView : MonoBehaviour else if(GameDataManager.sale >= dateNowTime) { long videotime = GameDataManager.sale - GameDataManager.GetTimeStamp(dateTime); - timetextObject.text = string.Format("8折促销中 {0:D2}:{1:D2}", videotime/60, videotime%60); + timetextObject.text = string.Format(I2.Loc.LocalizationManager.GetTranslation("Joypac/Salesing") +" "+"{0:D2}:{1:D2}", videotime/60, videotime%60); m_videobutton.gameObject.SetActive(false); }