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

修改细节

Browse Source
This commit is contained in:
CaiYanPeng 2021-07-29 19:55:29 +08:00
parent edce9c676d
commit 7884e7ac7e
11 changed files with 101 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Images/Race/RACE-BG.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 477 KiB

After

Width:  |  Height:  |  Size: 381 KiB

4
Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab
View File

@ -102,7 +102,7 @@ MonoBehaviour:
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 3714912750620550917}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@ -5610,7 +5610,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_Text
value: Route name
value: Route Name
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}

34
Assets/Resources/UI/Prefab/Panel/RaceHomePanel.prefab
View File

@ -480,6 +480,7 @@ GameObject:
- component: {fileID: 4573235035984813206}
- component: {fileID: 4573235035984813204}
- component: {fileID: 3611089692291679606}
- component: {fileID: 6137341165496780418}
m_Layer: 5
m_Name: BtnGoList
m_TagString: Untagged
@ -583,6 +584,18 @@ MonoBehaviour:
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!114 &6137341165496780418
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4573235035984813200}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f8a12a33aebf7b4cbfcd56590ec2016, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4573235036014977500
GameObject:
m_ObjectHideFlags: 0
@ -907,7 +920,6 @@ GameObject:
- component: {fileID: 3546599840402343035}
- component: {fileID: 4367154909318870032}
- component: {fileID: 6903105543186716152}
- component: {fileID: 2128218079967102783}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@ -996,18 +1008,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &2128218079967102783
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7337022735317176614}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f8a12a33aebf7b4cbfcd56590ec2016, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9215991903109907486
GameObject:
m_ObjectHideFlags: 0
@ -1622,7 +1622,7 @@ PrefabInstance:
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -1787,7 +1787,7 @@ PrefabInstance:
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -1807,7 +1807,7 @@ PrefabInstance:
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -1827,7 +1827,7 @@ PrefabInstance:
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 20
objectReference: {fileID: 0}
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}

8
Assets/Resources/UI/Prefab/Panel/RaceListPanel.prefab
View File

@ -766,7 +766,7 @@ MonoBehaviour:
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 4995230873168002437}
m_HorizontalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 2
m_VerticalScrollbarVisibility: 1
m_HorizontalScrollbarSpacing: -3
m_VerticalScrollbarSpacing: -3
m_OnValueChanged:
@ -1560,9 +1560,9 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: -3, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4605362255460975190
CanvasRenderer:
@ -3226,7 +3226,7 @@ PrefabInstance:
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
propertyPath: m_Text
value: Race name
value: Race Name
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}

12
Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab
View File

@ -5847,7 +5847,7 @@ PrefabInstance:
- target: {fileID: 523509238008881520, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_Text
value: Route name
value: Route Name
objectReference: {fileID: 0}
- target: {fileID: 1441145902436648424, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
@ -5984,6 +5984,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7974311519597661725, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_VerticalScrollbarVisibility
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7974311519597661726, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_AnchorMax.y
@ -6004,6 +6009,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7974311519881583202, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_VerticalScrollbarVisibility
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7974311519881583203, guid: ed226fe096f17a0459f856db5fc494af,
type: 3}
propertyPath: m_AnchorMax.y

2
Assets/Resources/UI/Prefab/ResultList/RouteItem.prefab
View File

@ -2465,7 +2465,7 @@ PrefabInstance:
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: mType
value: 1
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}

4
Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs
View File

