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

之前动画加上排名变化

Browse Source
This commit is contained in:
CaiYanPeng 2022-04-07 10:08:55 +08:00
parent 92d0579060
commit 95ab695632
4 changed files with 4763 additions and 4063 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
Assets/Resources/UI/Prefab/Panel/Mobile/RowerDevicePanel.prefab
View File

@ -13,6 +13,49 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mType: 2
--- !u!114 &2374286134688455127
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600129134975741725}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 374121944951327828}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &6820942701245574145
MonoBehaviour:
m_ObjectHideFlags: 0
@ -26,6 +69,49 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mType: 8
--- !u!114 &619076547355285759
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600129135100964347}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 374121944810376882}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &6820942700051256070
GameObject:
m_ObjectHideFlags: 0
@ -1157,6 +1243,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6820942701245574174}
m_PrefabAsset: {fileID: 0}
--- !u!114 &374121944810376882 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6600586907893162668, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
m_PrefabInstance: {fileID: 6820942701245574174}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600129135100964347}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6820942701388656376
PrefabInstance:
m_ObjectHideFlags: 0
@ -1732,3 +1830,15 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6820942701388656376}
m_PrefabAsset: {fileID: 0}
--- !u!114 &374121944951327828 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6600586907893162668, guid: 95d5b69c6ebb5f34bb864b2c0756d442,
type: 3}
m_PrefabInstance: {fileID: 6820942701388656376}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600129134975741725}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:

8637
Assets/Resources/UI/Prefab/Panel/Mobile/RowerPanel.prefab
View File

File diff suppressed because it is too large Load Diff

36
Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs
View File

@ -124,21 +124,13 @@ public class RowerDeviceView : MonoBehaviour
UIManager.AddEvent(mPairButton, EventTriggerType.PointerClick, new UnityAction<UnityEngine.EventSystems.BaseEventData>(e =>
{
if (deviceModal == null)
{
#if UNITY_IOS || UNITY_ANDROID
var obj = Resources.Load("UI/Prefab/Device/Mobile/ConnectDeviceModal");
#else
var obj = Resources.Load("UI/Prefab/Device/ConnectDeviceModal");
#endif
GameObject gameObject = (GameObject)Instantiate(obj);
deviceModal = gameObject.GetComponent<ConnectDeviceModal>();
}
deviceModal.SensorType = this.SensorType;
UIManager.Show(deviceModal, null, true);
connectButtonClick();
}));
UIManager.AddEvent(gameObject, EventTriggerType.PointerClick, b =>
{
if (!mPairButton.activeInHierarchy && !mDisconnectButton.activeInHierarchy) return;
connectButtonClick();
});
UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
//var device = GetDevice();
//if(device != null && device.State == DeviceState.Connected)
@ -156,9 +148,23 @@ public class RowerDeviceView : MonoBehaviour
deviceModal.SensorType = this.SensorType;
UIManager.Show(deviceModal, null, true);
}));
}
void connectButtonClick()
{
if (deviceModal == null)
{
#if UNITY_IOS || UNITY_ANDROID
var obj = Resources.Load("UI/Prefab/Device/Mobile/ConnectDeviceModal");
#else
var obj = Resources.Load("UI/Prefab/Device/ConnectDeviceModal");
#endif
GameObject gameObject = (GameObject)Instantiate(obj);
deviceModal = gameObject.GetComponent<ConnectDeviceModal>();
}
deviceModal.SensorType = this.SensorType;
UIManager.Show(deviceModal, null, true);
}
void InitLogo()
{
if (SensorType == SensorType.Power)

43
Assets/Scripts/UI/Prefab/Rower/RowerMultiModeScript.cs
View File

@ -125,8 +125,15 @@ public class RowerMultiModeScript : MonoBehaviour
userList = userList.OrderByDescending(x => x.currentDistance).ToList();
for (int i = 0; i < userList.Count; i++)
{
userList[i].currentRank = i + 1;
int rank = i + 1, userId = userList[i].UserId;
if (rankDiffDict.ContainsKey(userId))
{
rankDiffDict[userId].rank = rank;
rankDiffDict[userId].diff = userList[i].currentRank - rank;
}
userList[i].currentRank = rank;
}
print(string.Join(",", rankDiffDict.Select(x => x.Value.diff)));
}
private List<TraceData> HandleData()
{
@ -149,7 +156,12 @@ public class RowerMultiModeScript : MonoBehaviour
List<TraceData> userList;
TraceData myData;
public List<RowerRank> shadowList { get; private set; }
public class RankDiff
{
public int rank { get; set; }
public int diff { get; set; }
}
public Dictionary<int, RankDiff> rankDiffDict;
public async void GetShadowList(RowerTaskPanel.RowerType rowerType)
{
this.rowerType = rowerType;
@ -177,9 +189,11 @@ public class RowerMultiModeScript : MonoBehaviour
myData.Country = App.CurrentUser.Country;
_tmpList.Add(myData);
userList = _tmpList.OrderByDescending(x => x.currentDistance).ToList();
rankDiffDict = new Dictionary<int, RankDiff>();
for (int i = 0; i < userList.Count; i++)
{
userList[i].currentRank = i + 1;
rankDiffDict.Add(userList[i].UserId, new RankDiff { rank = userList[i].currentRank, diff = 0 });
}
DisplayUserRanks(true);
DisplayTraces();
@ -258,7 +272,13 @@ public class RowerMultiModeScript : MonoBehaviour
var tmp = traceList[i].trace.DOLocalRotate(new Vector3(90, 0, 0), 0.3f);
tmp.onComplete = callback;
sq1.Append(tmp);
sq1.Append(traceList[i].trace.DOLocalRotate(new Vector3(0, 0, 0), 0.3f));
//var sq2 = DOTween.Sequence();
//sq2.Append(t.GetComponent<Image>().DOFade(1, 0.05f));
//sq2.Append(t.GetComponent<Image>().DOFade(0, 0.05f));
//sq1.Append(sq2);
sq.Join(sq1);
}
else
@ -314,6 +334,25 @@ public class RowerMultiModeScript : MonoBehaviour
t.Find("Main/Boat").localPosition = new Vector3(-21.5f, t.Find("Main/Boat").localPosition.y, t.Find("Main/Boat").localPosition.z);
t.Find("Main/Boat").gameObject.SetActive(false);
}
var diffTransfrom = transform.Find("Rower/Modes/Scroll/M2/Track/RankDiff"+t.name).GetComponent<Text>();
if (rankDiffDict[data.UserId].diff > 0)
{
diffTransfrom.text = "+" + rankDiffDict[data.UserId].diff;
var rankDiffSQ = DOTween.Sequence();
rankDiffSQ.Append(diffTransfrom.DOColor(Utils.HexToColorHtml("#bd362bff"), 0.3f));
rankDiffSQ.AppendInterval(0.4f);
rankDiffSQ.Append(diffTransfrom.DOColor(Utils.HexToColorHtml("#ffffff00"), 0.3f));
sq.Join(rankDiffSQ);
}
else if (rankDiffDict[data.UserId].diff < 0)
{
diffTransfrom.text = "" + rankDiffDict[data.UserId].diff;
var rankDiffSQ = DOTween.Sequence();
rankDiffSQ.Append(diffTransfrom.DOColor(Utils.HexToColorHtml("#27bac0ff"), 0.3f));
rankDiffSQ.AppendInterval(0.4f);
rankDiffSQ.Append(diffTransfrom.DOColor(Utils.HexToColorHtml("#ffffff00"), 0.3f));
sq.Join(rankDiffSQ);
}
sq.Play();
}
for (; i < traceList.Count; i++)