lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-12-07 14:37:13 +08:00
2 parents fa144dbaa0 cc6730cbc4
commit 542036fb45
22 files changed
+1654 -1437
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+1 -1
View File
@@ -387,7 +387,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
user.Nickname = mNickName.Text;
user.Country = UIManager.Instance.loginRegOptions.GetCountryName(mConutryDropdown.SelectedIndex);
var errorList = new List<object>();
if (string.IsNullOrEmpty(mNickName.Text)) errorList.Add(new { Field = "Nickname", ErrMsg = "请填写昵称" });
if (string.IsNullOrEmpty(mNickName.Text)) errorList.Add(new { Field = "NickName", ErrMsg = "请填写昵称" });
if (string.IsNullOrEmpty(mFTP.Text)) errorList.Add(new { Field = "FTP", ErrMsg = "请填写FTP" });
if (string.IsNullOrEmpty(mHeight.Text)) errorList.Add(new { Field = "Height", ErrMsg = "请填写身高" });
if (string.IsNullOrEmpty(mWeight.Text)) errorList.Add(new { Field = "Weight", ErrMsg = "请填写体重" });
Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs
+1 -1
View File
@@ -54,7 +54,7 @@ namespace Assets.Scenes.Ride.Scripts
public void Set(DateTime startTime, DateTime now,string title, string sceneName, int competitionId,int routeId)
{
ticks = (int)(startTime - now).TotalSeconds;
var content = $"Your <color='#F93086'>{Helper.SubStr(title,10)}</color> race about to start";
var content = App.GetLocalLanguage().Equals("en")? $"Your <color='#F93086'>{Helper.SubStr(title,10)}</color> race about to start": $"你参与的 <color='#F93086'>{Helper.SubStr(title, 10)}</color> 比赛即将开始！";
Content.text = content;
CompetitionId = competitionId;
RouteId = routeId;