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-07-26 14:09:21 +08:00
parent ac59808915
commit 1f3485846f
14 changed files with 2617 additions and 2537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/Resources/UI/Prefab/Match/CompetitionRankingPanel.prefab
View File

@ -1306,7 +1306,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5487564717254417890
RectTransform:
m_ObjectHideFlags: 0
@ -1380,7 +1380,6 @@ GameObject:
- component: {fileID: 6022397314978962947}
- component: {fileID: 2340469066287001729}
- component: {fileID: 5881611388706824857}
- component: {fileID: 3587333496882306719}
m_Layer: 5
m_Name: Next
m_TagString: Untagged
@ -1429,14 +1428,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
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: 0}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 2bcb6d88672d8424a87b5b9dc1f02586, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -1500,19 +1499,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a96e12724c645a498af7c9434c9170f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3587333496882306719
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5838679695073563080}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 12
--- !u!1 &7681848815127537174
GameObject:
m_ObjectHideFlags: 0
@ -1526,7 +1512,6 @@ GameObject:
- component: {fileID: 7498381780255091165}
- component: {fileID: 2010651368491599711}
- component: {fileID: 7639211721886324039}
- component: {fileID: 4602515657994392911}
m_Layer: 5
m_Name: Pre
m_TagString: Untagged
@ -1575,14 +1560,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
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: 0}
m_Type: 1
m_Sprite: {fileID: 21300000, guid: 6ea9e25fc2daef141b55b07acb8c02c3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -1646,19 +1631,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9a96e12724c645a498af7c9434c9170f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &4602515657994392911
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7681848815127537174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 12
--- !u!1 &8567930596195253738
GameObject:
m_ObjectHideFlags: 0
@ -1676,7 +1648,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8627770961843808828
RectTransform:
m_ObjectHideFlags: 0

125
Assets/Resources/UI/Prefab/Match/CompetitionResultPanel.prefab
View File

@ -1336,6 +1336,8 @@ GameObject:
- component: {fileID: 4279861061154212524}
- component: {fileID: 1320709271770979984}
- component: {fileID: 4681598175953344741}
- component: {fileID: 1845237128072569303}
- component: {fileID: 456958014919998250}
m_Layer: 5
m_Name: ThirdPanel
m_TagString: Untagged
@ -1384,7 +1386,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.43529412, g: 0.33333334, b: 0.9372549, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1400,6 +1402,43 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1845237128072569303
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2153341565135459061}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
m_Name:
m_EditorClassIdentifier:
r: {x: 0, y: 30, z: 0, w: 0}
rect2props: {x: -7.499996, y: -7.5000153, z: 98.99496, w: 88.38835}
--- !u!114 &456958014919998250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2153341565135459061}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Direction: 2
m_Color1: {r: 0.43529412, g: 0.33333334, b: 0.9372549, a: 1}
m_Color2: {r: 0.77254903, g: 0.5529412, b: 1, a: 1}
m_Color3: {r: 1, g: 1, b: 1, a: 1}
m_Color4: {r: 1, g: 1, b: 1, a: 1}
m_Rotation: 135
m_Offset1: 0
m_Offset2: 0
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!1 &2279114410240641228
GameObject:
m_ObjectHideFlags: 0
@ -2054,6 +2093,8 @@ GameObject:
- component: {fileID: 2950260421243897312}
- component: {fileID: 204847036100202043}
- component: {fileID: 7469334523074800956}
- component: {fileID: 6947281104843509071}
- component: {fileID: 8720819510423715182}
m_Layer: 5
m_Name: TopPanel
m_TagString: Untagged
@ -2102,7 +2143,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -2118,6 +2159,43 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &6947281104843509071
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3705417091195862845}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
m_Name:
m_EditorClassIdentifier:
r: {x: 30, y: 30, z: 0, w: 0}
rect2props: {x: 0.0000076293945, y: -15.000015, z: 159.09903, w: 159.09903}
--- !u!114 &8720819510423715182
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3705417091195862845}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Direction: 2
m_Color1: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_Color2: {r: 1, g: 0.45490196, b: 0.52156866, a: 1}
m_Color3: {r: 1, g: 1, b: 1, a: 1}
m_Color4: {r: 1, g: 1, b: 1, a: 1}
m_Rotation: 135
m_Offset1: 0
m_Offset2: 0
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!1 &4873159523634155249
GameObject:
m_ObjectHideFlags: 0
@ -2612,7 +2690,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8648922130929884845
RectTransform:
m_ObjectHideFlags: 0
@ -2955,6 +3033,8 @@ GameObject:
- component: {fileID: 4745770934206233426}
- component: {fileID: 5859494256323861756}
- component: {fileID: 915177373015003351}
- component: {fileID: 3415098256800160841}
- component: {fileID: 5697628094057084051}
m_Layer: 5
m_Name: 'SecondPanel '
m_TagString: Untagged
@ -3003,7 +3083,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.15686275, g: 0.44313726, b: 0.8745098, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -3019,6 +3099,43 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3415098256800160841
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6784167728620172206}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
m_Name:
m_EditorClassIdentifier:
r: {x: 30, y: 0, z: 0, w: 0}
rect2props: {x: 7.5000076, y: -7.500023, z: 116.67263, w: 127.27923}
--- !u!114 &5697628094057084051
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6784167728620172206}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Direction: 2
m_Color1: {r: 0.15686275, g: 0.44313726, b: 0.8745098, a: 1}
m_Color2: {r: 0.38431373, g: 0.7764706, b: 1, a: 1}
m_Color3: {r: 1, g: 1, b: 1, a: 1}
m_Color4: {r: 1, g: 1, b: 1, a: 1}
m_Rotation: 135
m_Offset1: 0
m_Offset2: 0
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!1 &6820705641987086623
GameObject:
m_ObjectHideFlags: 0

