diff --git a/Assets/Editor/XCodePostProcessBuild.cs b/Assets/Editor/XCodePostProcessBuild.cs index 96df07c6..7109c314 100644 --- a/Assets/Editor/XCodePostProcessBuild.cs +++ b/Assets/Editor/XCodePostProcessBuild.cs @@ -23,7 +23,7 @@ public static class XCodePostProcessBuild } string projectPath = pathToBuiltProject + "/Unity-iPhone.xcodeproj/project.pbxproj"; SetFrameworksAndBuildSettings(projectPath); - SetInfoList(pathToBuiltProject, "com.ZhiXingPai.PowerFun", "wx9146e6697a6aef2d"); + SetInfoList(pathToBuiltProject, "com.ZhiXingPai.PowerFun", "wxe3573a84e7e29902"); SetAssociatedDomains(projectPath, "wx.powerfun.com.cn"); } @@ -60,6 +60,11 @@ public static class XCodePostProcessBuild dict.SetString("CFBundleURLName", wxUrlName); PlistElementArray urlSchemes = dict.CreateArray("CFBundleURLSchemes"); urlSchemes.AddString(wxScheme); + PlistElementDict dictMine = urlArray.AddDict(); + dictMine.SetString("CFBundleTypeRole", "Editor"); + dictMine.SetString("CFBundleURLName", "powerfunx"); + PlistElementArray urlSchemesMine = dictMine.CreateArray("CFBundleURLSchemes"); + urlSchemesMine.AddString("powerfunx"); // 在 “info”标签栏的“LSApplicationQueriesSchemes“添加weixin wechat和weixinULAPI PlistElementArray wxArray = plist.root.CreateArray("LSApplicationQueriesSchemes"); diff --git a/Assets/Plugins/Android/UnityCallWechatShare-release.aar b/Assets/Plugins/Android/UnityCallWechatShare-release.aar index 365ae428..ff79407f 100644 Binary files a/Assets/Plugins/Android/UnityCallWechatShare-release.aar and b/Assets/Plugins/Android/UnityCallWechatShare-release.aar differ diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 522bbb4d..5435e3a2 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -5,14 +5,7 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.yuyh.imgsel:library:2.1.0' - implementation 'com.github.bumptech.glide:glide:3.7.0' - implementation 'com.facebook.fresco:fresco:0.6.0' - implementation(name: 'com.mapbox.android.unity-debug', ext:'aar') - implementation(name: 'libcore-release', ext:'aar') - implementation(name: 'libtelemetry-full-release', ext:'aar') - implementation(name: 'UnityCallWechatShare-release', ext:'aar') - implementation files ('libs/ImageSelector-release.aar') + **DEPS** } android { diff --git a/Assets/Plugins/iOS/IOSWechatController.m b/Assets/Plugins/iOS/IOSWechatController.m index a20fdab8..dc2c98a3 100644 --- a/Assets/Plugins/iOS/IOSWechatController.m +++ b/Assets/Plugins/iOS/IOSWechatController.m @@ -49,13 +49,13 @@ NSLog(@"47"); UnitySendMessage("LoginPanel", "OnMobileWxLoginResp",[NSString stringWithFormat:@"true;%@",temp.code ].UTF8String); break; case -2: - UnitySendMessage("LoginPanel", "OnMobileWxLoginResp", "false;用户取消"); + UnitySendMessage("LoginPanel", "OnMobileWxLoginResp", "false;User deauthorisation"); break; case -4: - UnitySendMessage("LoginPanel", "OnMobileWxLoginResp", "false;用户拒绝授权"); + UnitySendMessage("LoginPanel", "OnMobileWxLoginResp", "false;User refusal of authorisation"); break; default: - UnitySendMessage("LoginPanel", "OnMobileWxLoginResp", "false;登录失败"); + UnitySendMessage("LoginPanel", "OnMobileWxLoginResp", "false;Login failed"); break; } } diff --git a/Assets/Resources/Mobile.meta b/Assets/Resources/Mobile.meta new file mode 100644 index 00000000..a76c7270 --- /dev/null +++ b/Assets/Resources/Mobile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f134d222725933a4a8aa79fee0ebc10c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab index 5a880197..2546d766 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab @@ -347,6 +347,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6818617791399626994} + - {fileID: 7631758156335843687} - {fileID: 7550522280433707764} - {fileID: 6307032429101699376} - {fileID: 5836440878484963209} @@ -358,7 +359,6 @@ RectTransform: - {fileID: 5307116753344173197} - {fileID: 5298406130298708889} - {fileID: 7800446602652995690} - - {fileID: 7631758156335843687} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -460,7 +460,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5262667172184159172} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -538,7 +538,7 @@ RectTransform: - {fileID: 5307116753827441526} - {fileID: 5307116753824956015} m_Father: {fileID: 5262667172184159172} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -964,7 +964,7 @@ RectTransform: m_Children: - {fileID: 8442301621206230725} m_Father: {fileID: 5262667172184159172} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1247,7 +1247,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5262667172184159172} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1325,7 +1325,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5262667172184159172} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1499,8 +1499,6 @@ GameObject: m_Component: - component: {fileID: 5836440878484963209} - component: {fileID: 5836440878484963211} - - component: {fileID: 5836440878484963221} - - component: {fileID: 5836440878484963210} - component: {fileID: 5836440878484963208} - component: {fileID: 5836440878484963220} m_Layer: 5 @@ -1517,7 +1515,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5836440878484963214} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.004128741, w: 0.99999154} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1525,11 +1523,11 @@ RectTransform: - {fileID: 5307116754629177247} - {fileID: 5836440877148088560} m_Father: {fileID: 5262667172184159172} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.47300002} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -120} + m_AnchoredPosition: {x: 10.067352, y: -119.68649} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5836440878484963211 @@ -1540,48 +1538,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5836440878484963214} m_CullTransparentMesh: 0 ---- !u!114 &5836440878484963221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5836440878484963214} - 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: 0.15686275, g: 0.15686275, b: 0.20000002, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - 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 &5836440878484963210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5836440878484963214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 14 --- !u!114 &5836440878484963208 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1651,7 +1607,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5262667172184159172} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1726,7 +1682,7 @@ RectTransform: m_Children: - {fileID: 281043391255508357} m_Father: {fileID: 5262667172184159172} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1781,6 +1737,7 @@ GameObject: - component: {fileID: 7631758156335843687} - component: {fileID: 8471130078746586188} - component: {fileID: 1659265053451291376} + - component: {fileID: 3768721438180102200} m_Layer: 5 m_Name: Shadow m_TagString: Untagged @@ -1800,13 +1757,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5262667172184159172} - m_RootOrder: 12 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8471130078746586188 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1828,7 +1785,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1844,6 +1801,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3768721438180102200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7312186405814551362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 10 --- !u!1 &7550522280433707767 GameObject: m_ObjectHideFlags: 0 @@ -1875,7 +1845,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5262667172184159172} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2188,7 +2158,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2353,7 +2323,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Scripts/Apis/ApiBase.cs b/Assets/Scripts/Apis/ApiBase.cs index cf13ace7..c4e8f88c 100644 --- a/Assets/Scripts/Apis/ApiBase.cs +++ b/Assets/Scripts/Apis/ApiBase.cs @@ -107,9 +107,11 @@ namespace Assets.Scripts.Apis private static void HandleHeaders(HttpRequestHeaders defaultRequestHeaders) { #if UNITY_ANDROID - defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity-Android", ConfigHelper.AppVersion)); + defaultRequestHeaders.Add("User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} Android"); + defaultRequestHeaders.Add("Pf-User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} Android"); #elif UNITY_IOS - defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity-ios", ConfigHelper.AppVersion)); + defaultRequestHeaders.Add("User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} ios"); + defaultRequestHeaders.Add("Pf-User-Agent", $"PowerFun UnityApp/{ConfigHelper.AppVersion} ios"); #else defaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue("Unity", ConfigHelper.AppVersion)); #endif diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index ad29f5d0..46b5e54a 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -11,7 +11,7 @@ using Assets.Scripts.Devices; public static class App { - public static string Host = "http://192.168.0.101:5087/"; + public static string Host = "http://192.168.0.101:5085/"; public static string AppVersion = Application.version; diff --git a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs index 397fba48..256ab9aa 100644 --- a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs +++ b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs @@ -52,14 +52,13 @@ public class QuickLoginUser : MonoBehaviour } async void goMain() { -#if (UNITY_ANDROID || UNITY_IOS) - StartCoroutine("Loading"); -#endif - ApiBase.SetCookie(user.Cookie); var r = await ConfigHelper.userApi.QuickLogin(); if (r.result) { +#if (UNITY_ANDROID || UNITY_IOS) + StartCoroutine("Loading"); +#endif top.GetComponent().SaveInfo(r.data); App.CurrentUser = r.data; App.RideSetting.Sensitivity = App.CurrentUser.Sensitivity; diff --git a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs index c4eb6377..78581bff 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceItemScript.cs @@ -282,18 +282,18 @@ public class RaceItemScript : MonoBehaviour, IPointerExitHandler, IPointerEnterH #else public void OnPointerExit(PointerEventData eventData) { - if (_from == "list") - { - transform.Find("Masking").GetComponent().DOFade(0, 0.3f); - } + //if (_from == "list") + //{ + // transform.Find("Masking").GetComponent().DOFade(0, 0.3f); + //} } public void OnPointerEnter(PointerEventData eventData) { - if (_from == "list") - { - transform.Find("Masking").GetComponent().DOFade(1, 0.3f); - } + //if (_from == "list") + //{ + // transform.Find("Masking").GetComponent().DOFade(1, 0.3f); + //} } public void OnPointerUp(PointerEventData eventData) diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ 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}