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

修改细节，增加图标和splash image，最后需要用破解版打包

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-04-29 18:05:00 +08:00
1 parent b15a4fe2c1
commit 4cb40f2c8e
58 files changed
+3580 -1487
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Apis/ApiBase.cs
+1 -1
View File
@@ -445,7 +445,7 @@ namespace Assets.Scripts.Apis
private void AddLanguage()
{
httpClient.DefaultRequestHeaders.Remove("Language");
//httpClient.DefaultRequestHeaders.Add("Language", PubCommData.Lauguage);
httpClient.DefaultRequestHeaders.Add("Language", "en");
}
/// <summary>
Assets/Scripts/Apis/Models/UserResultModel.cs
+3
View File
@@ -69,5 +69,8 @@ namespace Assets.Scripts.Apis.Models
public DateTime LastUpdateWeightTime { get; set; }
public DateTime LastUpdateBicycleWeightTime { get; set; }
public DateTime LastUpdateMaxHeartRate { get; set; }
public DateTime LastUpdateWheelStraight { get; set; }
public DateTime UpdateTime { get; set; }
}
}
Assets/Scripts/Apis/ThirdPartApi.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Assets.Scripts.Apis
}
public async Task<Stream> GetMapImage(IpToGeoModel locationInfo)
{
return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/mapbox/dark-v10/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token={App.MapBoxAccessToken}");
return await GetThirdPartStreamAsync($"https://api.mapbox.com/styles/v1/juzetest/ckmkdjwsa1nvt17nr1ps4fqgs/static/{locationInfo.longitude},{locationInfo.latitude},12.14,0/1280x1280?access_token=pk.eyJ1IjoianV6ZXRlc3QiLCJhIjoiY2ttazhsbnpiMGVrdjJucGhyNnh6eXcxYSJ9.6zj2U9eFCNJRMljNlMxjVg");
//pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA
//pk.eyJ1IjoiYW5keXNqdCIsImEiOiJja2ZhajE5OGwwamRiMnltcW96bHk0ZWFuIn0.GvKanc6UveWSvIjS9HfBPA
}
Assets/Scripts/App.cs
+2
View File
@@ -35,5 +35,7 @@ public static class App
public static Texture DefaultRotateTexture;
//全局用 输入框或者下拉框修改标志位
public static bool isChanged { get; set; }
public static string notifyContent { get; internal set; }
public static RideSetting rideSetting = new RideSetting();
}
Assets/Scripts/Scenes/LoginController.cs
+46 -19
View File
@@ -109,12 +109,7 @@ public class LoginController : MonoBehaviour
// Start is called before the first frame update
void Start()
{
App.FromLogin = true;
GetRotateImage();
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
userInfos = UIManager.Instance.userInfos;
App.DefaultRotateTexture = Utils.ReadTextureFromPlayerPrefs("rotateImage");
Init();
if (loginScrollView != null)
{
scrollPanel = loginScrollView.GetComponent<ScrollRect>();
@@ -358,17 +353,18 @@ public class LoginController : MonoBehaviour
{
UIManager.AddEvent(wxLogin3.Find("return").gameObject, EventTriggerType.PointerClick, (b) =>
{
if (signContainer.gameObject.activeSelf)
{
StartScrollPanel(3);
}
else
{
signContainer.gameObject.SetActive(true);
pageNums = 4;
//wxLogin3.gameObject.SetActive(false);
StartScrollPanel(1);
}
StartScrollPanel(1);
//if (signContainer.gameObject.activeSelf)
//{
// StartScrollPanel(3);
//}
//else
//{
// signContainer.gameObject.SetActive(true);
// pageNums = 4;
// //wxLogin3.gameObject.SetActive(false);
// StartScrollPanel(1);
//}
});
UIManager.AddEvent(wxLogin3.Find("rememberButton").gameObject, EventTriggerType.PointerClick, (b) =>
{
@@ -429,12 +425,33 @@ public class LoginController : MonoBehaviour
{ "Phone",signForm.email},
{ "Captcha",signForm.captcha},
{ "Pwd",signForm.password},
{ "CPwd",signForm.cpassword},
{ "Years",signForm.years},
{ "Months",signForm.months},
{ "Days",signForm.days},
};
avatar = Resources.Load<Texture>("Images/New Account");
transform.Find("Version").GetComponent<Text>().text = $"V{App.AppVersion}";
transform.Find("Panel").Find("Version").GetComponent<Text>().text = $"V{App.AppVersion}";
}
async void Init()
{
GetRotateImage();
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
userInfos = UIManager.Instance.userInfos;
App.DefaultRotateTexture = Utils.ReadTextureFromPlayerPrefs("rotateImage");
var notifyId = PlayerPrefs.GetInt("notifyId");
var r = await ConfigHelper.userApi.GetNotify();
if (r.result)
{
App.notifyContent = r.data.Value<string>("Content");
if (r.data.Value<int>("Id") != notifyId)
{
UIManager.ShowNewsModal();
PlayerPrefs.SetInt("notifyId", r.data.Value<int>("Id"));
}
//content.GetComponent<Text>().text
}
}
async void GetRotateImage()
@@ -647,6 +664,11 @@ public class LoginController : MonoBehaviour
var CPassword = signForm.cpassword;
if (Password.text != CPassword.text)
{
Utils.SetValidate(signFormDict, JArray.FromObject(new object[]
{
new { Field="Pwd"},
new { Field="CPwd"},
}));
Utils.showToast(gameObject, "Two password entries are inconsistent");//两次密码输入不一致
return;
}
@@ -678,7 +700,7 @@ public class LoginController : MonoBehaviour
{
var errorList = JArray.FromObject(r.data);
Utils.SetValidate(signFormDict, errorList);
Utils.showToast(gameObject, r.errMsg, 1);
Utils.showToast(gameObject, r.errMsg);
}
}
@@ -716,6 +738,11 @@ public class LoginController : MonoBehaviour
var CPassword = signForm.cpassword;
if (Password.text != CPassword.text)
{
Utils.SetValidate(signFormDict, JArray.FromObject(new object[]
{
new { Field="Pwd"},
new { Field="CPwd"},
}));
Utils.showToast(gameObject, "Two password entries are inconsistent");//两次密码输入不一致
return;
}
Assets/Scripts/UI/Control/PFUIDropdown.cs
+4
View File
@@ -88,6 +88,10 @@ namespace Assets.Scripts.UI.Control
{
this.GetComponent<Dropdown>().captionText.color = Utils.HexToColorHtml("#ffffff");
}
if (!GetComponent<Dropdown>().interactable)
{
this.GetComponent<Dropdown>().captionText.color = Utils.HexToColorHtml("#5c5c6e");
}
}
public void SetValidate()
{
Assets/Scripts/UI/Control/PfUIButton.cs
+4 -2
View File
@@ -89,8 +89,8 @@ namespace Assets.Scripts.UI.Control
{
outline.enabled = true;
outline.effectColor = ConvertColor("#474759");
image.color = ConvertColor("#3D3E4D");
text.color = ConvertColor("#474759");
image.color = ConvertColor("#272732");
}
break;
case Type.Primary:
@@ -126,6 +126,7 @@ namespace Assets.Scripts.UI.Control
case Type.Border:
{
outline.effectColor = Color.white;
text.color = ConvertColor("#fff");
}
break;
case Type.Primary:
@@ -157,6 +158,7 @@ namespace Assets.Scripts.UI.Control
case Type.Border:
{
outline.effectColor = ConvertColor("#474759");
text.color = ConvertColor("#474759");
}
break;
case Type.Primary:
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
+2 -2
View File
@@ -100,8 +100,8 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
transform.Find("Hot").gameObject.SetActive(myMap.IsFire);
var props = transform.Find("Props");
props.Find("DistanceText").GetComponent<Text>().text = $"{myMap.Distance.ToString("#0.00")}KM";
props.Find("EleText").GetComponent<Text>().text = $"{(myMap.TotalClimb ?? 0.0).ToString("#0.00")}M";
props.Find("DistanceText").GetComponent<Text>().text = $"{myMap.Distance.ToString(myMap.Distance>1000? "#0" : "#0.00")}KM";
props.Find("EleText").GetComponent<Text>().text = $"{(myMap.TotalClimb ?? 0.0).ToString(myMap.TotalClimb > 1000 ? "#0" : "#0.00")}M";
props.Find("SlopeText").GetComponent<Text>().text = $"{myMap.AverageGrade.ToString("#0.00")}%";
props.Find("rideText").GetComponent<Text>().text = myMap.TheHeat.ToString();
var tabContainer = transform.Find("TabContainer");
Assets/Scripts/UI/Prefab/MapList/RotateBg.cs
+1 -1
View File
@@ -13,6 +13,6 @@ public class RotateBg : MonoBehaviour
// Update is called once per frame
void Update()
{
transform.Rotate(new Vector3(0,0,-Time.deltaTime * 1/3));
transform.Rotate(new Vector3(0,0,-Time.deltaTime * 1/4));
}
}
Assets/Scripts/UI/Prefab/NewsController.cs
+8 -7
View File
@@ -22,14 +22,15 @@ public class NewsController : PFUIPanel
Get();
}
Transform content,exit;
async void Get()
void Get()
{
var r = await ConfigHelper.userApi.GetNotify();
if (r.result)
{
content.GetComponent<Text>().text = r.data.Value<string>("Content");
//content.GetComponent<Text>().text
}
//var r = await ConfigHelper.userApi.GetNotify();
//if (r.result)
//{
// content.GetComponent<Text>().text = r.data.Value<string>("Content");
// //content.GetComponent<Text>().text
//}
content.GetComponent<Text>().text = App.notifyContent;
}
// Update is called once per frame
void Update()
Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+75 -69
View File
@@ -254,7 +254,11 @@ public class EditUserController : PFUIPanel
}
private void Switch(BaseEventData arg0)
{
SceneManager.LoadScene("1-Login");
UIManager.ShowConfirm("Logout", "Do you want to log out and change accounts?", () =>
{
SceneManager.LoadScene("1-Login");
UIManager.CloseConfirm();
});
}
// Update is called once per frame
@@ -283,66 +287,67 @@ public class EditUserController : PFUIPanel
void Save(BaseEventData e)
{
UIManager.ShowConfirm("Confirm", "Are you sure to edit?", async () =>
{
var user = JsonConvert.DeserializeObject<UserResultModel>(JsonConvert.SerializeObject(App.CurrentUser));
user.Birthday = new DateTime(int.Parse(mYearDropdown.SelectedItem), int.Parse(mMonthDropdown.SelectedItem), int.Parse(mDayDropdown.SelectedItem));
user.Sex = mSexDropdown.SelectedItem == "男" ? 1 : 2;
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(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 = "请填写体重" });
if (string.IsNullOrEmpty(mMHR.Text)) errorList.Add(new { Field = "MaxHeartRate", ErrMsg = "请填写最大心率" });
if (string.IsNullOrEmpty(mBW.Text)) errorList.Add(new { Field = "BicycleWeight", ErrMsg = "请填写车重" });
if (string.IsNullOrEmpty(mWD.Text)) errorList.Add(new { Field = "WheelDiameter", ErrMsg = "请填写轮径" });
if (errorList.Count > 0)
{
Utils.SetValidate(dict, JArray.FromObject(errorList));
Utils.showToast(gameObject, "Please fill in the information");//请填写相关信息
return;
}
user.FTP = int.Parse(mFTP.Text);
user.Height = int.Parse(mHeight.Text);
user.Weight = int.Parse(mWeight.Text);
user.MaxHeartRate = int.Parse(mMHR.Text);
user.BicycleWeight = int.Parse(mBW.Text);
user.WheelDiameter = int.Parse(mWD.Text);
user.Unit = mUnitDropdown.SelectedIndex;
user.Contact = mName.Text;
user.ContactPhone = mPhone.Text;
user.ContactAddress = mAddr.Text;
var result = await userApi.Update(user);
App.isChanged = false;
if (result.result == false)
{
Utils.SetValidate(dict, JArray.FromObject(result.data));
Utils.showToast(gameObject, result.errMsg);
//UIManager.ShowAlert(result.errMsg);
}
else
{
App.CurrentUser = user;
var userinfos = UIManager.Instance.userInfos;
var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
if (i != -1)
{
userinfos[i].NickName = user.Nickname;
UIManager.Instance.userInfos = userinfos;
}
Utils.showToast(gameObject, "Success", type: 1);
//UIManager.ShowAlert("Success");
}
LoadDataSync();
});
//UIManager.ShowConfirm("Confirm", "Are you sure to edit?", SaveFunc);
SaveFunc();
//App.CurrentUser = user;
//UIManager.ShowAlert("result.errMsg");
}
async void SaveFunc()
{
var user = JsonConvert.DeserializeObject<UserResultModel>(JsonConvert.SerializeObject(App.CurrentUser));
user.Birthday = new DateTime(int.Parse(mYearDropdown.SelectedItem), int.Parse(mMonthDropdown.SelectedItem), int.Parse(mDayDropdown.SelectedItem));
user.Sex = mSexDropdown.SelectedItem == "男" ? 1 : 2;
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(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 = "请填写体重" });
if (string.IsNullOrEmpty(mMHR.Text)) errorList.Add(new { Field = "MaxHeartRate", ErrMsg = "请填写最大心率" });
if (string.IsNullOrEmpty(mBW.Text)) errorList.Add(new { Field = "BicycleWeight", ErrMsg = "请填写车重" });
if (string.IsNullOrEmpty(mWD.Text)) errorList.Add(new { Field = "WheelDiameter", ErrMsg = "请填写轮径" });
if (errorList.Count > 0)
{
Utils.SetValidate(dict, JArray.FromObject(errorList));
Utils.showToast(gameObject, "Please fill in the information");//请填写相关信息
return;
}
user.FTP = int.Parse(mFTP.Text);
user.Height = int.Parse(mHeight.Text);
user.Weight = int.Parse(mWeight.Text);
user.MaxHeartRate = int.Parse(mMHR.Text);
user.BicycleWeight = int.Parse(mBW.Text);
user.WheelDiameter = int.Parse(mWD.Text);
user.Unit = mUnitDropdown.SelectedIndex;
user.Contact = mName.Text;
user.ContactPhone = mPhone.Text;
user.ContactAddress = mAddr.Text;
var result = await userApi.Update(user);
App.isChanged = false;
if (result.result == false)
{
Utils.SetValidate(dict, JArray.FromObject(result.data));
Utils.showToast(gameObject, result.errMsg);
//UIManager.ShowAlert(result.errMsg);
}
else
{
App.CurrentUser = user;
var userinfos = UIManager.Instance.userInfos;
var i = userinfos.FindIndex(x => x.Id == App.CurrentUser.Id);
if (i != -1)
{
userinfos[i].NickName = user.Nickname;
UIManager.Instance.userInfos = userinfos;
}
Utils.showToast(gameObject, "Success", type: 1);
//UIManager.ShowAlert("Success");
}
LoadDataSync();
}
async void ChangeAvatar(string path)
{
var r = await userApi.Update(App.CurrentUser, path);
@@ -370,18 +375,19 @@ public class EditUserController : PFUIPanel
}
void Cancel(BaseEventData e)
{
if (App.isChanged)
{
UIManager.ShowConfirm("Tips", "It is detected that you have modified, do you want to give up and return?", () =>
{
UIManager.ShowPrePanel();
UIManager.CloseConfirm();
});
UIManager.ShowPrePanel();
//if (App.isChanged)
//{
// UIManager.ShowConfirm("Tips", "It is detected that you have modified, do you want to give up and return?", () =>
// {
// UIManager.ShowPrePanel();
// UIManager.CloseConfirm();
// });
}
else
{
UIManager.ShowPrePanel();
}
//}
//else
//{
// UIManager.ShowPrePanel();
//}
}
}
Assets/Scripts/UI/Prefab/Panel/MapDetailController.cs
+1 -1
View File
@@ -23,7 +23,7 @@ public class MapDetailController : PFUIPanel
}
else
{
Utils.showToast(gameObject, r.errMsg, 1);
Utils.showToast(gameObject, r.errMsg);
}
}
if (transform.Find("BtnGoRide") != null)
Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
+10 -6
View File
@@ -30,7 +30,11 @@ public class UserInfoController : PFUIPanel
UIManager.AddEvent(transform.Find("InfoPanel").Find("SwitchAccountButton").gameObject,
EventTriggerType.PointerClick, (b) =>
{
SceneManager.LoadScene("1-Login");
UIManager.ShowConfirm("Logout", "Do you want to log out and change accounts?", () =>
{
SceneManager.LoadScene("1-Login");
UIManager.CloseConfirm();
});
});
infoPanel = transform.Find("InfoPanel").Find("P");
@@ -92,11 +96,11 @@ public class UserInfoController : PFUIPanel
infoPanel.Find("Weight").Find("Value").GetComponent<Text>().text = $"{user.Weight}KG";
infoPanel.Find("BW").Find("Value").GetComponent<Text>().text = $"{user.BicycleWeight}KG";
infoPanel.Find("WD").Find("Value").GetComponent<Text>().text = $"{user.WheelDiameter}MM";
//infoPanel.Find("Ftp").Find("Time").GetComponent<Text>().text = user.LastUpdateFtpTime.ToString("yyyy-MM-dd");
//infoPanel.Find("MHR").Find("Time").GetComponent<Text>().text = user.MaxHeartRate.ToString();
//infoPanel.Find("Weight").Find("Time").GetComponent<Text>().text = user.LastUpdateWeightTime.ToString("yyyy-MM-dd");
//infoPanel.Find("BW").Find("Time").GetComponent<Text>().text = user.LastUpdateBicycleWeightTime.ToString("yyyy-MM-dd");
//infoPanel.Find("WD").Find("Time").GetComponent<Text>().text = $"{user.WheelDiameter}MM";
infoPanel.Find("Ftp").Find("Time").GetComponent<Text>().text = user.LastUpdateFtpTime.ToString("yyyy-MM-dd");
infoPanel.Find("Weight").Find("Time").GetComponent<Text>().text = user.LastUpdateWeightTime.ToString("yyyy-MM-dd");
infoPanel.Find("BW").Find("Time").GetComponent<Text>().text = user.LastUpdateBicycleWeightTime.ToString("yyyy-MM-dd");
infoPanel.Find("WD").Find("Time").GetComponent<Text>().text = user.LastUpdateWheelStraight.ToString("yyyy-MM-dd");
infoPanel.Find("MHR").Find("Time").GetComponent<Text>().text = user.LastUpdateMaxHeartRate.ToString("yyyy-MM-dd");
if (user.Sex == 2)
{
infoPanel.Find("SexIcon").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/woman");
Assets/Scripts/Utils/Utils.cs
+1 -1
View File
@@ -120,7 +120,7 @@ namespace Assets.Scripts
_deviceDict = value;
}
}
public static void showToast(GameObject game,string text,int duration = 1,int type = 0)
public static void showToast(GameObject game,string text,int duration = 2,int type = 0)
{
//type 0错误 1正确
var parent = UIManager.Instance.ModalsPanel;