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

微调

Browse Source
This commit is contained in:
lishuo 2021-09-16 15:59:08 +08:00
parent d7486c920c
commit bd8089d0a9
7 changed files with 176 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Resources/Mobile.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f134d222725933a4a8aa79fee0ebc10c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

166
Assets/Resources/UI/Prefab/Match/Mobile/CompetitionRankingPanel.prefab
View File

@ -1198,6 +1198,154 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &2283787345660483581
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6423625325705635073}
- component: {fileID: 4531745665127287154}
- component: {fileID: 7308095754115315935}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6423625325705635073
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2283787345660483581}
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: 7859116899586470020}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 6.5, y: 0}
m_SizeDelta: {x: 13, y: 13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4531745665127287154
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2283787345660483581}
m_CullTransparentMesh: 0
--- !u!114 &7308095754115315935
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2283787345660483581}
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: 2bcb6d88672d8424a87b5b9dc1f02586, 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
--- !u!1 &2761378862937300447
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6046419665604819465}
- component: {fileID: 4481945714566294365}
- component: {fileID: 1272412652630567774}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6046419665604819465
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2761378862937300447}
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: 6236766253614434138}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -6.5, y: 0}
m_SizeDelta: {x: 13, y: 13}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4481945714566294365
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2761378862937300447}
m_CullTransparentMesh: 0
--- !u!114 &1272412652630567774
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2761378862937300447}
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: 6ea9e25fc2daef141b55b07acb8c02c3, 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
--- !u!1 &4249898995055343501
GameObject:
m_ObjectHideFlags: 0
@ -1399,13 +1547,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5487564717254417890}
- {fileID: 6423625325705635073}
m_Father: {fileID: 341053727791543537}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -32.2, y: 14.7}
m_SizeDelta: {x: 12, y: 12}
m_AnchoredPosition: {x: -30, y: 16.150002}
m_SizeDelta: {x: 30, y: 15}
m_Pivot: {x: 0, y: 1}
--- !u!222 &546622938314080471
CanvasRenderer:
@ -1428,13 +1577,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2bcb6d88672d8424a87b5b9dc1f02586, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1531,13 +1680,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8627770961843808828}
- {fileID: 6046419665604819465}
m_Father: {fileID: 341053727791543537}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 20.1, y: 14.7}
m_SizeDelta: {x: 12, y: 12}
m_AnchoredPosition: {x: -0.000022888184, y: 16.149994}
m_SizeDelta: {x: 30, y: 15}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4326198210780559113
CanvasRenderer:
@ -1560,13 +1710,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6ea9e25fc2daef141b55b07acb8c02c3, type: 3}
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

5
Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs
View File

@ -492,7 +492,10 @@ namespace Assets.Scenes.Ride.Scripts
//切换视角
public void ChangeView(BaseEventData baseEventData)
{
mainController.ChangeMapImageStyle(arrow.gameObject);
if (viewButton.interactable)
{
mainController.ChangeMapImageStyle(arrow.gameObject);
}
}
//结束游戏
protected virtual void StopRide(BaseEventData baseEventData)

11
Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs
View File

@ -493,10 +493,13 @@ public class CyclingController : DeviceServiceMonoBase
onlinePlayerController.SetDataSource(onlineTotalDistance, onlineDistance, onlineRider.Power, onlineRider.HeartRate, onlineRider.Cadence, onlineRider.TotalTicks, onlineRider.NickName, onlineRider.WeightKg, new Vector2d(onlineRider.Point.Latitude, onlineRider.Point.Longitude),index);
onlinePlayerController.SetHead(onlineRider.WxHeadImg);
//小地图人物
GameObject miniPlayer = (GameObject)Instantiate(miniMapPlayerPrefab, transform);
var miniController = miniPlayer.GetComponent<MiniMapPlayerController>();
miniController.SetController(onlinePlayerController);
if (competitionId == 0)
{
//小地图人物
GameObject miniPlayer = (GameObject)Instantiate(miniMapPlayerPrefab, transform);
var miniController = miniPlayer.GetComponent<MiniMapPlayerController>();
miniController.SetController(onlinePlayerController);
}
//发消息xx进入路书
if(messageIndex > 0)
EventQueueSystem.QueueEvent(new JoinMessageEvent(onlineRider.NickName, onlineRider.WxHeadImg));

1
Assets/Scripts/UI/Prefab/Panel/BigMapController.cs
View File

@ -450,6 +450,7 @@ public class BigMapController : PFUIPanel
var position = line.BeginMarker.transform.position;
//position.z += 25;
position = DefaultPosition();
tips.Show(position, line.Model);
foreach (var item in linesCache)

2
Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs
View File

@ -53,7 +53,7 @@ namespace Assets.Scenes.Ride.Scripts
public void Set(DateTime startTime, DateTime now,string title, string sceneName, int competitionId,int routeId)
{
ticks = (int)(startTime - now).TotalSeconds;
var content = $"Your <color='#F93086'>{title}</color> race about to start";
var content = $"Your <color='#F93086'>{Helper.SubStr(title,10)}</color> race about to start";
Content.text = content;
CompetitionId = competitionId;
RouteId = routeId;

5
Assets/Scripts/Utils/Utils.cs
View File

@ -177,6 +177,11 @@ namespace Assets.Scripts
newLoading.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newLoading.transform.SetParent(game.transform);
loading = newLoading.transform;
#if UNITY_IOS || UNITY_ANDROID
loading.localScale = new Vector3(2, 2, 2);
#else
loading.localScale = new Vector3(1, 1, 1);
#endif
}
loading.GetComponent<LoadingPf>().Show();
}