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

banner种类增加；集合详情增加作者；排行榜轮换功能

Browse Source
This commit is contained in:
Caiyanpeng committed 2022-01-07 15:11:40 +08:00
1 parent fa0d9e973c
commit 9fb819b6fe
21 files changed
+1589 -1572
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/MainController.cs
+5 -5
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-80, 0);
msgLocation = new Vector3(168, 37-46, 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 < 3; i++)
for (int i = 0; i < 4; 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 % 4;
var selectIndex = msgIndex % 5;
var m = msgs[selectIndex];
if (msgIndex >= 4) //
if (msgIndex >= 5) //
{
//msgIndex = 0;
Sequence se = DOTween.Sequence();
@@ -417,7 +417,7 @@ public class MainController : BaseScene
if (item.Point != null && item.Point.Length > 0 && item.Point[0] == -1d)
{
var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}");
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(-1, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}");
}
if (item.RouteId > 0)
{
Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
+8 -8
View File
@@ -398,14 +398,14 @@ namespace Assets.Scenes.Ride.Scripts
protected override void Cancel(BaseEventData baseEvent)
{
if (App.MainSceneParam.ContainsKey("Name"))
{
App.MainSceneParam["Name"] = "RaceHomePanel";
}
else
{
App.MainSceneParam.Add("Name", "RaceHomePanel");
}
//if (App.MainSceneParam.ContainsKey("Name"))
//{
// App.MainSceneParam["Name"] = "RaceHomePanel";
//}
//else
//{
// App.MainSceneParam.Add("Name", "RaceHomePanel");
//}
base.Cancel(baseEvent);
}
#endregion
Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs
+1 -1
View File
@@ -223,7 +223,7 @@ namespace Assets.Scenes.Ride.Scripts
this.gameObject.SetActive(false);
this.Destroy();
SceneManager.LoadScene("MainScene");
App.MainSceneParam["Name"] = "RaceHomePanel";
//App.MainSceneParam["Name"] = "RaceHomePanel";
}
private void OpenShare(BaseEventData baseEventData)
Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs
+8 -8
View File
@@ -220,14 +220,14 @@ namespace Assets.Scenes.Ride.Scripts
protected override void StopRide(BaseEventData baseEventData)
{
if (!App.MainSceneParam.ContainsKey("Name"))
{
App.MainSceneParam.Add("Name", "RaceHomePanel");
}
else
{
App.MainSceneParam["Name"] = "RaceHomePanel";
}
//if (!App.MainSceneParam.ContainsKey("Name"))
//{
// App.MainSceneParam.Add("Name", "RaceHomePanel");
//}
//else
//{
// App.MainSceneParam["Name"] = "RaceHomePanel";
//}
if (mainController.isWatch)
{
UIManager.ShowConfirm("Quit", "Do you want to quit?", async () =>