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

Merge branch 'dev_rower' into dev_release

Browse Source 
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
This commit is contained in:
CaiYanPeng 2021-10-20 15:12:05 +08:00
commit e503443f22
12 changed files with 2953 additions and 2586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Resources/Images/Mobile/登录 - 快捷.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

2
Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab
View File

@ -3448,7 +3448,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4071833300312694754
RectTransform:
m_ObjectHideFlags: 0

4
Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab
View File

@ -94,7 +94,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3111753855602397197
RectTransform:
m_ObjectHideFlags: 0
@ -1544,7 +1544,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1724308109339741718
RectTransform:
m_ObjectHideFlags: 0

2877
Assets/Resources/UI/Prefab/Panel/Mobile/RowerPanel.prefab
View File

File diff suppressed because it is too large Load Diff

2618
Assets/Scenes/Login-Mobile.unity
View File

File diff suppressed because it is too large Load Diff

24
Assets/Scripts/Scenes/MainController.cs
View File

@ -62,18 +62,18 @@ public class MainController : BaseScene
//{
// UIManager.ShowHomePanel();
//});
//#if UNITY_ANDROID || UNITY_IOS
// if (!App.IsRowerMode.HasValue)
// {
// UIManager.ShowRowerSelector();
// return;
// }
// if (App.IsRowerMode == true)
// {
// UIManager.ShowRowerPanel();
// return;
// }
//#endif
#if UNITY_ANDROID || UNITY_IOS
if (!App.IsRowerMode.HasValue)
{
UIManager.ShowRowerSelector();
return;
}
if (App.IsRowerMode == true)
{
UIManager.ShowRowerPanel();
return;
}
#endif
if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
{
UIManager.ShowHomePanel();

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

@ -177,7 +177,7 @@ public class RowerHomeScript : PFUIPanel
},
()=>
{
if (Rower != null)
if (Rower != null && !isPause)
{
Rower.Reset();
}

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

@ -95,7 +95,7 @@ public class RouteItem : MonoBehaviour
row1.Find("Distance").GetComponent<Text>().text = $"<color=#5c5c6e>Distance:</color>{result.TotalDistance}M";
row2.Find("Device").GetComponent<Text>().text = $"<color=#5c5c6e>Rowing equipment:</color>{result.ManufacturerName}";
left.Find("Progress").gameObject.SetActive(false);
left.Find("Main/Name").GetComponent<Text>().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free rowing";
left.Find("Main/Name").GetComponent<Text>().text = $"{result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free Rowing";
left.Find("Main/Time").GetComponent<Text>().text = $"{result.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} ~ {result.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")}";
var rect = left.Find("Main").GetComponent<RectTransform>();
rect.sizeDelta = new Vector2(399,rect.sizeDelta.y);

1
Assets/Scripts/UI/Prefab/Rower/RowerResult.cs
View File

@ -47,6 +47,7 @@ public class RowerResult : PFUIPanel
if (res.result)
{
_model = res.data;
dataContent.Find("Title").GetComponent<Text>().text = $"{_model.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} Free Rowing";
dataContent.Find("Time").GetComponent<Text>().text = $"{_model.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")} ~ {_model.CreateTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")}";
dataContent.Find("TitleContent/Duration").GetComponent<Text>().text
= $"<color=#5c5c6e>Rowing time :</color> {TimeSpan.FromSeconds(_model.TotalTime).ToString()}";

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

@ -209,9 +209,11 @@ namespace Assets.Scripts
}
public static void CallAndroidMethod(string methodName,params object[] args)
{
#if UNITY_ANDROID && !UNITY_EDITOR
AndroidJavaClass jc = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
var activity = jc.GetStatic<AndroidJavaObject>("currentActivity");
activity.Call(methodName, args);
#endif
}
public static void showLoadingExtension(this GameObject game)
@ -224,7 +226,7 @@ namespace Assets.Scripts
var newLoading = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/Common/Mobile/Loading"));
#else
var newLoading = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/Common/Loading"));
#endif
#endif
newLoading.name = "Loading";
newLoading.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newLoading.transform.SetParent(game.transform);

1
ProjectSettings/GraphicsSettings.asset
View File

@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

4
ProjectSettings/ProjectSettings.asset
View File

@ -133,7 +133,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 2.0.3
bundleVersion: 2.0.4
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
@ -180,7 +180,7 @@ PlayerSettings:
Android: com.ZhiXingPai.PowerFunUnity
buildNumber:
iPhone: 2.0.3.0
AndroidBundleVersionCode: 3
AndroidBundleVersionCode: 5
AndroidMinSdkVersion: 24
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1