人物动画调整&UI界面细节调整

This commit is contained in:
lishuo 2022-04-02 18:26:18 +08:00
parent cd1d67d9e8
commit efdc95ed3d
17 changed files with 2866 additions and 1544 deletions

View File

@ -47,7 +47,7 @@ ModelImporter:
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName: wheel_backward
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
@ -278,9 +278,9 @@ ModelImporter:
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 1
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
@ -295,7 +295,7 @@ ModelImporter:
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 11
additiveReferencePoseFrame: 0
- serializedVersion: 16
name: StartRide
takeName: Take 001

View File

@ -29,14 +29,15 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 7059428009422344299}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 49.999996}
m_SizeDelta: {x: 16.13, y: 22}
m_SizeDelta: {x: 10.08, y: 14}
m_Pivot: {x: 0, y: 0}
--- !u!222 &2067262334617371881
CanvasRenderer:
@ -87,3 +88,77 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1092a970c15e99c47b4fce5495b5a7f2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8794483272824311696
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7059428009422344299}
- component: {fileID: 6567413963156607631}
- component: {fileID: 1061149481108037856}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &7059428009422344299
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8794483272824311696}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2067262334617371879}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 16.13, y: 22}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6567413963156607631
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8794483272824311696}
m_CullTransparentMesh: 0
--- !u!114 &1061149481108037856
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8794483272824311696}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: eab6d6d13749eb94cb5ca787d1280ad5, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

View File

@ -30,7 +30,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@ -104,6 +104,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 997880171476640055}
- {fileID: 3176015641592975076}
- {fileID: 356461756298577400}
- {fileID: 356461756806036589}
- {fileID: 356461757142253271}
@ -183,6 +184,7 @@ MonoBehaviour:
nameLabel: {fileID: 356461757142253270}
genderLabel: {fileID: 356461757161456313}
idLabel: {fileID: 356461756806036588}
master: {fileID: 2140202266184974615}
Id:
Rank:
Name:
@ -259,7 +261,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@ -337,7 +339,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -415,7 +417,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -463,6 +465,94 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: 0M
--- !u!1 &2140202266184974615
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3176015641592975076}
- component: {fileID: 1710582543769925531}
- component: {fileID: 543933591907254851}
- component: {fileID: 3595558350832868301}
m_Layer: 5
m_Name: Master
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3176015641592975076
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2140202266184974615}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 226, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1710582543769925531
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2140202266184974615}
m_CullTransparentMesh: 0
--- !u!114 &543933591907254851
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2140202266184974615}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0.6509804}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3595558350832868301
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2140202266184974615}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 20
--- !u!1 &3639242128612966977
GameObject:
m_ObjectHideFlags: 0
@ -493,7 +583,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
@ -652,7 +742,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356461756423929917}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}

View File

@ -18241,7 +18241,7 @@ Transform:
m_GameObject: {fileID: 7920966205500188480}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 3808671237483285868}
- {fileID: 5209491114566589464}
@ -18583,8 +18583,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a56584ff2ae65dd43af5e8299544f32f, type: 3}
m_Name:
m_EditorClassIdentifier:
UserId: 0
UserName:
weight: 0
speed: 0
power: 0
cadance: 0
wkg: 0
ticks: 0
totalDistance: 0
currentSlope: 0
distance: 0
totalClimb: 0
currentIndex: 0
--- !u!1 &7930809532632780446
GameObject:
m_ObjectHideFlags: 0

View File

@ -18226,7 +18226,7 @@ GameObject:
- component: {fileID: 4544646319704206804}
- component: {fileID: 4544646319704206803}
m_Layer: 0
m_Name: VidePlayer
m_Name: VideoPlayer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -18241,7 +18241,7 @@ Transform:
m_GameObject: {fileID: 7920966205500188480}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 3808671237483285868}
- {fileID: 5209491114566589464}
@ -18583,8 +18583,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 21a384a3224d3b248b1d79d68a1e7578, type: 3}
m_Name:
m_EditorClassIdentifier:
UserId: 0
UserName:
weight: 0
speed: 0
power: 0
cadance: 0
wkg: 0
ticks: 0
totalDistance: 0
currentSlope: 0
distance: 0
totalClimb: 0
currentIndex: 0
--- !u!1 &7930809532632780446
GameObject:
m_ObjectHideFlags: 0

View File