@ -272,7 +272,7 @@ namespace Assets.Scenes.Ride.Scripts
}
protected void ApplyRace(BaseEventData baseEvent)
{
UIManager.ShowConfirm("Join", "you want to join?", async () =>
UIManager.ShowConfirm("Join", "Do you want to join?", async () =>
{
MapCompetitionApi s = ConfigHelper.mapCompetitionApi;
var rrr = s.ApplyMapCompetition(cyclingController.competitionId);
@ -298,7 +298,7 @@ namespace Assets.Scenes.Ride.Scripts
{
try
{
UIManager.ShowConfirm("Canel Reservation", "you want to cancel reservation?", async () =>
UIManager.ShowConfirm("Canel Reservation", "Do you want to cancel reservation?", async () =>
{
MapCompetitionApi api = ConfigHelper.mapCompetitionApi;
var data = api.CancelMapCompetition(cyclingController.competition.Id);

4
Assets/RaceMaskScript.cs → Assets/Scripts/UI/Prefab/Race/RaceMaskScript.cs
View File

@ -7,12 +7,12 @@ public class RaceMaskScript : MonoBehaviour, IPointerEnterHandler,IPointerExitHa
{
public void OnPointerEnter(PointerEventData eventData)
{
GetComponent<CanvasGroup>().DOFade(1, 0.5f);
transform.Find("Panel").GetComponent<CanvasGroup>().DOFade(1, 0.5f);
}
public void OnPointerExit(PointerEventData eventData)
{
GetComponent<CanvasGroup>().DOFade(0, 0.5f);
transform.Find("Panel").GetComponent<CanvasGroup>().DOFade(0, 0.5f);
}
// Start is called before the first frame update

0
Assets/RaceMaskScript.cs.meta → Assets/Scripts/UI/Prefab/Race/RaceMaskScript.cs.meta
View File

91
Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
View File

@ -14,6 +14,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
// Start is called before the first frame update
Transform left,row1,row2,right;
Transform btnReRide, btnContinue, btnDelete;
Transform btnDetail;
void Start()
{
@ -31,6 +32,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
public void Initial(RouteResult result,int index)
{
routeResult = result;
this.index = index;
left = transform.Find("Left");
row1 = left.Find("Main").Find("Row1");
row2 = left.Find("Main").Find("Row2");
@ -56,6 +58,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
if (index == 0)
{
right = transform.Find("Right");
right.gameObject.SetActive(true);
btnContinue = right.Find("BtnContinue");
if (btnContinue)
{
@ -86,32 +89,43 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
}
else
{
Debug.Log(index);
right = transform.Find("RightMatch");
transform.Find("Right").gameObject.SetActive(false);
UIManager.AddEvent(right.Find("BtnDetail").gameObject, EventTriggerType.PointerClick, (b) => Detail());
right.gameObject.SetActive(true);
btnDetail = right.Find("BtnDetail");
UIManager.AddEvent(btnDetail.gameObject, EventTriggerType.PointerClick, (b) => Detail());
UIManager.AddEvent(right.Find("BtnRide").gameObject, EventTriggerType.PointerClick, (b) => Ride());
//right.Find("Value").GetComponent<Text>().text = result.Ranking.ToString();
SetButtonColor(false);
transform.Find("Right").gameObject.SetActive(false);
}
right.gameObject.SetActive(true);
//right.gameObject.SetActive(true);
gameObject.GetComponent<Button>().onClick.AddListener(() =>
{
var url = result.ViewUrl + "?Token=" + App.CurrentUser.cookie;
if (index == 1)
{
url += "&raceId="+result.MapCompetitionId;
}
Application.OpenURL(url);
Detail();
});
this.index = index;
}
void Detail()
{
Debug.Log("Detail");
var url = routeResult.ViewUrl + "?Token=" + App.CurrentUser.cookie;
if (index == 1)
{
url += "&raceId=" + routeResult.MapCompetitionId;
}
Application.OpenURL(url);
}
void Ride()
{
Debug.Log("Ride");
UIManager.ShowConfirm("Ride", "Ride this route?", () =>
{
App.RouteIdParam = routeResult.RouteId;
App.routeResult = routeResult;
App.routeResult.ContinueCyclingParam = null;
RecordFromUrl();
SceneManager.LoadScene("Ride");
});
}
private void Delete()
{
@ -167,27 +181,44 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
}
void SetButtonColor(bool f)
{
if (index == 0 && routeResult!=null)
if (routeResult!=null)
{
if (f)
if (index == 0)
{
bool enabled = routeResult.ContinueCyclingParam == null;
btnContinue.GetComponent<Image>().color =
enabled ? Utils.HexToColorHtml("#75264e") : Utils.HexToColorHtml("#F93086");
btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#474759");
if (f)
{
bool enabled = routeResult.ContinueCyclingParam == null;
btnContinue.GetComponent<Image>().color =
enabled ? Utils.HexToColorHtml("#75264e") : Utils.HexToColorHtml("#F93086");
btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#353543");
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#474759");
}
else
{
btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#23232D");
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
}
}
else
else if (index == 1)
{
btnContinue.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
btnReRide.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
btnDelete.GetComponent<Image>().color = Utils.HexToColorHtml("#23232D");
btnContinue.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
btnReRide.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
btnDelete.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
if (f)
{
btnDetail.GetComponent<Image>().color = Utils.HexToColorHtml("#F93086");
btnDetail.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#ffffff");
}
else
{
Debug.Log(216);
btnDetail.GetComponent<Image>().color = Utils.HexToColorHtml("#414251");
btnDetail.Find("Text").GetComponent<Text>().color = Utils.HexToColorHtml("#353543");
}
}
}

2
Assets/Scripts/UIManager.cs
View File

@ -733,7 +733,7 @@ public class UIManager : MonoBehaviour
}
Confirm confirm = null;
public static void ShowConfirm(string title, string content, UnityAction action,int type=1)
public static void ShowConfirm(string title, string content, UnityAction action,int type = 2)
{
if (UIManager.Instance == null)
{