From e84f14250bd76ba0c61fa313d672a2407979e5d0 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Tue, 14 Sep 2021 11:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=8D=A1=E7=89=87=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E4=BF=AE=E6=94=B9=EF=BC=9Buseragent=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B=E5=BE=AE=E4=BF=A1=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/XCodePostProcessBuild.cs | 7 +- .../Android/UnityCallWechatShare-release.aar | Bin 109191 -> 109176 bytes Assets/Plugins/Android/mainTemplate.gradle | 9 +- Assets/Plugins/iOS/IOSWechatController.m | 6 +- Assets/Resources/Mobile.meta | 8 ++ .../UI/Prefab/MapList/MapItem-Mobile.prefab | 94 ++++++------------ Assets/Scripts/Apis/ApiBase.cs | 6 +- Assets/Scripts/App.cs | 2 +- .../Scripts/UI/Prefab/Login/QuickLoginUser.cs | 7 +- .../Scripts/UI/Prefab/Race/RaceItemScript.cs | 16 +-- ProjectSettings/GraphicsSettings.asset | 1 - 11 files changed, 66 insertions(+), 90 deletions(-) create mode 100644 Assets/Resources/Mobile.meta 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 365ae4287f3a12b9f36cc951ed0debc9429d7b13..ff79407ffa14f9db07c39fbb86f0b400ffa391da 100644 GIT binary patch delta 7840 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 S00saC0CfQX0Q{%{0000V$ZGol 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}