From 0943da0651fdc61c05c42fdbc502e7faf68218c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E5=A9=B7=E5=A9=B7?= Date: Fri, 1 Apr 2022 17:48:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoyPacSDK/Resources/JoyPacParams.asset | 26 +++++------ .../Scripts/JPSettings/StaticStringsKey.cs | 12 +++++- .../Joypac/Scripts/Tool/AndroidTool/JPHide.cs | 38 ++++++++++++++++ .../Scripts/Tool/AndroidTool/JPHide.cs.meta | 11 +++++ .../Plugins/Android/AndroidManifest.xml | 38 +++++++++++++--- .../AndroidResolverDependencies.xml | 13 +----- popcorn/ProjectSettings/ProjectSettings.asset | 43 ++++++++++++++++--- 7 files changed, 145 insertions(+), 36 deletions(-) create mode 100644 popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs create mode 100644 popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs.meta mode change 100644 => 100755 popcorn/Assets/Plugins/Android/AndroidManifest.xml diff --git a/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset b/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset index 13fbc364..9b26e500 100644 --- a/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset +++ b/popcorn/Assets/JoyPacSDK/Resources/JoyPacParams.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: JoyPacParams m_EditorClassIdentifier: iOS_jPReleaseAreaType: 1 - Android_jPReleaseAreaType: 2 + Android_jPReleaseAreaType: 1 iOSCN_AdjustDeeplink: iOSCN_ADJUST_APP_TOKEN: gtc62c0h5ngg iOSCN_GA_gameKey: ca486def04a25e8dbdfa18b89f81e1d7 @@ -64,7 +64,7 @@ MonoBehaviour: AndroidOS_ADJUST_APP_TOKEN: AndroidOS_GA_gameKey: AndroidOS_GA_secretKey: - AndroidOS_IsHaveAdjustEvent: 0 + AndroidOS_IsHaveAdjustEvent: 1 AndroidOS_DEVICEINFO_IPAD_TOKEN: AndroidOS_DEVICEINFO_IPHONE_TOKEN: AndroidOS_INTERSITIAL_SHOW_COUNT_TOKEN: @@ -73,21 +73,21 @@ MonoBehaviour: AndroidOS_ADJUST_EVENT_RVIV24: AndroidOS_ADJUST_EVENT_RV24: AndroidCN_AdjustDeeplink: - AndroidCN_ADJUST_APP_TOKEN: - AndroidCN_GA_gameKey: - AndroidCN_GA_secretKey: - AndroidCN_IsHaveAdjustEvent: 0 + AndroidCN_ADJUST_APP_TOKEN: 3qgtbs1fnc1s + AndroidCN_GA_gameKey: 31b85abe526af175daa0edf184f318a6 + AndroidCN_GA_secretKey: f67efdd40269ae738ac8f9890c6338e65a0b0378 + AndroidCN_IsHaveAdjustEvent: 1 AndroidCN_DEVICEINFO_IPAD_TOKEN: AndroidCN_DEVICEINFO_IPHONE_TOKEN: - AndroidCN_INTERSITIAL_SHOW_COUNT_TOKEN: - AndroidCN_SECOND_LAUNCH_DAY_TOKEN: - AndroidCN_VIDEO_SHOW_COUNT_TOKEN: - AndroidCN_ADJUST_EVENT_RVIV24: - AndroidCN_ADJUST_EVENT_RV24: + AndroidCN_INTERSITIAL_SHOW_COUNT_TOKEN: o56yld + AndroidCN_SECOND_LAUNCH_DAY_TOKEN: w0ado1 + AndroidCN_VIDEO_SHOW_COUNT_TOKEN: 7l45ib + AndroidCN_ADJUST_EVENT_RVIV24: 9mlkw2 + AndroidCN_ADJUST_EVENT_RV24: jwnqhw AndroidOS_JoypacAppName: AndroidOS_JOYPAC_SDK_APPID: - AndroidCN_JoypacAppName: - AndroidCN_JOYPAC_SDK_APPID: + AndroidCN_JoypacAppName: "\u5C0F\u9E21\u7206\u7C73\u82B1" + AndroidCN_JOYPAC_SDK_APPID: ec897ae7b4 AndroidOS_UMENG_APPKEY: AndroidOS_UMENG_CHANNELID: googleplay AndroidOS_Admob_GADApplicationIdentifier: diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs index d664a815..6e2d30ab 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsKey.cs @@ -146,12 +146,20 @@ public class ConstStringKey public static long ADJUST_APP_INFO4 = 1949266482;//必填不能是1 #elif UNITY_ANDROID +#if ANDROID_CN public static long ADJUST_APP_SECRET = 1;//必填 public static long ADJUST_APP_INFO1 = 1670418450;//必填不能是1 public static long ADJUST_APP_INFO2 = 1312164470;//必填不能是1 public static long ADJUST_APP_INFO3 = 1369276793;//必填不能是1 public static long ADJUST_APP_INFO4 = 764359244;//必填不能是1 - +#else + public static long ADJUST_APP_SECRET = 1;//必填 + public static long ADJUST_APP_INFO1 = 1;//必填不能是1 + public static long ADJUST_APP_INFO2 = 1;//必填不能是1 + public static long ADJUST_APP_INFO3 = 1;//必填不能是1 + public static long ADJUST_APP_INFO4 = 1;//必填不能是1 +#endif + #endif @@ -169,7 +177,7 @@ public class ConstStringKey public string ADJUST_EVENT_RV24 = "h61tti";//必填 public string ADJUST_EVENT_RVIV24 = "n087kg";//必填 #elif UNITY_ANDROID - public string DEVICEINFO_IPHONE_TOKEN = "pj2o55";//必填 + public string DEVICEINFO_IPHONE_TOKEN = "pj2o55";//必填 public string DEVICEINFO_IPAD_TOKEN = "a2txyw";//必填 public string FIRST_RATE_TOKEN = "";//必填 public string INTERSITIAL_SHOW_COUNT_TOKEN = "o56yld";//必填 diff --git a/popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs b/popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs new file mode 100644 index 00000000..0fb28400 --- /dev/null +++ b/popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class JPHide : MonoBehaviour +{ + public bool androidCNHide = false; + public bool androidOSHide = false; + public bool iOSCNHide = false; + public bool iOSOSHide = false; + private void OnEnable() + { + if (androidCNHide) + { +#if UNITY_ANDROID && ANDROID_CN + this.gameObject.SetActive(false); +#endif + } + else if(androidOSHide) + { +#if UNITY_ANDROID && ANDROID_OS + this.gameObject.SetActive(false); +#endif + } + else if(iOSCNHide) + { +#if UNITY_IOS && IOS_OS + this.gameObject.SetActive(false); +#endif + } + else if(iOSOSHide) + { +#if UNITY_IOS && IOS_CN + this.gameObject.SetActive(false); +#endif + } + } +} diff --git a/popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs.meta b/popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs.meta new file mode 100644 index 00000000..ce3af138 --- /dev/null +++ b/popcorn/Assets/Joypac/Scripts/Tool/AndroidTool/JPHide.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab3d3f56a66224a85ab15b008ee8ed9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/AndroidManifest.xml b/popcorn/Assets/Plugins/Android/AndroidManifest.xml old mode 100644 new mode 100755 index 09fcd5f9..0d336396 --- a/popcorn/Assets/Plugins/Android/AndroidManifest.xml +++ b/popcorn/Assets/Plugins/Android/AndroidManifest.xml @@ -1,20 +1,48 @@ - + android:installLocation="preferExternal" + android:versionCode="1" + android:versionName="1.0"> + + + + + - - + + + + + + + + + + + diff --git a/popcorn/ProjectSettings/AndroidResolverDependencies.xml b/popcorn/ProjectSettings/AndroidResolverDependencies.xml index 56eeed18..f1370021 100644 --- a/popcorn/ProjectSettings/AndroidResolverDependencies.xml +++ b/popcorn/ProjectSettings/AndroidResolverDependencies.xml @@ -1,11 +1,7 @@ - com.google.android.gms:play-services-ads-identifier:17.0.0 - com.google.android.gms:play-services-appset:16.0.0 com.google.android.gms:play-services-appset:16.0.2 - com.google.android.gms:play-services-basement:17.2.1 com.google.android.instantapps:instantapps:1.1.0 - com.ironsource.sdk:mediationsdk:7.1.12 Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar @@ -35,20 +31,15 @@ Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar - Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-17.0.0.aar Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar - Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar - Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar - Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.4.32.jar - Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.4.32.jar - + @@ -58,7 +49,7 @@ - + \ No newline at end of file diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index d3be90f2..358bd954 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 0 - companyName: jp.usaya + companyName: joypac productName: "\u5C0F\u9E21\u5144\u5F1F\u7684\u7206\u7C73\u82B1\u5E97\u94FA" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -127,7 +127,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.1.0 + bundleVersion: 1.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -171,11 +171,11 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: jp.usaya.popcorn + Android: jp.usaya.popcornch.cn iPhone: jp.usaya.popcornch buildNumber: iPhone: 1 - AndroidBundleVersionCode: 2 + AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 21 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 @@ -549,6 +549,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -564,6 +565,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -579,6 +581,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -594,6 +597,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -656,6 +660,8 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -730,6 +736,31 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 + ps5ParamFilePath: + ps5VideoOutPixelFormat: 0 + ps5VideoOutInitialWidth: 1920 + ps5VideoOutOutputMode: 1 + ps5BackgroundImagePath: + ps5StartupImagePath: + ps5Pic2Path: + ps5StartupImagesFolder: + ps5IconImagesFolder: + ps5SaveDataImagePath: + ps5SdkOverride: + ps5BGMPath: + ps5ShareOverlayImagePath: + ps5NPConfigZipPath: + ps5Passcode: 5PN2qmWqBlQ9wQj99nsQzldVI5ZuGXbE + ps5UseResolutionFallback: 0 + ps5UseAudio3dBackend: 0 + ps5ScriptOptimizationLevel: 2 + ps5Audio3dVirtualSpeakerCount: 14 + ps5UpdateReferencePackage: + ps5disableAutoHideSplash: 0 + ps5OperatingSystemCanDisableSplashScreen: 0 + ps5IncludedModules: [] + ps5SharedBinaryContentLabels: [] + ps5SharedBinarySystemFolders: [] monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -752,7 +783,7 @@ PlayerSettings: scriptingDefineSymbols: 1: TextMeshPro 4: TextMeshPro - 7: TextMeshPro + 7: ANDROID_CN;TextMeshPro 13: TextMeshPro 14: TextMeshPro 19: TextMeshPro @@ -762,6 +793,8 @@ PlayerSettings: 28: TextMeshPro 29: TextMeshPro 30: TextMeshPro + 32: TextMeshPro + 33: TextMeshPro platformArchitecture: iPhone: 1 scriptingBackend: