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

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

Browse Source 
# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs
This commit is contained in:
lishuo committed 2022-01-06 18:03:12 +08:00
2 parents 43dc844998 2d38b63c91
commit 14e9e8e23b
27 files changed
+4561 -2171
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/LoginController.cs
+16 -4
View File
@@ -762,6 +762,7 @@ public class LoginController : BaseScene
wxLogin3.Find("NickName").GetComponent<Text>().text = wxInfoJson.Value<string>("nickname");
pageNums = 5;
//this.goSign();
PerfectInfo();
StartScrollPanel(2);
}
else
@@ -1120,6 +1121,7 @@ public class LoginController : BaseScene
if (wxLogin2.gameObject.activeSelf) wxLogin2.gameObject.SetActive(false);
//if (wxLogin3.gameObject.activeSelf) wxLogin3.gameObject.SetActive(false);
pageNums = 4;
signType = 0;
#if !(UNITY_ANDROID || UNITY_IOS)
if (wxLogin1.transform.localPosition.y == 0)
{
@@ -1254,6 +1256,18 @@ public class LoginController : BaseScene
{
return signType > 0;
}
void PerfectInfo()
{
var txt = transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Sign/signText").GetComponent<Text>();
if (isThird())
{
txt.text = App.GetLocalString("PERFECT INFORMATION");
}
else
{
txt.text = App.GetLocalString("SIGN UP");
}
}
/// <summary>
///
/// </summary>
@@ -1272,6 +1286,7 @@ public class LoginController : BaseScene
#endif
signPage1.Find("signThird").gameObject.SetActive(true);
ShowPassword();
PerfectInfo();
this.StartScrollPanel(3);
this.StartScrollSign(0);
}
@@ -1280,10 +1295,6 @@ public class LoginController : BaseScene
if (type == 0)
{
pageNums = 4;
if (signType < 2)
{
signType = 0;
}
signContainer.Find("signText").GetComponent<Text>().text = App.GetLocalString("SIGN UP");
wxLogin2.gameObject.SetActive(false);
signPage1.Find("next").gameObject.SetActive(true);
@@ -1291,6 +1302,7 @@ public class LoginController : BaseScene
signPage1.Find("previousThird").gameObject.SetActive(false);
signPage1.Find("signThird").gameObject.SetActive(false);
ShowPassword();
PerfectInfo();
this.StartScrollPanel(2);
this.StartScrollSign(0);
}
Assets/Scripts/Scenes/MainController.cs
+10 -28
View File
@@ -86,7 +86,7 @@ public class MainController : BaseScene
msgs = List<CanvasGroup> { msg, msg2, msg3 };
rightMessage = transform.Find("GameObject/MessageRight").GetComponent<CanvasGroup>();
#else
msgLocation = new Vector3(168, 37, 0);
msgLocation = new Vector3(168, 37-80, 0);
var go = transform.Find("GameObject");
go.GetComponent<RectTransform>().anchorMin = Vector2.zero;
go.GetComponent<RectTransform>().anchorMax = Vector2.one;
@@ -102,7 +102,7 @@ public class MainController : BaseScene
rightMessage.transform.localPosition = 1 * msgLocation;
rightMessage.alpha = 0;
msgs = new List<CanvasGroup> { rightMessage };
for (int i = 0; i < 5; i++)
for (int i = 0; i < 3; i++)
{
var tmpm = Instantiate<CanvasGroup>(rightMessage);
tmpm.transform.SetParent(rightMessage.transform.parent);
@@ -172,9 +172,9 @@ public class MainController : BaseScene
}
private void DoMessage6(LinkedMessageEvent e)
{
var selectIndex = msgIndex % 6;
var selectIndex = msgIndex % 4;
var m = msgs[selectIndex];
if (msgIndex >= 6) //
if (msgIndex >= 4) //
{
//msgIndex = 0;
Sequence se = DOTween.Sequence();
@@ -363,7 +363,7 @@ public class MainController : BaseScene
UIManager.UpdateJoinCompetition();//查询当前我参加的赛事
}
float maxt = 0f; //用于获取全服最值内容
float emptyt = 0;//用于无消息计时
float t = 1f;
float scanTicks = 0;
@@ -430,13 +430,13 @@ public class MainController : BaseScene
//距离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=#e3d427>{"50KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"50KM"}</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM");
}
//距离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=#e3d427>{"100KM"}</color>！" : $"riding distance reaches <color=#e3d427>{"100KM"}</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM");
}
////速度35
@@ -448,36 +448,18 @@ public class MainController : BaseScene
//速度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=#e3d427>{Math.Round(item.Speed,2)}KM/H</color>！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}KM/H</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H");
}
//功体比
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=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>！" : $" riding PWR reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}w/kg</color>!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg");
}
}
}
maxt -= Time.deltaTime;
if (maxt <= 0)
{
GetMaxRanking();
maxt += 60f;
}
}
private async void GetMaxRanking()
{
var res = await ConfigHelper.mapApi.GetMaxRanking();
if (res.result)
{
foreach (var item in res.data)
{
EventQueueSystem.QueueEvent(new LinkedMessageEvent(-1, item.Message, item.WxHeadImg, item.NickName,null));
}
}
}