@ -1,9 +1,10 @@
347~663:-5
1040~1200:-5
2000~2300:20
1370~1500:-5
2100~2250:25
3290~3425:35
6000~6100:35
9510~9620:-15
9510~9600:-15
11822~12064:-5
12200~12514:5
12514~12644:-5

View File

@ -319,6 +319,7 @@
"Latest Version:": "最新版本:",
"Confirm participation": "确认参加活动",
"Week": "周",
"You're watching": "你正在观看"
},
"en": {
"HOT ROUTES": "HOT ROUTES",
@ -632,5 +633,6 @@
"Latest Version:": "Latest Version:",
"Confirm participation": "Confirm participation",
"Week": "Week",
"You're watching": "You're watching"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -318,7 +318,7 @@ namespace Assets.Scripts.Scenes.VideoRide
if (head != null)
{
//它们的乘积就是高度
Vector3 worldPosition = new Vector3(transform.position.x, transform.position.y+2, transform.position.z);
Vector3 worldPosition = new Vector3(transform.position.x, transform.position.y+1.5f, transform.position.z);
var playerScreenPos = Camera.main.WorldToScreenPoint(worldPosition);
head.transform.position = playerScreenPos;
ftpImage.fillAmount = (float)(wkg / 6);

View File

@ -15,6 +15,7 @@ namespace Assets.Scripts.Scenes.VideoRide
public Text nameLabel;
public Text genderLabel;
public Text idLabel;
public GameObject master;
//Model
private ContactInfo _contactInfo;
@ -63,12 +64,14 @@ namespace Assets.Scripts.Scenes.VideoRide
nameLabel.text = contactInfo.Name;
genderLabel.text = contactInfo.Gender;
idLabel.text = contactInfo.id;
//master.SetActive(manager.CurrentPlayer.UserId.ToString() == contactInfo.id);
}
public void UpdateItem(string name,string gender,string id)
{
nameLabel.text = name;
genderLabel.text = gender;
idLabel.text = id;
master.SetActive(manager.CurrentPlayer?.UserId.ToString() == id);
}
private void ButtonListener()
{

View File

@ -12,16 +12,25 @@ namespace Assets.Scripts.Scenes.VideoRide
Text btnRideNum { get; set; }
GameObject Hide { get; set; }
GameObject Show { get; set; }
VideoPlayer videoPlayer { get; set; }
private bool isAnimating = false;
VerticalLayoutGroup group { get; set; }
GameObject stickyItem { get; set; }
VideoGameManager manager { get; set; }
RectTransform viewRec { get; set; }
private void Start()
{
rideNum = transform.Find("Head/RideNum/Number").GetComponent<Text>();
btnRideNum = transform.Find("Head/Show/Panel/Number").GetComponent<Text>();
Hide = transform.Find("Head/Hide").gameObject;
Show = transform.Find("Head/Show").gameObject;
var viewPort = transform.Find("List/Viewport");
stickyItem = transform.Find("List/VideoPlayerInfo").gameObject;
UIManager.AddEvent(Hide, UnityEngine.EventSystems.EventTriggerType.PointerClick, Hidehandler);
UIManager.AddEvent(Show, UnityEngine.EventSystems.EventTriggerType.PointerClick, Showhandler);
manager = FindObjectOfType<VideoGameManager>();
viewRec = ((RectTransform)viewPort);
}
public void Hidehandler(BaseEventData data)
{
@ -52,6 +61,18 @@ namespace Assets.Scripts.Scenes.VideoRide
while (timer < 0) {
rideNum.text = $"{MapUDPService.GetAllOnlineUserCount()}";
btnRideNum.text = rideNum.text;
if (manager._aRMode == VideoGameManager.ARMode.RIDE)
{
stickyItem.SetActive(true);
viewRec.DOLocalMoveY(256, 0f);
viewRec.DOSizeDelta(new Vector2(viewRec.sizeDelta.x, 546), 0);
}
else
{
stickyItem.SetActive(false);
viewRec.DOLocalMoveY(300, 0f);
viewRec.DOSizeDelta(new Vector2(viewRec.sizeDelta.x,590f), 0);
}
timer += 1f;
}
}

View File

@ -55,31 +55,37 @@ namespace Assets.Scripts.Scenes.VideoRide
_contactList.Add(obj);
}
}
float timer = 1f;
float timer = 0.5f;
private void Update()
{
var currenList = FindObjectsOfType<ListItem>();//当前列表
var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);//最新列表
foreach (ListItem o in currenList)
timer -= Time.deltaTime;
while (timer < 0)
{
var needUpdate = list.Where(c => c.Id.ToString() == o.Id).FirstOrDefault();
if (needUpdate != null)
var currenList = FindObjectsOfType<ListItem>();//当前列表
var list = MapUDPService.GetOnlineUsers(App.RouteIdParam);//最新列表
foreach (ListItem o in currenList)
{
o.gameObject.SetActive(true);
o.UpdateItem(needUpdate.Name, needUpdate.LastActiveTime.ToShortTimeString(), needUpdate.Id.ToString());
var needUpdate = list.Where(c => c.Id.ToString() == o.Id).FirstOrDefault();
if (needUpdate != null)
{
o.gameObject.SetActive(true);
o.UpdateItem(needUpdate.Name, needUpdate.LastActiveTime.ToShortTimeString(), needUpdate.Id.ToString());
}
else
{
o.gameObject.SetActive(false);
}
}
else
if (currenList.Count() == 0 && list.Count() > 0)
{
o.gameObject.SetActive(false);
}
}
if (currenList.Count() == 0 && list.Count() > 0)
{
InitData();
if (_recyclableScrollRect.SelfInitialize)
{
_recyclableScrollRect.ReloadData();
InitData();
if (_recyclableScrollRect.SelfInitialize)
{
_recyclableScrollRect.ReloadData();
}
}
timer += 0.5f;
}
}

