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-28 18:33:52 +08:00
parent 952e5038ed
commit abf913b467
12 changed files with 198 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
Assets/Resources/UI/Prefab/Panel/DownloadWorkoutsModal.prefab
View File

@ -19,7 +19,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7867355229879358215
RectTransform:
m_ObjectHideFlags: 0
@ -198,6 +198,100 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Establishing connection, please wait...
--- !u!1 &1157055743574454707
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1924737827584117062}
- component: {fileID: 2847180079584940888}
- component: {fileID: 3274312325075873767}
- component: {fileID: 762370541741799958}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1924737827584117062
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1157055743574454707}
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: 3706567255822698944}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -120}
m_SizeDelta: {x: -40, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &2847180079584940888
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1157055743574454707}
m_CullTransparentMesh: 0
--- !u!114 &3274312325075873767
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1157055743574454707}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8039216, g: 0.8039216, b: 0.8039216, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Click Start to download and install PowerFun Workouts,Start the course
training experience.
--- !u!114 &762370541741799958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1157055743574454707}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &1496775926230021874
GameObject:
m_ObjectHideFlags: 0
@ -488,6 +582,7 @@ RectTransform:
- {fileID: 5365663280637269737}
- {fileID: 519173366022166441}
- {fileID: 7867355229879358215}
- {fileID: 1924737827584117062}
m_Father: {fileID: 1496775926230021875}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

@ -191,9 +191,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 30, y: 30}
m_AnchoredPosition: {x: 46, y: 46}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3340209316991978988
CanvasRenderer:
m_ObjectHideFlags: 0
@ -309,9 +309,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -30, y: 30}
m_AnchoredPosition: {x: -46, y: 46}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 1, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3340209317363117727
CanvasRenderer:
m_ObjectHideFlags: 0
@ -1019,6 +1019,8 @@ GameObject:
- component: {fileID: 9215991903353559776}
- component: {fileID: 9215991903353559807}
- component: {fileID: 9215991903353559777}
- component: {fileID: 3532936243851429704}
- component: {fileID: 410588590061387481}
m_Layer: 5
m_Name: Swiper
m_TagString: Untagged
@ -1087,6 +1089,55 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3532936243851429704
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991903353559779}
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: 0.003921569}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
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 &410588590061387481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991903353559779}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 385b7d1277b6c4007a84c065696e0f8c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_DownSamplingRate: 8
m_Softness: 1
m_Alpha: 1
m_IgnoreParent: 0
m_PartOfParent: 0
m_IgnoreSelfGraphic: 0
m_IgnoreSelfStencil: 0
--- !u!1 &9215991903893938157
GameObject:
m_ObjectHideFlags: 0
@ -1271,8 +1322,6 @@ GameObject:
m_Component:
- component: {fileID: 9215991904159477866}
- component: {fileID: 9215991904159477864}
- component: {fileID: 4652960343095644145}
- component: {fileID: 4652960343095644144}
m_Layer: 5
m_Name: LeftContainer
m_TagString: Untagged
@ -1308,55 +1357,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991904159477869}
m_CullTransparentMesh: 0
--- !u!114 &4652960343095644145
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991904159477869}
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: 0.003921569}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: a4edd9005cfc7fe4c86f1c36c911df9c, type: 3}
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 &4652960343095644144
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991904159477869}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 385b7d1277b6c4007a84c065696e0f8c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_DownSamplingRate: 1
m_Softness: 1
m_Alpha: 1
m_IgnoreParent: 0
m_PartOfParent: 0
m_IgnoreSelfGraphic: 0
m_IgnoreSelfStencil: 0
--- !u!1 &9215991904227154529
GameObject:
m_ObjectHideFlags: 0

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

@ -1073,7 +1073,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Racing
m_Text: In play
--- !u!114 &5753942853230887522
MonoBehaviour:
m_ObjectHideFlags: 0

6
Assets/Resources/UI/Prefab/Race/ItemSmall.prefab
View File

@ -113,7 +113,7 @@ RectTransform:
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: 0}
m_AnchoredPosition: {x: 35, y: 0}
m_SizeDelta: {x: 0, y: 14}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4283453029241301366
@ -1845,7 +1845,7 @@ RectTransform:
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: 0}
m_AnchoredPosition: {x: 33.5, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6307907517525328669
@ -2728,7 +2728,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: Cancel Reserve
value: Cancel Reservation
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}

2
Assets/Scripts/Apis/Models/MapCompetition.cs
View File

@ -13,7 +13,7 @@ namespace Assets.Scripts.Apis.Models
public string CreateTime { get; set; }
public int CreateUser { get; set; }
public string Dec { get; set; }
public string EndApplyTime { get; set; }
public DateTime EndApplyTime { get; set; }
public string EndApplyTimeVlaue { get; set; }
public bool IsOfficial { get; set; }

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

@ -10,10 +10,10 @@ namespace Assets.Scripts.UI.Prefab.Race
{
public static Dictionary<string, string> statusDict = new Dictionary<string, string>()
{
{"All","" },
{"Not started","1,2" },
{"Racing","3" },
{"Done","4" },
{"Btn1","" },
{"Btn2","1,2" },
{"Btn3","3" },
{"Btn4","4" },
};
}
}

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

