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

Merge branch 'dev_release' into feature_AR

Browse Source 
# Conflicts:
#	Assets/Resources/UI/language.json
This commit is contained in:
lishuo 2022-07-22 17:35:35 +08:00
commit 4d5bc8f080
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2469,7 +2469,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mType: 3
Tooltips: CHANGE ACCOUNT
Tooltips: DELETE ACCOUNT
--- !u!1 &5404217437987161135
GameObject:
m_ObjectHideFlags: 0

2
Assets/Resources/UI/language.json
View File

@ -378,6 +378,7 @@
"Are you sure you want to delete the account?": "是否确认注销账号？",
"Delete Your Route": "删除您的线路",
"Are you sure you want to delete this route?": "你确定要删除这条线路吗？",
"DELETE ACCOUNT": "注销账号",
"BATTLE": "对战"
},
"en": {
@ -752,6 +753,7 @@
"Are you sure you want to delete the account?": "Are you sure you want to delete the account?",
"Delete Your Route": "Delete Your Route",
"Are you sure you want to delete this route?": "Are you sure you want to delete this route?",
"DELETE ACCOUNT": "DELETE ACCOUNT",
"BATTLE": "BATTLE"
}
}

27
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
View File

@ -113,28 +113,27 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
diff.Find("Text").GetComponent<Text>().text = myMap.Hard;
tabContainer.Find("3d").gameObject.SetActive(myMap.Enable3D);
tabContainer.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImage(myMap.CountryCode);
if (!isModal)
transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite = UIManager.Instance.collectDict[myMap.IsFavorite];
if (!isModal)
{
transform.Find("CollectImg").GetComponent<Button>().onClick.RemoveAllListeners();
if (App.CurrentRouteType == "My Upload")
{
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(ApplyOpenRoute);
}
else
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
App.CurrentRouteType != "My Upload" ? UIManager.Instance.collectDict[myMap.IsFavorite] : UIManager.Instance.uploadDict[myMap.IsEnabled];
if (App.CurrentRouteType == "My Upload")
{
transform.Find("CollectImg").GetComponent<Button>().onClick.AddListener(Collect);
transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(25, 20f);
}
ChangeUploadImageMode();
}
transform.Find("CollectImg").Find("Image").GetComponent<Image>().sprite =
App.CurrentRouteType != "My Upload"?UIManager.Instance.collectDict[myMap.IsFavorite]: UIManager.Instance.uploadDict[myMap.IsEnabled];
if (App.CurrentRouteType == "My Upload")
{
transform.Find("CollectImg").Find("Image").GetComponent<RectTransform>().sizeDelta = new Vector2(25, 20f);
}
ChangeUploadImageMode();
#if !(UNITY_ANDROID || UNITY_IOS)
transform.Find("CollectImg").gameObject.SetActive(false);
#endif
//#if !(UNITY_ANDROID || UNITY_IOS)
// transform.Find("CollectImg").gameObject.SetActive(false);
//#endif
transform.Find("BtnInfo").GetComponent<Button>().onClick.AddListener(Info);
transform.Find("BtnRide").GetComponent<Button>().onClick.AddListener(Ride);

4
ProjectSettings/ProjectSettings.asset
View File

@ -133,7 +133,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2.1.3
bundleVersion: 2.1.4
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -179,7 +179,7 @@ PlayerSettings:
applicationIdentifier:
Android: com.ZhiXingPai.PowerFunUnity
buildNumber:
iPhone: 2.1.3.1
iPhone: 2.1.4.1
AndroidBundleVersionCode: 18
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 30