修改细节

This commit is contained in:
CaiYanPeng 2022-01-07 18:22:22 +08:00
parent 79849bd537
commit e87429d528
13 changed files with 1308 additions and 1234 deletions

View File

@ -1931,7 +1931,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2638409750589286356 --- !u!222 &2638409750589286356
CanvasRenderer: CanvasRenderer:

View File

@ -229,7 +229,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.09019608, g: 0.09019608, b: 0.11372549, a: 0.8} m_Color: {r: 0.09019608, g: 0.09019608, b: 0.11372549, a: 0.4}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

View File

@ -37,6 +37,8 @@
"Well Done": "查看详情", "Well Done": "查看详情",
"Resistance Sensitivity": "阻力灵敏度", "Resistance Sensitivity": "阻力灵敏度",
"Warning": "警告", "Warning": "警告",
"WARNING": "警告",
"Your account has been logged in on other devices. If you did not do it yourself, please change your password in time.": "您的帐户已在其他设备上登录。 如果不是您自己操作,请及时更改密码。",
"Please Connect Device": "请连接设备", "Please Connect Device": "请连接设备",
"OK": "好的", "OK": "好的",
"Total Climbed": "累计爬升", "Total Climbed": "累计爬升",
@ -154,8 +156,8 @@
"Phone/E-mail": "手机号/邮箱", "Phone/E-mail": "手机号/邮箱",
"Password": "密码", "Password": "密码",
"Login": "登录", "Login": "登录",
"Logout": "注销", "Logout": "切换账号",
"Do you want to log out and change accounts?": "您要注销并更改帐户吗", "Do you want to log out and change accounts?": "是否确定退出并且切换账号",
"Forget password?": "忘记密码?", "Forget password?": "忘记密码?",
"or you can join with": "其他登录方式", "or you can join with": "其他登录方式",
"Difficulty": "难度", "Difficulty": "难度",
@ -347,6 +349,8 @@
"Well Done": "Well Done", "Well Done": "Well Done",
"Resistance Sensitivity": "Resistance Sensitivity", "Resistance Sensitivity": "Resistance Sensitivity",
"Warning": "Warning", "Warning": "Warning",
"WARNING": "WARNING",
"Your account has been logged in on other devices. If you did not do it yourself, please change your password in time.": "Your account has been logged in on other devices. If you did not do it yourself, please change your password in time.",
"Please Connect Device": "Please Connect Device", "Please Connect Device": "Please Connect Device",
"OK": "OK", "OK": "OK",
"Total Climbed": "Total Climbed", "Total Climbed": "Total Climbed",

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate();
public static class App public static class App
{ {
public static string Host = "http://192.168.0.101:5085/"; public static string Host = "http://192.168.0.101:5083/";
public static string AppVersion = Application.version; public static string AppVersion = Application.version;
@ -197,8 +197,10 @@ public static class App
#else #else
//Host = "http://pf.juze.pro/"; //Host = "http://pf.juze.pro/";
//Host = "http://192.168.0.101:5087/"; //Host = "http://192.168.0.101:5087/";
UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001); UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001); TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
//UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
//TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
#endif #endif
if (!FB.IsInitialized) if (!FB.IsInitialized)
{ {

View File

@ -132,7 +132,7 @@ public class LoginController : BaseScene
UIManager.SetModalPanel(transform.Find("ModalPanel").GetComponent<PFUIPanel>()); UIManager.SetModalPanel(transform.Find("ModalPanel").GetComponent<PFUIPanel>());
if (!string.IsNullOrEmpty(App.is401)) if (!string.IsNullOrEmpty(App.is401))
{ {
UIManager.ShowAlert("WARNING", "Your account has been logged in on other devices. If you did not do it yourself, please change your password in time."); UIManager.ShowAlert(App.GetLocalString("WARNING"), App.GetLocalString("Your account has been logged in on other devices. If you did not do it yourself, please change your password in time."));
} }
Init(); Init();
if (loginScrollView != null) if (loginScrollView != null)

View File

@ -438,13 +438,13 @@ public class MainController : BaseScene
//距离50 //距离50
if (item.EndDistance >= 50) if (item.EndDistance >= 50)
{ {
var message = lang == "zh" ? $"骑行里程达到<color=#e3d427>{"50KM"}</color>" : $"riding distance reaches <color=#e3d427>{"50KM"}</color>!"; var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"50KM"}</color>" : $"riding distance reaches <color=#e3d427>{"50KM"}</color> in <color=#f93086>${item.RouteName}</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM");
} }
//距离100 //距离100
if (item.EndDistance >= 100) if (item.EndDistance >= 100)
{ {
var message = lang == "zh" ? $"骑行里程达到<color=#e3d427>{"100KM"}</color>" : $"riding distance reaches <color=#e3d427>{"100KM"}</color>!"; var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行里程达到<color=#e3d427>{"100KM"}</color>" : $"riding distance reaches <color=#e3d427>{"100KM"}</color> in <color=#f93086>${item.RouteName}</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM");
} }
////速度35 ////速度35
@ -456,13 +456,13 @@ public class MainController : BaseScene
//速度50 //速度50
if (item.Speed >= 50) if (item.Speed >= 50)
{ {
var message = lang == "zh" ? $"骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>!"; var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中骑行速度达到<color=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color> in <color=#f93086>${item.RouteName}</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H");
} }
//功体比 //功体比
if (item.WeightKg >= 4) if (item.WeightKg >= 4)
{ {
var message = lang == "zh" ? $"骑行功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>!"; var message = lang == "zh" ? $"在<color=#f93086>{item.RouteName}</color>中功体比达到<color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color> in <color=#f93086>${item.RouteName}</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg"); EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg");
} }
} }

