参数

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_ADJUST_APP_TOKEN: 3qgtbs1fnc1s
-  AndroidCN_GA_gameKey: 
+  AndroidCN_GA_gameKey: 31b85abe526af175daa0edf184f318a6
-  AndroidCN_GA_secretKey: 
+  AndroidCN_GA_secretKey: f67efdd40269ae738ac8f9890c6338e65a0b0378
-  AndroidCN_IsHaveAdjustEvent: 0
+  AndroidCN_IsHaveAdjustEvent: 1
   AndroidCN_DEVICEINFO_IPAD_TOKEN: 
   AndroidCN_DEVICEINFO_IPHONE_TOKEN: 
-  AndroidCN_INTERSITIAL_SHOW_COUNT_TOKEN: 
+  AndroidCN_INTERSITIAL_SHOW_COUNT_TOKEN: o56yld
-  AndroidCN_SECOND_LAUNCH_DAY_TOKEN: 
+  AndroidCN_SECOND_LAUNCH_DAY_TOKEN: w0ado1
-  AndroidCN_VIDEO_SHOW_COUNT_TOKEN: 
+  AndroidCN_VIDEO_SHOW_COUNT_TOKEN: 7l45ib
-  AndroidCN_ADJUST_EVENT_RVIV24: 
+  AndroidCN_ADJUST_EVENT_RVIV24: 9mlkw2
-  AndroidCN_ADJUST_EVENT_RV24: 
+  AndroidCN_ADJUST_EVENT_RV24: jwnqhw
   AndroidOS_JoypacAppName: 
   AndroidOS_JOYPAC_SDK_APPID: 
-  AndroidCN_JoypacAppName: 
+  AndroidCN_JoypacAppName: "\u5C0F\u9E21\u7206\u7C73\u82B1"
-  AndroidCN_JOYPAC_SDK_APPID: 
+  AndroidCN_JOYPAC_SDK_APPID: ec897ae7b4
   AndroidOS_UMENG_APPKEY: 
   AndroidOS_UMENG_CHANNELID: googleplay
   AndroidOS_Admob_GADApplicationIdentifier: 

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";//必填

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
+        }
+    }
+}

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: 

popcorn/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,20 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.unity3d.player"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:installLocation="preferExternal"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true"/>
 
+    <!-- Permissions needed by the Adjust SDK. -->
+    <!-- For more information, check: https://github.com/adjust/unity_sdk#post-build-android -->
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE" />
 
-    <application>
+    <application
-        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+        android:theme="@style/UnityThemeSelector"
-                  android:theme="@style/UnityThemeSelector">
+        android:icon="@drawable/app_icon"
+        android:label="@string/app_name"
+        android:debuggable="true">
+
+        <!-- Adjust broadcast receiver used to capture referrer content from INSTALL_REFERRER intent. -->
+        <receiver
+            android:name="com.adjust.sdk.AdjustReferrerReceiver"
+            android:permission="android.permission.INSTALL_PACKAGES"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="com.android.vending.INSTALL_REFERRER" />
+            </intent-filter>
+        </receiver>
+
+        <activity 
+            android:name="com.unity3d.player.UnityPlayerActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
             <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
         </activity>
     </application>

popcorn/ProjectSettings/AndroidResolverDependencies.xml

@@ -1,11 +1,7 @@
 <dependencies>
   <packages>
-    <package>com.google.android.gms:play-services-ads-identifier:17.0.0</package>
-    <package>com.google.android.gms:play-services-appset:16.0.0</package>
     <package>com.google.android.gms:play-services-appset:16.0.2</package>
-    <package>com.google.android.gms:play-services-basement:17.2.1</package>
     <package>com.google.android.instantapps:instantapps:1.1.0</package>
-    <package>com.ironsource.sdk:mediationsdk:7.1.12</package>
   </packages>
   <files>
     <file>Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar</file>
@@ -35,20 +31,15 @@
     <file>Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar</file>
     <file>Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar</file>
     <file>Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar</file>
-    <file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-17.0.0.aar</file>
     <file>Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar</file>
     <file>Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar</file>
     <file>Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar</file>
     <file>Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar</file>
     <file>Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar</file>
-    <file>Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar</file>
-    <file>Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar</file>
-    <file>Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.4.32.jar</file>
-    <file>Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.4.32.jar</file>
   </files>
   <settings>
     <setting name="androidAbis" value="arm64-v8a" />
-    <setting name="bundleId" value="jp.usaya.popcorn" />
+    <setting name="bundleId" value="jp.usaya.popcornch.cn" />
     <setting name="explodeAars" value="True" />
     <setting name="gradleBuildEnabled" value="True" />
     <setting name="gradlePropertiesTemplateEnabled" value="False" />
@@ -58,7 +49,7 @@
     <setting name="packageDir" value="Assets/Plugins/Android" />
     <setting name="patchAndroidManifest" value="True" />
     <setting name="patchMainTemplateGradle" value="True" />
-    <setting name="projectExportEnabled" value="False" />
+    <setting name="projectExportEnabled" value="True" />
     <setting name="useJetifier" value="True" />
   </settings>
 </dependencies>

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: