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

暂存

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-08-26 15:49:06 +08:00
1 parent 723c881790
commit f21b83697b
18 files changed
+1912 -1386
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/UI/Control/PFUIDropdown.cs
+5
View File
@@ -7,6 +7,7 @@ using UnityEngine;
using UnityEngine.UI;
using UnityEngine.EventSystems;
using UnityEngine.Events;
using DG.Tweening;
namespace Assets.Scripts.UI.Control
{
@@ -96,6 +97,10 @@ namespace Assets.Scripts.UI.Control
public void SetValidate()
{
outline.enabled = true;
outline.DOFade(1, 1f).onComplete = () =>
{
outline.DOFade(0, 1f);
};
}
//public void SetValidate(string s)
//{
Assets/Scripts/UI/Control/PFUIInputField.cs
+5 -1
View File
@@ -7,7 +7,7 @@ using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using DG.Tweening;
namespace Assets.Scripts.UI.Control
{
public class PFUIInputField: PFUIComponentBase
@@ -123,6 +123,10 @@ namespace Assets.Scripts.UI.Control
if (value)
{
outline.enabled = true;
outline.DOFade(1, 1f).onComplete = () =>
{
outline.DOFade(0, 1f);
};
outline.effectColor = Utils.HexToColorHtml("#F93086");
ColorUtility.TryParseHtmlString("#F93086", out Color color);
//this.mInnerInputField.transform.Find("Text").GetComponent<Text>().color = color;
Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+8 -1
View File
@@ -129,7 +129,14 @@ public class HomeController : PFUIPanel
Application.Quit();
});
#else
Application.OpenURL("powerfun://app");
if (App.weChatController.isApplicationAvilible("com.zhixingpai.powerfun", "powerfun"))
{
Application.OpenURL("powerfun://app");
}
else
{
Application.OpenURL("http://www.powerfun.com/Download");
}
#endif
}
//进入比赛
Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs
+4 -26
View File
@@ -29,6 +29,9 @@ public class ResultListController : PFUIPanel
void Awake()
{
//ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52");
#if UNITY_ANDROID || UNITY_IOS
routeResult = Resources.Load<Transform>("UI/Prefab/ResultList/RouteItem-Mobile");
#endif
InitialColor();
scroll = transform.Find("ListPanel").Find("Scroll").GetComponent<ScrollRect>();
btnMatch = transform.Find("ListPanel").Find("BtnMatch");
@@ -283,7 +286,7 @@ public class ResultListController : PFUIPanel
}
scroll.transform.Find("Error").gameObject.SetActive(contents[scrollIndex].childCount == 0);
}
#region 主页面滑动逻辑
#region 主页面滑动逻辑
int scrollIndex = 0;
bool startScroll = false;
ScrollRect scroll;
@@ -296,7 +299,6 @@ public class ResultListController : PFUIPanel
var value = index * scrollValue;
if (scroll != null && startScroll)
{
#if (UNITY_ANDROID || UNITY_IOS)
if (scroll.horizontalNormalizedPosition >= value)
{
scroll.horizontalNormalizedPosition -= (scrollValue / 20);
@@ -317,30 +319,6 @@ public class ResultListController : PFUIPanel
startScroll = false;
}
}
#else
//if (scroll.verticalNormalizedPosition <= 1)
//{
// scroll.verticalNormalizedPosition =0;
// Debug.Log($"{scroll.verticalNormalizedPosition},{scrollValue/20}");
// if (scroll.verticalNormalizedPosition <= 0)
// {
// Debug.Log(index);
// scroll.verticalNormalizedPosition = 0;
// startScroll = false;
// }
//}
//else
//{
// scroll.verticalNormalizedPosition += (scrollValue / 20);
// Debug.Log($"反向：{scroll.verticalNormalizedPosition},{scrollValue / 20}");
// if (scroll.verticalNormalizedPosition >= 1)
// {
// Debug.Log(index);
// scroll.verticalNormalizedPosition = 1;
// startScroll = false;
// }
//}
#endif
}
}
#endregion
Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs
+3 -3
View File
@@ -100,12 +100,12 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
transform.Find("Right").gameObject.SetActive(false);
}
//right.gameObject.SetActive(true);
#if !(UNITY_ANDROID || UNITY_IOS)
gameObject.GetComponent<Button>().onClick.AddListener(() =>
{
Detail();
});
});
#endif
}
void Detail()
{