View File

@ -10,7 +10,7 @@ namespace Assets.Scripts.Scenes.VideoRide
{
public class OnlineVideoPlayer : AbstractVideoPlayer
{
public double diff { get; set; }
public double diff;
protected override void Update()
{
base.Update();
@ -30,7 +30,7 @@ namespace Assets.Scripts.Scenes.VideoRide
{
Destroy();
}
var z = current.transform.position.z + diff;
var z = current.transform.position.z + diff * 0.5;
transform.DOMoveZ((float)z, 1f);
Push();
}
@ -107,7 +107,6 @@ namespace Assets.Scripts.Scenes.VideoRide
{
this.wkg = 2.3d;
this.UserName = name;
this.speed = 10;
this.cadance = cadance;
this.totalDistance = totalDistance;
this.heartRate = (int?)heartRate;

View File

@ -13,7 +13,8 @@ namespace Assets.Scripts.Scenes.VideoRide
{
GameObject Hide { get; set; }
GameObject Show { get; set; }
VideoGameManager manager { get; set; }
VideoGameManager manager { get; set; }
private bool isAnimating = false;
private void Start()
{
Hide = transform.Find("Head/Hide").gameObject;
@ -43,17 +44,24 @@ namespace Assets.Scripts.Scenes.VideoRide
}
public void Hidehandler(BaseEventData data)
{
if (isAnimating)
return;
isAnimating = true;
transform.DOLocalMoveX(-913, 1f).onComplete+=()=> {
Show.SetActive(true);
Hide.SetActive(false);
isAnimating = false;
};
}
public void Showhandler(BaseEventData data)
{
if (isAnimating)
return;
isAnimating = true;
Show.SetActive(false);
Hide.SetActive(true);
transform.DOLocalMoveX(-667, 1f).onComplete += () => {
isAnimating = false;
};
}
}

View File

@ -0,0 +1,40 @@
using PolyAndCode.UI;
using System;
using System.Linq;
using UnityEngine;
using UnityEngine.UI;
namespace Assets.Scripts.Scenes.VideoRide
{
public class StickyListItem : MonoBehaviour, ICell
{
//UI
public Text nameLabel;
public Text distanceLabel;
public GameObject master;
//Model
private ContactInfo _contactInfo;
private int _cellIndex;
public string Id;
public string Rank;
public string Name;
private VideoPlayer videoPlayer { get; set; }
private float timer = 1f;
private void Update()
{
timer -= Time.deltaTime;
while (timer < 0)
{
videoPlayer = FindObjectOfType<VideoPlayer>();
if (videoPlayer != null)
{
nameLabel.text = videoPlayer.UserName;
distanceLabel.text = videoPlayer.totalDistance.ToString("f1");
Id = videoPlayer.UserId.ToString();
}
timer += 1f;
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c5b781a8c7954144ea7de573333f09ed
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -15,6 +15,8 @@ namespace Assets.Scripts.Scenes.VideoRide
base.Start();
animator.Play("idle");
power = 200;;
UserId = App.CurrentUser.Id;
UserName = App.CurrentUser.Nickname;
}
protected override void Update()