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

一波小改动

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-12-30 16:51:04 +08:00
1 parent c5500c269f
commit 333c99fb46
18 files changed
+480 -137
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/MainController.cs
+41 -25
View File
@@ -37,6 +37,7 @@ public class MainController : BaseScene
rectTransform.anchorMax = Vector2.one;
rectTransform.offsetMin = Vector2.zero;
rectTransform.offsetMax = Vector2.zero;
transform.Find("GameObject/Version").gameObject.SetActive(false);
//var rect1 = transform.Find("GameObject").GetComponent<RectTransform>();
//rect1.anchorMin = Vector2.zero;
//rect1.anchorMax = Vector2.one;
@@ -175,15 +176,16 @@ public class MainController : BaseScene
if (msgIndex >= 6) //
{
//msgIndex = 0;
//m.transform.DOLocalMoveY(m.transform.localPosition.y - 38, 0.5f);
foreach (var item in msgs)
{
item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f);
}
m.DOFade(0, 0.5f).onComplete = () =>
{
SetMessage(m, e);
m.transform.localPosition = 1 * msgLocation;
m.DOFade(1, 0.5f);
foreach (var item in msgs.Where((x, i) => i != selectIndex))
{
item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f);
}
};
}
else
@@ -197,6 +199,7 @@ public class MainController : BaseScene
}
m.DOFade(1, 0.5f);
}
m.transform.SetAsLastSibling();
msgIndex++;
}
@@ -214,7 +217,12 @@ public class MainController : BaseScene
#else
if (!(bool)sender)
{
FinishMessage6();
//FinishMessage6();
transform.Find("GameObject").SetAsFirstSibling();
}
else
{
transform.Find("GameObject").SetSiblingIndex(1);
}
#endif
}
@@ -253,15 +261,23 @@ public class MainController : BaseScene
{
if (e.routeId > 0)
{
App.RouteIdParam = e.routeId;
SceneManager.LoadScene("Ride");
UIManager.ShowConfirm(App.GetLocalString("RIDE NOW"), App.GetLocalLanguage() == "zh"? $"<color=#fff>是否要加入</color><color=#f93086>{e.routeName}</color><color=#fff>骑行？</color>" :$"<color=#fff>Join</color> <color=#f93086>{e.routeName}</color><color=#fff>?</color>", () =>
{
App.RouteIdParam = e.routeId;
SceneManager.LoadScene("Ride");
});
}
//Debug.Log(e.routeId);
});
m.transform.Find("Avatar").GetComponent<RawImage>().texture = null;
Utils.DisplayHead(m.transform.Find("Avatar").GetComponent<RawImage>(), e.avatar);
m.transform.Find("Nickname").GetComponent<Text>().text = e.nickname;
m.transform.Find("Content").GetComponent<Text>().text = e.content;
var txt = m.transform.Find("TextContainer/Content").GetComponent<RectTransform>();
txt.GetComponent<Text>().text = e.content;
LayoutRebuilder.ForceRebuildLayoutImmediate(txt);
Debug.Log(e.content + txt.sizeDelta.x);
m.GetComponent<HomeMessageController>().isAnimated = false;
m.GetComponent<HomeMessageController>().textWidth = txt.sizeDelta.x;
}
CanvasGroup msg;
void fade0()
@@ -387,51 +403,51 @@ public class MainController : BaseScene
var message = "";
if (item.TotalTicks == 0)
{
message = lang=="zh"?$"发起了对<color=#ff2742>{item.RouteName}</color>的挑战": $"start a challenge to the<color=#ff2742>{item.RouteName}</color>";
message = lang=="zh"?$"发起了对<color=#f93086>{item.RouteName}</color>的挑战！" : $"started riding <color=#f93086>{item.RouteName}</color>!";
}
if (item.IsCompleted)
{
message = lang == "zh" ? $"完成了<color=#ff2742>{item.RouteName}</color>的挑战": $"completed the challenge of the<color=#ff2742>{item.RouteName}</color>";
message = lang == "zh" ? $"完成了<color=#f93086>{item.RouteName}</color>的挑战！" : $"completed <color=#f93086>{item.RouteName}</color> ride!";
}
if (!string.IsNullOrEmpty(message))
{
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}");
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name,item.RouteName), $"{item.RouteId}{item.Name}");
}
}
if (item.Point[0] == -1d)
if (item.Point!=null && item.Point.Length>0 && item.Point[0] == -1d)
{
var message = $"{item.Name}上线了";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.Id}{item.LastActiveTime}{item.Point}");
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}");
}
//距离50
if (item.EndDistance >= 50)
{
var message = lang == "zh" ? $"在骑行过程中突破了<color=#00ff00>{"50KM"}</color>的挑战" : $"distance up to <color=#00ff00>{"50KM"}</color> during riding!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM");
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=#00ff00>{"100KM"}</color>的挑战": $"distance up to <color=#00ff00>{"100KM"}</color> during riding!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM");
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
if (item.Speed >= 35)
{
var message = lang == "zh" ? $"在骑行过程中速度达到了惊人的<color=#ff0000>{Math.Round(item.Speed, 2)}</color>KM/H": $"speed up to <color=#ff0000>{Math.Round(item.Speed, 2)}</color>KM/H during riding!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}35KM/H");
var message = lang == "zh" ? $"骑行速度突破<color=#e3d427>{Math.Round(item.Speed, 2)}</color>KM/H！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}</color>KM/H!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H");
}
//速度50
if (item.Speed >= 50)
{
var message = lang == "zh" ? $"在骑行过程中速度达到了惊人的<color=#ff0000>{Math.Round(item.Speed,2)}</color>KM/H" : $"speed up to <color=#ff0000>{Math.Round(item.Speed, 2)}</color>KM/H during riding!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}50KM/H");
var message = lang == "zh" ? $"骑行速度突破<color=#e3d427>{Math.Round(item.Speed,2)}</color>KM/H！" : $"riding speed reaches <color=#e3d427>{Math.Round(item.Speed, 2)}</color>KM/H!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H");
}
//功体比
if (item.WeightKg >= 3)
{
var message = lang == "zh" ? $"在骑行过程中功体比达到了惊人的<color=#0000ff>{Math.Round(item.WeightKg, 2)}</color>w/kg": $"w/kg up to <color=#0000ff>{Math.Round(item.WeightKg, 2)}</color>w/kg during riding!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name), $"{item.RouteId}{item.Name}3WeightKg");
var message = lang == "zh" ? $"骑行功体比突破<color=#e3d427>{Math.Round(item.WeightKg, 2)}</color>w/kg！" : $" riding w/kg reaches <color=#e3d427>{Math.Round(item.WeightKg, 2)}</color>w/kg!";
EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg");
}
}
}
@@ -451,7 +467,7 @@ public class MainController : BaseScene
{
foreach (var item in res.data)
{
EventQueueSystem.QueueEvent(new LinkedMessageEvent(-1, item.Message, item.WxHeadImg, item.NickName));
EventQueueSystem.QueueEvent(new LinkedMessageEvent(-1, item.Message, item.WxHeadImg, item.NickName,null));
}
}
}
Assets/Scripts/Scenes/Ride/Scripts/MessagePanelScript.cs
+3 -1
View File
@@ -90,6 +90,7 @@ namespace Assets.Scenes.Ride.Scripts
public class LinkedMessageEvent : GameEvent
{
public int routeId;//线路Id
public string routeName;
public string content;//消息
public string avatar;
public string nickname;
@@ -98,12 +99,13 @@ namespace Assets.Scenes.Ride.Scripts
this.routeId = routeId;
this.content = content;
}
public LinkedMessageEvent(int routeId, string content,string avatar,string nickname)
public LinkedMessageEvent(int routeId, string content,string avatar,string nickname,string routeName)
{
this.routeId = routeId;
this.content = content;
this.avatar = avatar;
this.nickname = nickname;
this.routeName = routeName;
}
private void CreateContent()