@ -40,6 +40,14 @@ public class RaceHomeScript : RaceScript
{
goLeft();
});
UIManager.AddEvent(L.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, (b) =>
{
L.transform.DOScale(1.1f, 0.2f);
});
UIManager.AddEvent(L.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, (b) =>
{
L.transform.DOScale(1f, 0.2f);
});
}
if (R != null)
{
@ -47,6 +55,14 @@ public class RaceHomeScript : RaceScript
{
goRight();
});
UIManager.AddEvent(R.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerEnter, (b) =>
{
R.transform.DOScale(1.1f, 0.2f);
});
UIManager.AddEvent(R.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerExit, (b) =>
{
R.transform.DOScale(1f, 0.2f);
});
}
StartTime();
rightContainer = transform.Find("RightContainer");

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

@ -160,7 +160,9 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH
}
else
{
status.Find("Text").GetComponent<Text>().text = mapCompetition.StatusVlaue;
status.gameObject.SetActive(true);
status.Find("Text").GetComponent<Text>().text =
mapCompetition.Status == 2?"Registered":mapCompetition.StatusVlaue;
}
}
}

4
Assets/Scripts/UI/Prefab/Race/RaceListScript.cs
View File

@ -80,13 +80,13 @@ public class RaceListScript : RaceScript
{
image.color = Utils.HexToColorHtml("#F93086");
text.color = new Color(1, 1, 1, 1);
statusOptions.Add(RaceFilterOptions.statusDict[text.text]);
statusOptions.Add(RaceFilterOptions.statusDict[t.name]);
}
else
{
image.color = c1;
text.color = new Color(1, 1, 1, 1);
statusOptions.Remove(RaceFilterOptions.statusDict[text.text]);
statusOptions.Remove(RaceFilterOptions.statusDict[t.name]);
}
Transform t1 = statusOptionContainer.GetChild(0);
var image1 = t1.GetComponent<Image>();

14
Assets/Scripts/UI/Prefab/Race/RaceScript.cs
View File

@ -76,10 +76,10 @@ public class RaceScript : PFUIPanel
var map = currentItem.GetComponent<RaceItemScript>().mapCompetition;
if (map.Status == 1)
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Application Start Time";
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Deadline for Registration";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.StartApplyTime.ToString("yyyy-MM-dd HH:mm");
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Race Start Time";
map.EndApplyTime.ToString("yyyy-MM-dd HH:mm");
currentItem.Find("GetReadyContainer-2/Title").GetComponent<Text>().text = "Start Time";
currentItem.Find("GetReadyContainer-2/Value").GetComponent<Text>().text =
map.StartTime.ToString("yyyy-MM-dd HH:mm");
@ -95,7 +95,7 @@ public class RaceScript : PFUIPanel
}
else if (map.Status == 4)
{
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "Race End Time";
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text = "End Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text =
map.FirstEndTime.HasValue?
map.FirstEndTime.Value.ToString("yyyy-MM-dd HH:mm"):map.EndTime.ToString("yyyy-MM-dd HH:mm");
@ -103,7 +103,7 @@ public class RaceScript : PFUIPanel
else
{
//Dictionary<int,>
var time = (map.Status == 2 ? map.StartTime.ToLocalTime() : map.EndTime.ToLocalTime()) - UIManager.Now.GetDateTime();
var time = map.StartTime.ToLocalTime() - UIManager.Now.GetDateTime();
if (time.TotalSeconds < 0)
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 0;
@ -117,9 +117,9 @@ public class RaceScript : PFUIPanel
{
currentItem.Find("GetReadyContainer").GetComponent<CanvasGroup>().alpha = 1;
currentItem.Find("GetReadyContainer/Title").GetComponent<Text>().text
= map.Status == 2 ? "Get Ready" : "Riding Time";
= map.HasJoin ? "Get Ready" : "Start Time";
currentItem.Find("GetReadyContainer/Value").GetComponent<Text>().text
= Utils.GetCountDown(time);
= map.HasJoin ? Utils.GetCountDown(time): map.StartTime.ToString("yyyy-MM-dd HH:mm");
}
}
}

13
Assets/Scripts/UI/Prefab/Update/DownloadWorkoutsController.cs
View File

@ -41,15 +41,16 @@ public class DownloadWorkoutsController : PFUIPanel
UIManager.AddEvent(Exit.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
{
//UIManager.CloseConfirm();
if (request != null)
//UIManager.ShowConfirm("1", "2", () => { });
if (request != null)
{
request.Abort();
}
if (_fs != null)
if (_fs != null)
{
_fs.Close();
}
if (_netStream != null)
if (_netStream != null)
{
_netStream.Close();
}
@ -62,7 +63,11 @@ public class DownloadWorkoutsController : PFUIPanel
UIManager.AddEvent(Btn.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) =>
{
//Application.Quit();
Utils.ExecFile(path);
UIManager.ShowConfirm("Confirm", @"Switch to PowerFun Workouts? We will close the Powerfun and start PowerFun Workouts", () =>
{
Utils.ExecFile(path);
UIManager.CloseConfirm();
});
});
UIManager.AddEvent(BtnStart.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,async (_base) =>
{

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

@ -76,6 +76,7 @@ namespace Assets.Scripts
}
return output;
}
/*获取ip*/
/*显示简略提示，需要拖Toast的预制件，且保证其他组件名字不是Toast,ToastContainer*/
private static Dictionary<int, string> _toastDict;