From aa0c8d4fb6d27a97a7b424a3984d802cff95dd8f Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 25 Nov 2021 16:32:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E7=BB=91=E5=AE=9A=E4=B8=80?= =?UTF-8?q?=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/UI/Control/PfUIButton.prefab | 4 +- Assets/Resources/UI/Prefab/MainNav.prefab | 7 +- .../Prefab/Panel/Mobile/MapListPanel.prefab | 33 +++---- .../Prefab/Panel/Mobile/RaceListPanel.prefab | 88 +++++-------------- Assets/Resources/UI/language.json | 42 ++++++++- .../CompetitionLoadingController.cs | 12 +-- Assets/Scripts/UI/Control/PfUIButton.cs | 8 +- .../Scripts/UI/Prefab/Race/RaceItemScript.cs | 6 +- Assets/Scripts/Utils/Toast.cs | 2 +- 9 files changed, 100 insertions(+), 102 deletions(-) diff --git a/Assets/Resources/UI/Control/PfUIButton.prefab b/Assets/Resources/UI/Control/PfUIButton.prefab index 0de53fec..085e8299 100644 --- a/Assets/Resources/UI/Control/PfUIButton.prefab +++ b/Assets/Resources/UI/Control/PfUIButton.prefab @@ -355,6 +355,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &7516030328870189652 GameObject: m_ObjectHideFlags: 0 @@ -392,7 +393,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 0, y: 16} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6797175061521168176 CanvasRenderer: @@ -461,3 +462,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: diff --git a/Assets/Resources/UI/Prefab/MainNav.prefab b/Assets/Resources/UI/Prefab/MainNav.prefab index 0cd412e7..533750b1 100644 --- a/Assets/Resources/UI/Prefab/MainNav.prefab +++ b/Assets/Resources/UI/Prefab/MainNav.prefab @@ -939,6 +939,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2638424933752433027} m_Modifications: + - target: {fileID: 412546516092973110, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x @@ -1088,7 +1093,7 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index fae9313d..b5588bb5 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -2446,7 +2446,7 @@ GameObject: - component: {fileID: 4853418148479202716} - component: {fileID: 4853418148479202718} - component: {fileID: 4853418148479202719} - - component: {fileID: 4853418148479202705} + - component: {fileID: 6709480425670519352} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2514,7 +2514,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Favorite ---- !u!114 &4853418148479202705 +--- !u!114 &6709480425670519352 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2523,13 +2523,10 @@ MonoBehaviour: m_GameObject: {fileID: 4853418148479202717} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &4891852497432372520 GameObject: m_ObjectHideFlags: 0 @@ -4122,7 +4119,7 @@ GameObject: - component: {fileID: 6653062728066858165} - component: {fileID: 6653062728066858167} - component: {fileID: 6653062728066858164} - - component: {fileID: 6653062728066858166} + - component: {fileID: 2777252539890975348} m_Layer: 5 m_Name: DistanceText m_TagString: Untagged @@ -4190,7 +4187,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Distance ---- !u!114 &6653062728066858166 +--- !u!114 &2777252539890975348 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4199,13 +4196,10 @@ MonoBehaviour: m_GameObject: {fileID: 6653062728066858162} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &6653062728649070852 GameObject: m_ObjectHideFlags: 0 @@ -4455,7 +4449,7 @@ GameObject: - component: {fileID: 6653062728799582121} - component: {fileID: 6653062728799582122} - component: {fileID: 6653062728799582123} - - component: {fileID: 6653062728799582120} + - component: {fileID: 964945281260099644} m_Layer: 5 m_Name: DifficultyText m_TagString: Untagged @@ -4523,7 +4517,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Difficulty ---- !u!114 &6653062728799582120 +--- !u!114 &964945281260099644 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4532,13 +4526,10 @@ MonoBehaviour: m_GameObject: {fileID: 6653062728799582118} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &6653062728990783301 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab index 35a88978..b0e548f0 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab @@ -427,7 +427,7 @@ GameObject: - component: {fileID: 2733692577496760831} - component: {fileID: 2110565121859030733} - component: {fileID: 532493644666358451} - - component: {fileID: 2456986090325409475} + - component: {fileID: 1266744915865214452} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -495,7 +495,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Done ---- !u!114 &2456986090325409475 +--- !u!114 &1266744915865214452 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -504,13 +504,10 @@ MonoBehaviour: m_GameObject: {fileID: 285203669389758375} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &306528113495823939 GameObject: m_ObjectHideFlags: 0 @@ -522,7 +519,7 @@ GameObject: - component: {fileID: 5761936419989452789} - component: {fileID: 6312843494427679176} - component: {fileID: 7847260909256029326} - - component: {fileID: 7412897159743525563} + - component: {fileID: 6911481201695536009} m_Layer: 5 m_Name: StatusText m_TagString: Untagged @@ -590,7 +587,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Status ---- !u!114 &7412897159743525563 +--- !u!114 &6911481201695536009 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -599,13 +596,10 @@ MonoBehaviour: m_GameObject: {fileID: 306528113495823939} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &972417564996232566 GameObject: m_ObjectHideFlags: 0 @@ -617,7 +611,7 @@ GameObject: - component: {fileID: 6382955955445820972} - component: {fileID: 1454889704497082400} - component: {fileID: 4627457732871098768} - - component: {fileID: 1659025924272861702} + - component: {fileID: 2587597516042741349} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -685,7 +679,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Not started ---- !u!114 &1659025924272861702 +--- !u!114 &2587597516042741349 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -694,13 +688,10 @@ MonoBehaviour: m_GameObject: {fileID: 972417564996232566} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &1211132331910028691 GameObject: m_ObjectHideFlags: 0 @@ -1285,7 +1276,7 @@ GameObject: - component: {fileID: 978491900503404566} - component: {fileID: 7726483752425712310} - component: {fileID: 344103388853218116} - - component: {fileID: 5753942853230887522} + - component: {fileID: 2309587595848669937} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1353,7 +1344,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: In play ---- !u!114 &5753942853230887522 +--- !u!114 &2309587595848669937 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1362,13 +1353,10 @@ MonoBehaviour: m_GameObject: {fileID: 3027864839275049844} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &3259576807673738333 GameObject: m_ObjectHideFlags: 0 @@ -1680,22 +1668,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &861709345535606967 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3712583330546725488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 --- !u!1 &4408462524766711659 GameObject: m_ObjectHideFlags: 0 @@ -3028,7 +3000,7 @@ GameObject: - component: {fileID: 222680097038445439} - component: {fileID: 1483386434340717107} - component: {fileID: 1828684456983819948} - - component: {fileID: 7323859407491872305} + - component: {fileID: 1602215235609540999} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3096,7 +3068,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Join In ---- !u!114 &7323859407491872305 +--- !u!114 &1602215235609540999 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3105,13 +3077,10 @@ MonoBehaviour: m_GameObject: {fileID: 6929321773644492787} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!1 &6978174911713864586 GameObject: m_ObjectHideFlags: 0 @@ -3123,7 +3092,7 @@ GameObject: - component: {fileID: 281912800573157126} - component: {fileID: 1470597312560088650} - component: {fileID: 1846012676699239125} - - component: {fileID: 7303997741883880008} + - component: {fileID: 2188378495155394284} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3191,7 +3160,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: All ---- !u!114 &7303997741883880008 +--- !u!114 &2188378495155394284 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3200,13 +3169,10 @@ MonoBehaviour: m_GameObject: {fileID: 6978174911713864586} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 + key: --- !u!114 &7674604754731839632 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3710,12 +3676,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} ---- !u!1 &3712583330546725488 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322, - type: 3} - m_PrefabInstance: {fileID: 3089084281570681624} - m_PrefabAsset: {fileID: 0} --- !u!224 &1786430169159750715 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index e72fe248..8a872454 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -252,12 +252,29 @@ "Distance": "里程", "Near": "附近", "Trend": "热门", - "Go to the official website to download?": "去powerfun.com下载Powerfun Workouts？", - "Workouts not installed": "Powerfun Workouts 未安装", + "Go to the official website to download?": "去powerfun.com下载运动地球 Workouts？", + "Workouts not installed": "运动地球 Workouts 未安装", "DISCONNECT": "断开连接", "Switch to PowerFun Workouts?": "切换到运动地球 Workouts？", "We will close the Powerfun and start PowerFun Workouts.": "即将关闭运动地球，并启动Workouts。", - "Do you want to quit PowerFun?": "您要退出 运动地球 吗？" + "Do you want to quit PowerFun?": "您要退出 运动地球 吗？", + "Cancel Reservation": "取消报名", + "Success": "成功", + "Please update to the latest version.": "请更新至最新版本。", + "Please fill in the information": "请填写相关信息", + "Please connect the device!": "请连接设备！", + "Picture already exists, please choose another picture": "图片已存在，请选择其他图片", + "Submitted": "已提交", + "Two password entries are inconsistent": "两次密码输入不一致", + "Please select birthday": "请选择生日", + "Race close": "比赛已关闭", + "error when get competition information": "获取比赛信息时出错", + "Do you want to join?": "是否要报名吗？", + "Do you want to cancel reservation?": "是否要取消报名？", + "Upload": "上传", + "Upload the local record?": "上传本地记录？", + "Delete the local record?": "删除本地记录？", + "Registered": "已报名" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -508,6 +525,23 @@ "DISCONNECT": "DISCONNECT", "Switch to PowerFun Workouts?": "Switch to PowerFun Workouts?", "We will close the Powerfun and start PowerFun Workouts.": "We will close the Powerfun and start PowerFun Workouts.", - "Do you want to quit PowerFun?": "Do you want to quit PowerFun?" + "Do you want to quit PowerFun?": "Do you want to quit PowerFun?", + "Cancel Reservation": "Cancel Reservation", + "Success": "Success", + "Please update to the latest version.": "Please update to the latest version.", + "Please fill in the information": "Please fill in the information", + "Please connect the device!": "Please connect the device!", + "Picture already exists, please choose another picture": "Picture already exists, please choose another picture", + "Submitted": "Submitted", + "Two password entries are inconsistent": "Two password entries are inconsistent", + "Please select birthday": "Please select birthday", + "Race close": "Race close", + "error when get competition information": "error when get competition information", + "Do you want to join?": "Do you want to join?", + "Do you want to cancel reservation?": "Do you want to cancel reservation?", + "Upload": "Upload", + "Upload the local record?": "Upload the local record?", + "Delete the local record?": "Delete the local record?", + "Registered": "Registered" } } \ No newline at end of file diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs index 5878bbd5..38e2f45c 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs @@ -91,7 +91,7 @@ namespace Assets.Scenes.Ride.Scripts if (_canCancelApply) { - CompetitionStatus.text = "Registered"; + CompetitionStatus.text = App.GetLocalString("Registered"); } else { @@ -288,7 +288,7 @@ namespace Assets.Scenes.Ride.Scripts UpdateCompetition(); if (competition.Status == 4) { - Utils.showToast(gameObject, "race close"); + Utils.showToast(gameObject, "Race close"); return; } competitionUI = cyclingController.singleUIManager as CompetitionUIManager; @@ -303,7 +303,7 @@ namespace Assets.Scenes.Ride.Scripts UpdateCompetition(); if (competition.Status == 4) { - Utils.showToast(gameObject, "race close"); + Utils.showToast(gameObject, "Race close"); return; } //隐藏当前用户 @@ -349,7 +349,7 @@ namespace Assets.Scenes.Ride.Scripts { UpdateCompetition(); UIManager.UpdateJoinCompetition(); - Utils.showToast(gameObject, "success", 2, 1); + Utils.showToast(gameObject, "Success", 2, 1); } else { @@ -367,7 +367,7 @@ namespace Assets.Scenes.Ride.Scripts { try { - UIManager.ShowConfirm("Canel Reservation", "Do you want to cancel reservation?", async () => + UIManager.ShowConfirm("Cancel Reservation", "Do you want to cancel reservation?", async () => { MapCompetitionApi api = ConfigHelper.mapCompetitionApi; var data = api.CancelMapCompetition(cyclingController.competition.Id); @@ -376,7 +376,7 @@ namespace Assets.Scenes.Ride.Scripts UpdateCompetition(); App.CompetitionIdList.Remove(cyclingController.competition.Id); UIManager.UpdateJoinCompetition(); - Utils.showToast(gameObject, "success", 2, 1); + Utils.showToast(gameObject, "Success", 2, 1); } else { diff --git a/Assets/Scripts/UI/Control/PfUIButton.cs b/Assets/Scripts/UI/Control/PfUIButton.cs index 2b65b13d..aa85c09d 100644 --- a/Assets/Scripts/UI/Control/PfUIButton.cs +++ b/Assets/Scripts/UI/Control/PfUIButton.cs @@ -66,7 +66,13 @@ namespace Assets.Scripts.UI.Control { // //tooltips.GetComponent().localPosition. - tooltips.transform.Find("Text").GetComponent().text = Tooltips; + tooltips.transform.Find("Text").GetComponent().text = App.GetLocalString(Tooltips); + var pftext = tooltips.transform.Find("Text").GetComponent(); + Debug.Log(pftext); + if (pftext) + { + tooltips.transform.Find("Text").GetComponent().key = Tooltips; + } } tooltips.SetActive(false); diff --git a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs index 3137fd08..ac29aa4a 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs @@ -208,7 +208,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH { status.GetComponent().alpha = 1; status.Find("Text").GetComponent().text = - mapCompetition.Status == 2?"Registered":mapCompetition.StatusVlaue; + mapCompetition.Status == 2?App.GetLocalString("Registered") :mapCompetition.StatusVlaue; } } if (status.GetComponent()) @@ -326,7 +326,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH //transform.Find("BtnContainer").gameObject.Destroy(); //SetButtonGroup(mapCompetition); Refresh(); - Utils.showToast(null, "success", type: 1); + Utils.showToast(null, "Success", type: 1); } else { @@ -346,7 +346,7 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH //SetButtonGroup(mapCompetition); App.CompetitionIdList.Remove(mapCompetition.Id); Refresh(); - Utils.showToast(null, "success", type: 1); + Utils.showToast(null, "Success", type: 1); } else { diff --git a/Assets/Scripts/Utils/Toast.cs b/Assets/Scripts/Utils/Toast.cs index a9aa93cd..a5c17df0 100644 --- a/Assets/Scripts/Utils/Toast.cs +++ b/Assets/Scripts/Utils/Toast.cs @@ -36,7 +36,7 @@ public class Toast : MonoBehaviour { json.func = () => false; } - StartCoroutine(showToastCOR(json.text, json.duration,json.func,json.showSeconds,json.endCallback)); + StartCoroutine(showToastCOR(App.GetLocalString(json.text), json.duration,json.func,json.showSeconds,json.endCallback)); } private IEnumerator showToastCOR(string text,