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

This commit is contained in:
lishuo committed 2022-01-25 09:28:20 +08:00
commit 5340d3d58b
17 files changed
+1341 -99

No files matched your search

@@ -99,7 +99,7 @@ namespace Assets.Scenes.Ride.Scripts
this.routeId = routeId;
this.content = content;
}
public LinkedMessageEvent(int routeId, string content,string avatar,string nickname,string routeName)
public LinkedMessageEvent(int routeId, string content, string avatar, string nickname, string routeName)
{
this.routeId = routeId;
this.content = content;
@@ -107,6 +107,14 @@ namespace Assets.Scenes.Ride.Scripts
this.nickname = nickname;
this.routeName = routeName;
}
public LinkedMessageEvent(LinkedMessageEvent data)
{
this.routeId = data.routeId;
this.content = data.content;
this.avatar = data.avatar;
this.nickname = data.nickname;
this.routeName = data.routeName;
}
private void CreateContent()
{