diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 966c3994..d19abafe 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -1065,7 +1065,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 03f64e60d74a2a944a184d8401fb6d61, type: 3} + m_Sprite: {fileID: 21300000, guid: f2baab95ad6d0a641a40e6d234e1c422, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1339,7 +1339,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u52D5\u753B\u8996\u8074\u3067\u30EC\u30B7\u30D4\u4EA4\u63DB" + m_Text: Recipes exchange by watching videos --- !u!114 &1285946725444220175 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab index ba2931a1..a03cb8b3 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/sale.prefab @@ -1,5 +1,155 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &741713798634024189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4274767615943855623} + - component: {fileID: 3455101247002434688} + - component: {fileID: 1861470244009143576} + - component: {fileID: 8836961737001860894} + - component: {fileID: 1013616317783334756} + - component: {fileID: 8726541925534774618} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4274767615943855623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741713798634024189} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3335798840357423240} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 42, y: -19} + m_SizeDelta: {x: 160, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3455101247002434688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741713798634024189} + m_CullTransparentMesh: 0 +--- !u!114 &1861470244009143576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741713798634024189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9843138, g: 0.9725491, b: 0.8000001, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_FontSize: 35 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Sales +--- !u!114 &8836961737001860894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741713798634024189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: Joypac/Sales + 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!114 &1013616317783334756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741713798634024189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.58431375, g: 0.5019608, b: 0.3137255, a: 1} + m_EffectDistance: {x: 4, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &8726541925534774618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741713798634024189} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 2, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3335798840357423247 GameObject: m_ObjectHideFlags: 0 @@ -33,6 +183,7 @@ RectTransform: m_Children: - {fileID: 3335798841399325565} - {fileID: 3335798840921132231} + - {fileID: 4274767615943855623} m_Father: {fileID: 3335798841777737922} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -306,7 +457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3335798841399325565 RectTransform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab index 4d8235ce..abc61ad0 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/shopmatvideo.prefab @@ -32,6 +32,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8728189482977067555} + - {fileID: 7591060974965528362} m_Father: {fileID: 1830576227029005156} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -153,7 +154,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8728189482977067555 RectTransform: m_ObjectHideFlags: 0 @@ -246,6 +247,156 @@ RectTransform: m_AnchoredPosition: {x: -13.5, y: 409.5} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5099229855061949327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7591060974965528362} + - component: {fileID: 3985914187070754419} + - component: {fileID: 1589860568358591468} + - component: {fileID: 5589991665031837127} + - component: {fileID: 1954353919211910765} + - component: {fileID: 9198724939278604390} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7591060974965528362 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5099229855061949327} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6062703037900737235} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 160, y: 61.054993} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3985914187070754419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5099229855061949327} + m_CullTransparentMesh: 0 +--- !u!114 &1589860568358591468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5099229855061949327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9811321, g: 0.9765041, b: 0.9765041, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 25 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Get with AdVideo +--- !u!114 &5589991665031837127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5099229855061949327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: Joypac/SeeVideo + 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!114 &1954353919211910765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5099229855061949327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.48627454, g: 0.5568628, b: 0.22352943, a: 1} + m_EffectDistance: {x: 2, y: -1} + m_UseGraphicAlpha: 0 +--- !u!114 &9198724939278604390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5099229855061949327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6549923884161229973 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index e102eb0e..e99a4770 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -117,7 +117,7 @@ namespace MyGame.Scripts normalWindow.SetActive(true); movieObject.SetActive(true); butterObject.SetActive(true); - messageText.text = "是否观看广告获得配方"; + messageText.text = I2.Loc.LocalizationManager.GetTranslation("Joypac/AdGetFormula"); position = StaticStringsEvent.Butter; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); @@ -129,7 +129,7 @@ namespace MyGame.Scripts normalWindow.SetActive(true); movieObject.SetActive(true); strawBerryObject.SetActive(true); - messageText.text = "是否观看广告获得配方"; + messageText.text = I2.Loc.LocalizationManager.GetTranslation("Joypac/AdGetFormula"); position = StaticStringsEvent.StrawBerry; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.Recipe2RewardButton, ""); @@ -140,7 +140,7 @@ namespace MyGame.Scripts normalWindow.SetActive(true); movieObject.SetActive(true); - messageText.text = "市集内每日12-13,18-19点会有8折促销,是否观看广告直接获取促销?"; + messageText.text = I2.Loc.LocalizationManager.GetTranslation("Joypac/SalesDetails"); position = StaticStringsEvent.Sale; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.DiscountRewardButton, ""); @@ -152,7 +152,7 @@ namespace MyGame.Scripts normalWindow.SetActive(true); movieObject.SetActive(true); closeButton.transform.localPosition =new Vector3(0, closeButton.transform.localPosition.y,0); - messageText.text = "金币奖励冷却中..."; + messageText.text = I2.Loc.LocalizationManager.GetTranslation("Joypac/GoldCold"); //position = StaticStringsEvent.Sale; //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); SetButtonAction(closeButton, okButton, "","","","","","");// AdManager.AD_PLACEMENT_VIP); diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 83ac689a..2f0be94f 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -8648,6 +8648,73 @@ MonoBehaviour: I''m looking forward to it!' Flags: 0000000000 Languages_Touch: [] + - Term: Joypac/SeeVideo + TermType: 0 + Description: + Languages: + - + - "\u89C2\u770B\u5E7F\u544A" + - + - + - Get with AdVideo + Flags: 0000000000 + Languages_Touch: [] + - Term: Joypac/Sales + TermType: 0 + Description: + Languages: + - + - "\u4FC3\u9500" + - + - + - Sales + Flags: 0000000000 + Languages_Touch: [] + - Term: Joypac/AdGetFormula + TermType: 0 + Description: + Languages: + - + - "\u662F\u5426\u89C2\u770B\u5E7F\u544A\u83B7\u5F97\u914D\u65B9" + - + - + - Whether to watch the advertisement to obtain the formula + Flags: 0000000000 + Languages_Touch: [] + - Term: Joypac/ExcuseMe + TermType: 0 + Description: + Languages: + - + - "\u6253\u6270\u4E86" + - + - + - Excuse me + Flags: 0000000000 + Languages_Touch: [] + - Term: Joypac/SalesDetails + TermType: 0 + Description: + Languages: + - + - "\u5E02\u96C6\u5185\u6BCF\u65E512-13,18-19\u70B9\u4F1A\u67098\u6298\u4FC3\u9500\uFF0C\u662F\u5426\u89C2\u770B\u5E7F\u544A\u76F4\u63A5\u83B7\u53D6\u4FC3\u9500\uFF1F" + - + - + - There will be a 20% discount every day at 12-13 and 18-19 o'clock in the + market. Do you want to watch the advertisement to get the promotion directly? + Flags: 0000000000 + Languages_Touch: [] + - Term: Joypac/GoldCold + TermType: 0 + Description: + Languages: + - + - "\u91D1\u5E01\u5956\u52B1\u51B7\u5374\u4E2D..." + - + - + - Gold bonus is cooling down... + Flags: 0000000000 + Languages_Touch: [] - Term: Item/BulkOrderRequestText0001 TermType: 0 Description: @@ -13183,7 +13250,7 @@ MonoBehaviour: Google_WebServiceURL: https://script.google.com/macros/s/AKfycbxAg2bNhBHxnqGjGTVIIFlEsKD2wXypCvIkfmB3/exec Google_SpreadsheetKey: 1nes_cxyWMST2V_p3717sbtV0kNEPDx0x6mMjJFd9GU4 Google_SpreadsheetName: I2Loc Joypac Popcorn Localization - Google_LastUpdatedVersion: 1655449892500 + Google_LastUpdatedVersion: 1655453630596 Google_Password: change_this GoogleUpdateFrequency: 1 GoogleInEditorCheckFrequency: 1