20
Assets/Resources/UI/Prefab/Match/WatcherPanel.prefab
View File

@ -161,7 +161,7 @@ RectTransform:
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: -24.2, y: -18}
m_AnchoredPosition: {x: -0.99998474, y: -18}
m_SizeDelta: {x: 68, y: 36}
m_Pivot: {x: 1, y: 0}
--- !u!222 &5909348220254574302
@ -367,8 +367,8 @@ RectTransform:
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: 140, y: 0}
m_SizeDelta: {x: 150, y: 40}
m_AnchoredPosition: {x: 144.95, y: 0}
m_SizeDelta: {x: 159.89453, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &864986824169715523
CanvasRenderer:
@ -486,8 +486,8 @@ RectTransform:
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: -75, y: 20}
m_SizeDelta: {x: 150, y: 40}
m_AnchoredPosition: {x: -79.947, y: 20}
m_SizeDelta: {x: 159.89429, y: 40}
m_Pivot: {x: 0, y: 1}
--- !u!222 &7609285510981058322
CanvasRenderer:
@ -718,7 +718,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: -10
m_Spacing: -16
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@ -915,10 +915,10 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1405.5, y: -50}
m_SizeDelta: {x: 239, y: 40}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -172, y: -104}
m_SizeDelta: {x: 284, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5712220351141344732
CanvasRenderer:

16
Assets/Resources/UI/Prefab/Ride/OnlineHeadPanel.prefab
View File

@ -275,7 +275,6 @@ GameObject:
- component: {fileID: 9199588604269635338}
- component: {fileID: 7324472603944067997}
- component: {fileID: 7974283264694629321}
- component: {fileID: 4974995161747204287}
m_Layer: 5
m_Name: Dot
m_TagString: Untagged
@ -329,7 +328,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: f04f7faa5cfd8444a9b61e426135725f, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -339,16 +338,3 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4974995161747204287
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4064798434365569382}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 4

4874
Assets/Scenes/Ride.unity
View File

File diff suppressed because it is too large Load Diff

10
Assets/Scripts/Apis/MapCompetitionApi.cs
View File

@ -100,14 +100,6 @@ namespace Assets.Scripts.Apis
};
return Post<JsonResult>($"/MapCompetition/CancelMapCompetition", param);
}
//取消报名比赛
public async Task<JsonResult> CancelMapCompetition(int id)
{
var param = new
{
id = id,
};
return await PostAsync<JsonResult>($"/MapCompetition/CancelMapCompetition", param);
}
}
}

16
Assets/Scripts/App.cs
View File