View File

@ -196,7 +196,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
//SetActive4Button(false); //SetActive4Button(false);
SetColor(false); SetColor(false);
#else #else
transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f); if (!isModal)
{
transform.Find("Shadow").GetComponent<Image>().DOFade(0, 0.3f);
}
#endif #endif
} }
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData)
@ -213,7 +216,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
//SetActive4Button(true); //SetActive4Button(true);
SetColor(true); SetColor(true);
#else #else
transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f); if (!isModal)
{
transform.Find("Shadow").GetComponent<Image>().DOFade(1, 0.3f);
}
#endif #endif
} }
void SetActive4Button(bool b) void SetActive4Button(bool b)

View File

@ -299,7 +299,7 @@ public class HomeController : PFUIPanel
else if (maxdataTime < 0) else if (maxdataTime < 0)
{ {
DORotateMaxData(); DORotateMaxData();
maxdataTime += 3; maxdataTime += 10f;
} }
} }
private async void GetMaxRanking() private async void GetMaxRanking()
@ -323,7 +323,10 @@ public class HomeController : PFUIPanel
//d.Find("NickName").GetComponent<Text>().text = list[0].NickName; //d.Find("NickName").GetComponent<Text>().text = list[0].NickName;
//c.Find("NickName").GetComponent<Text>().text = list[2].NickName; //c.Find("NickName").GetComponent<Text>().text = list[2].NickName;
} }
else
{
transform.Find("MaxRankingData").gameObject.SetActive(false);
}
} }
} }

View File

@ -298,7 +298,7 @@ public class MapListController : PFUIPanel
public void OpenFilter(bool isFocusSearch = true) public void OpenFilter(bool isFocusSearch = true)
{ {
#if UNITY_ANDROID || UNITY_IOS #if UNITY_ANDROID || UNITY_IOS
topContainer.Find("Return").gameObject.SetActive(true); transform.Find("Top/Return").gameObject.SetActive(true);
var topRect = transform.Find("Top").GetComponent<RectTransform>(); var topRect = transform.Find("Top").GetComponent<RectTransform>();
if (!App.topRectStartX.HasValue) if (!App.topRectStartX.HasValue)
{ {

View File

@ -76,7 +76,7 @@ public class RaceHomeScript : RaceScript
#else #else
btnGoList = rightContainer.Find("BtnGoList"); btnGoList = rightContainer.Find("BtnGoList");
var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>(); var nav = transform.Find("Tmp/MainNav-mobile").GetComponent<NewMainNav>();
nav.SetButtonActive(new List<int> { 0, 3, 4, 6, 7 }, 0, nav.SetButtonActive(new List<int> { 2, 3, 4, 6, 7 }, 2,
custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Race/back down"), () => custom: new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Race/back down"), () =>
{ {
//OpenFilter(); //OpenFilter();

View File

@ -38,7 +38,6 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0} type: 0}

View File

@ -179,7 +179,7 @@ PlayerSettings:
applicationIdentifier: applicationIdentifier:
Android: com.ZhiXingPai.PowerFunUnity Android: com.ZhiXingPai.PowerFunUnity
buildNumber: buildNumber:
iPhone: 2.1.0.2 iPhone: 2.1.0.5
AndroidBundleVersionCode: 13 AndroidBundleVersionCode: 13
AndroidMinSdkVersion: 24 AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 30 AndroidTargetSdkVersion: 30