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-04-29 23:45:29 +08:00
parent aaef57c0b0
commit 52fd841486
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Resources/UI/Prefab/MapList/MapItem.prefab
View File

@ -1396,7 +1396,7 @@ MonoBehaviour:
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 1 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: Map Name m_Text: Map Name

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

@ -7380,7 +7380,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3} type: 3}
propertyPath: m_Text propertyPath: m_Text
value: Edit value: Save
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3} type: 3}

2
Assets/Scripts/App.cs
View File

@ -7,7 +7,7 @@ using UnityEngine;
public static class App public static class App
{ {
public static string Host = "http://192.168.0.97:5082/"; public static string Host = "http://pf.juze.pro/";
public static string AppVersion = "1.0.0"; public static string AppVersion = "1.0.0";

7
Assets/Scripts/Scenes/LoginController.cs
View File

@ -255,7 +255,7 @@ public class LoginController : MonoBehaviour
wxState = (DateTime.Now.ToUniversalTime().Ticks / 10000 * new System.Random().Next(1, 5)).ToString(); wxState = (DateTime.Now.ToUniversalTime().Ticks / 10000 * new System.Random().Next(1, 5)).ToString();
wxBrowser.Url = $"https://open.weixin.qq.com/connect/qrconnect?appid={App.WxAppId}&redirect_uri=https%3A%2F%2Fwx.powerfun.com.cn%2FNoAuth%2Fv1%2FWxWebLogin&response_type=code&scope=snsapi_login&state={wxState}#wechat_redirect"; wxBrowser.Url = $"https://open.weixin.qq.com/connect/qrconnect?appid={App.WxAppId}&redirect_uri=https%3A%2F%2Fwx.powerfun.com.cn%2FNoAuth%2Fv1%2FWxWebLogin&response_type=code&scope=snsapi_login&state={wxState}#wechat_redirect";
//AdjustWxQrCode(); AdjustWxQrCode();
var wx1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1"); var wx1 = mainContent.Find("FormContainer-Login").Find("Mask").Find("FormContainer-wx1");
wx1.gameObject.SetActive(true); wx1.gameObject.SetActive(true);
Debug.Log(178 + "已经开启" + wx1.gameObject.activeSelf); Debug.Log(178 + "已经开启" + wx1.gameObject.activeSelf);
@ -503,11 +503,8 @@ public class LoginController : MonoBehaviour
private void AdjustWxQrCode() private void AdjustWxQrCode()
{ {
wxBrowser.EvalJS(@" wxBrowser.EvalJS(@"
console.log(439,document.body.style.padding);
let time = null; let time = null;
let f = ()=>{ let f = ()=>{
console.log(442);
document.getElementsByClassName('qrcode')[0].style.marginTop = 0; document.getElementsByClassName('qrcode')[0].style.marginTop = 0;
document.getElementsByClassName('title')[0].style.display = 'none'; document.getElementsByClassName('title')[0].style.display = 'none';
document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`; document.getElementById('wx_default_tip').childNodes[3].innerHTML = `""PowerFun""`;
@ -530,7 +527,7 @@ public class LoginController : MonoBehaviour
{ {
if (wxBrowser.Url.Contains("qrconnect")) if (wxBrowser.Url.Contains("qrconnect"))
{ {
AdjustWxQrCode(); //AdjustWxQrCode();
} }
Debug.Log(wxBrowser.Url); Debug.Log(wxBrowser.Url);
var rgx = Regex.Match(wxBrowser.Url, @"https\:\/\/wx.powerfun.com.cn/NoAuth/v1/WxWebLogin\?code=(.*?)&state=(.*?)$"); var rgx = Regex.Match(wxBrowser.Url, @"https\:\/\/wx.powerfun.com.cn/NoAuth/v1/WxWebLogin\?code=(.*?)&state=(.*?)$");

1
Assets/Scripts/UI/Prefab/FeedbackController.cs
View File

@ -117,6 +117,7 @@ public class FeedbackController : PFUIPanel
else else
{ {
Utils.showToast(gameObject, "Submitted", type: 1);//已提交 Utils.showToast(gameObject, "Submitted", type: 1);//已提交
Close();
} }
} }
// Update is called once per frame // Update is called once per frame

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

@ -63,7 +63,7 @@ public class UserInfoController : PFUIPanel
Load(); Load();
if (summaryPanel != null) if (summaryPanel != null)
{ {
summaryPanel.Find("Panel").Find("RideResultList").GetComponent<ResultListController>().HideError(); summaryPanel.Find("Panel").Find("RideResultList").GetComponent<ResultListController>().Load();
} }
} }
void Load() void Load()

15
Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs
View File

@ -79,12 +79,16 @@ public class ResultListController : MonoBehaviour
GetList(1); GetList(1);
} }
public void HideError() public void Load()
{ {
if (scroll!=null) if (contents != null && contents.Length == 2)
{ {
scroll.transform.Find("Error").gameObject.SetActive(false); Refresh(contents[scrollIndex]);
} }
//if (scroll!=null)
//{
// scroll.transform.Find("Error").gameObject.SetActive(false);
//}
} }
private void OnEndDrag(BaseEventData e) private void OnEndDrag(BaseEventData e)
@ -143,7 +147,10 @@ public class ResultListController : MonoBehaviour
else else
{ {
//contents[index]; //contents[index];
scroll.transform.Find("Error").gameObject.SetActive(true); if (!sindex.HasValue ||(sindex.HasValue && sindex.Value == scrollIndex))
{
scroll.transform.Find("Error").gameObject.SetActive(true);
}
} }
} }
else else