@ -69,13 +69,13 @@ public static class App
static App()
{
#if !UNITY_EDITOR
// Host = "http://pf.juze.pro/";
// UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
// TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
Host = "https://wx.powerfun.com.cn/";
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
#endif
//#if !UNITY_EDITOR
//// Host = "http://pf.juze.pro/";
//// UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
//// TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
// Host = "https://wx.powerfun.com.cn/";
// UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
// TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
//#endif
}
}

2
Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs
View File

@ -94,7 +94,7 @@ namespace Assets.Scenes.Ride.Scripts
}
//显示观众
var watchList = mainController.GetWatcherList();
watchPanel.SetActive(watchList.Count >= 5);
watchPanel.SetActive(watchList.Count > 0);
#endregion
}

8
Assets/Scripts/Scenes/Ride/Competiton/WatcherFactory.cs
View File

@ -35,14 +35,16 @@ namespace Assets.Scenes.Ride.Scripts
}
}
private const int MAX_COUNT = 7;
private void CreateList()
{
var watchList = cyclingController.GetWatcherList();
var count = watchList.Count();
head.SetActive(count >= 5);
head.SetActive(count>= MAX_COUNT);
watchNum.text = count.ToString();//绑定观看人数
var list = watchList.Take(5);
var list = watchList.Take(MAX_COUNT);
Utils.DestroyChildren(content);
foreach (var item in list)
{

14
Assets/Scripts/Scenes/Ride/Scripts/ChartDataSourceScript.cs
View File

@ -37,7 +37,19 @@ namespace Assets.Scenes.Ride.Scripts
var current = i * targetPoints;
if (current >= max)
{
return current - targetPoints > 0? current - targetPoints : 0;
current = current - targetPoints > 0? current - targetPoints : 0;
}
var ss = mData.Count - targetPoints;
var interval = currentIndex - current;
int mid = (int)(graph.DataSource.HorizontalViewSize / 2);
//是否到达中间及以后的位置
var isReachMid = interval >= mid;
//海拔图是否已经全部加载
var isReachEnd = currentIndex >= mData.Count - targetPoints && currentIndex <= mData.Count;
if (isReachMid && !isReachEnd)
{
current = current + interval- mid;
}
return current;
}

3
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
View File

@ -75,8 +75,7 @@ public class HomeController : PFUIPanel
UIManager.AddEvent(userInfo.Find("BtnMore").gameObject, EventTriggerType.PointerClick, x =>
{
// UIManager.ShowUserInfoPanel();
UIManager.ShowRaceAlertPanel();
UIManager.ShowUserInfoPanel();
//UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", null);
});
//GetSummary();

9
Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
View File

@ -33,13 +33,10 @@ public class RaceButtonGroupScript : MonoBehaviour
if (!map.HasJoin)
{
parent.GetComponent<RaceItemScript>().Join();
}else
{
App.RouteIdParam = map.RouteId;
App.CompetionId = map.Id;
SceneManager.LoadScene("Ride");
}
Debug.Log(map);
App.RouteIdParam = map.RouteId;
App.CompetionId = map.Id;
SceneManager.LoadScene("Ride");
}
void GoCancel()
{

5
Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs
View File

@ -6,6 +6,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class RaceHomeScript : RaceScript
@ -114,7 +115,9 @@ public class RaceHomeScript : RaceScript
}
void OnBannerClick(MapCompetition map)
{
Debug.Log("banner點擊");
App.RouteIdParam = map.RouteId;
App.CompetionId = map.Id;
SceneManager.LoadScene("Ride");
}
private async Task Login()
{

8
Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs
View File

@ -212,9 +212,9 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
base.StartRide(baseEvent);
}
*/
async public void Join()
public void Join()
{
var res = await ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
var res = ConfigHelper.mapCompetitionApi.ApplyMapCompetition(mapCompetition.Id);
if (res.result)
{
mapCompetition.HasJoin = true;
@ -225,9 +225,9 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
Utils.showToast(null, "Successful application!", type: 1);
}
}
async public void CancelJoin()
public void CancelJoin()
{
var res = await ConfigHelper.mapCompetitionApi.CancelMapCompetition(mapCompetition.Id);
var res = ConfigHelper.mapCompetitionApi.CancelMapCompetition(mapCompetition.Id);
if (res.result)
{
mapCompetition.HasJoin = false;