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/Apis/MapApi.cs
+6
View File
@@ -205,6 +205,12 @@ namespace Assets.Scripts.Apis
return result;
}
public async Task<JsonResult<MapRouteAreaItem>> GetMapRouteAreaDetailItem(int id)
{
var result = await GetAsync<JsonResult<MapRouteAreaItem>>($"MapRouteArea/GetDetail?areaId={id}");
return result;
}
public async Task<JsonResult<List<MapMaxRanking>>> GetMaxRanking()
{
var result = await GetAsync<JsonResult<List<MapMaxRanking>>>($"Map/GetMaxRanking");
Assets/Scripts/Apis/Models/MapRouteArea.cs
+2
View File
@@ -139,6 +139,8 @@ namespace Assets.Scripts.Apis.Models
/// </summary>
public DateTime UpdateTime { get; set; }
public bool IsFav { get; set; }
public string CreateUserHead { get; set; }
public string CreateUserName { get; set; }
}
public class MapRouteAreaRouteList
Assets/Scripts/App.cs
+2 -2
View File
@@ -197,8 +197,8 @@ public static class App
#else
//Host = "http://pf.juze.pro/";
//Host = "http://192.168.0.101:5087/";
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
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
if (!FB.IsInitialized)
{
Assets/Scripts/Mobile/LoginControllerMobile.cs
+1 -1
View File
@@ -62,7 +62,7 @@ public class LoginControllerMobile : MonoBehaviour, INativeOnMobileWxLoginResp
});
UIManager.AddEvent(transform.Find("Panel/LoginContainer/LoginScrollView/Viewport/Content/FormContainer-Login/Mask/FormContainer/otherContainer/Google").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
{
Utils.CallAndroidMethod("signInWithGoogle");
//Utils.CallAndroidMethod("signInWithGoogle");
});
//App.weChatController.Init(App.WxAppId);
//var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString();
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 () =>
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+52 -11
View File
@@ -292,28 +292,69 @@ public class HomeController : PFUIPanel
GetMaxRanking();
maxt += 60f;
}
if (maxdataTime > 0)
{
maxdataTime -= Time.deltaTime;
}
else if (maxdataTime < 0)
{
DORotateMaxData();
maxdataTime += 3;
}
}
private async void GetMaxRanking()
{
var res = await ConfigHelper.mapApi.GetMaxRanking();
if (res.result)
{
var list = res.data;
if (list.Count >= 3)
maxList = res.data;
if (maxList.Count >= 3)
{
Transform p = transform.Find("MaxRankingData/Power"),
d = transform.Find("MaxRankingData/Distance"),
c = transform.Find("MaxRankingData/Climb");
Utils.DisplayHead(p.Find("Avatar").GetComponent<RawImage>(), list[1].WxHeadImg);
Utils.DisplayHead(d.Find("Avatar").GetComponent<RawImage>(), list[0].WxHeadImg);
Utils.DisplayHead(c.Find("Avatar").GetComponent<RawImage>(), list[2].WxHeadImg);
p.Find("NickName").GetComponent<Text>().text = list[1].NickName;
d.Find("NickName").GetComponent<Text>().text = list[0].NickName;
c.Find("NickName").GetComponent<Text>().text = list[2].NickName;
maxdataTime = 3;
maxdataIndex = 0;
SetMessage(maxList[maxdataIndex++]);
//Transform p = transform.Find("MaxRankingData/Power"),
//d = transform.Find("MaxRankingData/Distance"),
//c = transform.Find("MaxRankingData/Climb");
//Utils.DisplayHead(p.Find("Avatar").GetComponent<RawImage>(), list[1].WxHeadImg);
//Utils.DisplayHead(d.Find("Avatar").GetComponent<RawImage>(), list[0].WxHeadImg);
//Utils.DisplayHead(c.Find("Avatar").GetComponent<RawImage>(), list[2].WxHeadImg);
//p.Find("NickName").GetComponent<Text>().text = list[1].NickName;
//d.Find("NickName").GetComponent<Text>().text = list[0].NickName;
//c.Find("NickName").GetComponent<Text>().text = list[2].NickName;
}
}
}
int maxdataIndex = 0;
float maxdataTime = 0;
private List<MapMaxRanking> maxList;
private void DORotateMaxData()
{
var t = transform.Find("MaxRankingData");
var se = DOTween.Sequence();
var s1 = t.DORotate(new Vector3(-90, 0, 0), 0.5f);
s1.onComplete = () =>
{
SetMessage(maxList[(maxdataIndex++) % maxList.Count]);
};
se.Append(s1);
se.Append(t.DORotate(Vector3.zero, 0.5f));
}
void SetMessage(MapMaxRanking e)
{
var m = transform.Find("MaxRankingData");
Utils.DisplayHead(m.transform.Find("Avatar").GetComponent<RawImage>(), e.WxHeadImg);
m.transform.Find("Nickname").GetComponent<Text>().text = e.NickName;
var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
txt.GetComponent<Text>().text = e.Message;
LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
m.GetComponent<HomeMessageController>().Initial();
m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
}
public override void Show()
{
base.Show();
Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
+3
View File
@@ -187,6 +187,7 @@ public class NewRouteDetailController : PFUIPanel
Debug.Log(153 + area.IsFav.ToString());
left.Find("Name").GetComponent<Text>().text = area.Name;
GetData();
GetList();
@@ -255,6 +256,8 @@ public class NewRouteDetailController : PFUIPanel
.text = $"{res.data.AverageGrade.ToString("#0.00")}%";
transform.Find("Container/Left/DescScroll/Viewport/Content/Desc").GetComponent<Text>()
.text = res.data.Description;
Utils.DisplayImageTempDict(transform.Find("Container/Left/Create/Avatar").GetComponent<RawImage>(), res.data.CreateUserHead, caches);
transform.Find("Container/Left/Create/Name").GetComponent<Text>().text = res.data.CreateUserName;
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/DescScroll").GetComponent<ScrollRect>().content);
transform.Find("Container/Left/Fav").GetComponent<Image>().sprite = FavDict[res.data.IsFav];
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.Find("Container/Left/RideContainer").GetComponent<RectTransform>());
Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
+17 -1
View File
@@ -48,7 +48,15 @@ public class RaceButtonGroupScript : MonoBehaviour
}
void GoEnter()
{
App.RouteIdParam = map.RouteId;
if (App.MainSceneParam.ContainsKey("Name"))
{
App.MainSceneParam["Name"] = "RaceHomePanel";
}
else
{
App.MainSceneParam.Add("Name", "RaceHomePanel");
}
App.RouteIdParam = map.RouteId;
App.CompetionId = map.Id;
SceneManager.LoadScene("Ride");
}
@@ -66,6 +74,14 @@ public class RaceButtonGroupScript : MonoBehaviour
}
void GoWatch()
{
if (App.MainSceneParam.ContainsKey("Name"))
{
App.MainSceneParam["Name"] = "RaceHomePanel";
}
else
{
App.MainSceneParam.Add("Name", "RaceHomePanel");
}
App.RouteIdParam = map.RouteId;
App.CompetionId = map.Id;
SceneManager.LoadScene("Ride");