diff --git a/.gitignore b/.gitignore index a405c6ba..207afcce 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,13 @@ InitializeUnityEditorChecker.cs xcode/ .DS_Store -_DS_Store \ No newline at end of file +_DS_Store +ATNativeAdOffer+Internal.h.meta +ATNativeAdOffer.h.meta +CodeDirectory.meta +CodeRequirements-1.meta +CodeRequirements.meta +CodeResources.meta +CodeSignature.meta +_CodeSignature.meta +popcorn/.vs 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/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar b/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar new file mode 100644 index 00000000..06695124 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta new file mode 100644 index 00000000..85d3dde6 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c28109225a36c4a84b153464a848e31c +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar new file mode 100644 index 00000000..98ec8865 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta new file mode 100644 index 00000000..d97f22eb --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 016b539d518d343628eb69f10edcbcb3 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar new file mode 100644 index 00000000..f876595c Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta new file mode 100644 index 00000000..b9b7a865 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 02d587c62b9794534a94fa3103b0c89e +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar new file mode 100644 index 00000000..337f4c49 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta new file mode 100644 index 00000000..f0752c91 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: ef19450e3442f4c86a25476c066b0980 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar b/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar new file mode 100644 index 00000000..78ac06c4 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta new file mode 100644 index 00000000..248092f3 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 6aa68cd49934749e0aa0a8903b125310 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar new file mode 100644 index 00000000..de447ec4 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta new file mode 100644 index 00000000..cbc56e2c --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 01ad0d8c9b440481e9eea9def41ad409 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar b/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar new file mode 100644 index 00000000..e8be07ba Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta new file mode 100644 index 00000000..6b280463 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 8223321be393c467297b4adff3c056df +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar new file mode 100644 index 00000000..cd1494a9 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta new file mode 100644 index 00000000..2a6c5539 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 75f8ce9a784394e82b50832da2056fe2 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar new file mode 100644 index 00000000..73e70ac4 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta new file mode 100644 index 00000000..9cfa9904 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 17ea17d707b0c4763915a457746ac607 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar new file mode 100644 index 00000000..79fd5502 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta new file mode 100644 index 00000000..fea38ea2 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 26c6cce7a14414d03b3d2ad70212bd41 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar new file mode 100644 index 00000000..a9968c7f Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta new file mode 100644 index 00000000..58f88bd1 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: edc91ca6c5a3640baa84726b1adf5555 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar new file mode 100644 index 00000000..7a5c3605 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta new file mode 100644 index 00000000..c8d4a24a --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 98f6f7a6b3db942119029f64a0d46a30 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar new file mode 100644 index 00000000..bccf86f7 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta new file mode 100644 index 00000000..209d4409 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 85eda5515f7e64917bebf950126e4929 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar new file mode 100644 index 00000000..01275eb2 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta new file mode 100644 index 00000000..c0a27b9c --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 34aca34bed39d483281862852482729c +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar new file mode 100644 index 00000000..2980f603 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta new file mode 100644 index 00000000..c40da5ad --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 7d59822de94ce4e5aa29934929bf523f +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar new file mode 100644 index 00000000..6c3f095c Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta new file mode 100644 index 00000000..82c5f873 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 8974afee5b66f45be8dc0bcaa707b363 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar new file mode 100644 index 00000000..27b091c1 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta new file mode 100644 index 00000000..dbd3df3a --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: b5fd7dff8c81f4edab790ca5c4aba7a0 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar new file mode 100644 index 00000000..5583b9f5 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta new file mode 100644 index 00000000..e29c6f63 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 85201507fb9834f29b274cb6b92bf91d +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar new file mode 100644 index 00000000..0809d720 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta new file mode 100644 index 00000000..7a887c81 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 13bbcd939608c4596af737ebe7ef1336 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar new file mode 100644 index 00000000..b142a708 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta new file mode 100644 index 00000000..f9c36a50 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 05f2cba90a7ec46a899698bdef1c6bb8 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar new file mode 100644 index 00000000..32c57746 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta new file mode 100644 index 00000000..e0d2d37f --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: ebd8411c649e441e280ca6b6e38f32ea +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar new file mode 100644 index 00000000..e9074ee4 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta new file mode 100644 index 00000000..57f2905a --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: d96290cfc82b344f893f214ccbc4f144 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar new file mode 100644 index 00000000..7bb51fd5 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta new file mode 100644 index 00000000..80844c22 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 94247b09bd7da4d4695cb6b3f164ec36 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar new file mode 100644 index 00000000..ebee0eee Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta new file mode 100644 index 00000000..3c73172f --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: fa54354da86b44a7eabe8ee4860dcee5 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar new file mode 100644 index 00000000..71d4748e Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta new file mode 100644 index 00000000..99e6fb1c --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c25a61264e7aa4b359d662914e15df79 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar b/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar new file mode 100644 index 00000000..d4792e06 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta new file mode 100644 index 00000000..84e52c67 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 64b9cd3937ee743d1819bdbc8249c86f +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar new file mode 100644 index 00000000..a7667298 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta new file mode 100644 index 00000000..276a6f82 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: f4f9c45d8ac6a4f109cdba841f9ea1ec +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar new file mode 100644 index 00000000..a56e068f Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta new file mode 100644 index 00000000..27d0458f --- /dev/null +++ b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 397f25029afc747f6ae98eaef36269ce +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar new file mode 100644 index 00000000..e20a3b82 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta new file mode 100644 index 00000000..326d3248 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 0b5aa8e9234924aae83e7f41de483ea3 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar new file mode 100644 index 00000000..f5da36f9 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta new file mode 100644 index 00000000..29bd421a --- /dev/null +++ b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: ff2802ddf477745afbbf34c3d7795add +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar new file mode 100644 index 00000000..dca0eb67 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta new file mode 100644 index 00000000..d284f829 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 024d5d6864a6247d689c8f60726bc6ee +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar new file mode 100644 index 00000000..9e6edf18 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta new file mode 100644 index 00000000..b5864665 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 062d2fe401b3648bb8d82f385cecca38 +labels: +- gpsr +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/JoyPacSDK/JoyPacAd/JoyPacAd/Plugins/iOS/Third.meta b/popcorn/Assets/Resources/JoyPacJSON.meta similarity index 77% rename from popcorn/Assets/JoyPacSDK/JoyPacAd/JoyPacAd/Plugins/iOS/Third.meta rename to popcorn/Assets/Resources/JoyPacJSON.meta index 135358dd..03dc3916 100644 --- a/popcorn/Assets/JoyPacSDK/JoyPacAd/JoyPacAd/Plugins/iOS/Third.meta +++ b/popcorn/Assets/Resources/JoyPacJSON.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f4e3fab8b513440db24716d57b549ee +guid: f770555dae34b4ddd9f58bfa0cdbfeb1 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json b/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json new file mode 100644 index 00000000..ac417fc4 --- /dev/null +++ b/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json @@ -0,0 +1 @@ +"{\"AdjustDeeplink\":\"\",\"ADJUST_APP_TOKEN\":\"3qgtbs1fnc1s\",\"GA_gameKey\":\"31b85abe526af175daa0edf184f318a6\",\"GA_secretKey\":\"f67efdd40269ae738ac8f9890c6338e65a0b0378\",\"DEVICEINFO_IPAD_TOKEN\":\"\",\"DEVICEINFO_IPHONE_TOKEN\":\"\",\"INTERSITIAL_SHOW_COUNT_TOKEN\":\"o56yld\",\"SECOND_LAUNCH_DAY_TOKEN\":\"w0ado1\",\"VIDEO_SHOW_COUNT_TOKEN\":\"7l45ib\",\"ADJUST_EVENT_RVIV24\":\"9mlkw2\",\"ADJUST_EVENT_RV24\":\"jwnqhw\",\"JoypacAppName\":\"小鸡爆米花\",\"JOYPAC_SDK_APPID\":\"ec897ae7b4\"}" \ No newline at end of file diff --git a/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json.meta b/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json.meta new file mode 100644 index 00000000..85dead8f --- /dev/null +++ b/popcorn/Assets/Resources/JoyPacJSON/StringKey_Android.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8ad379bf011504d71ae9b22270d7d65e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/ProjectSettings/AndroidResolverDependencies.xml b/popcorn/ProjectSettings/AndroidResolverDependencies.xml index 56eeed18..5d83343d 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/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index 4654e133..71c9e0f5 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/popcorn/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,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} diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 40ba6d0e..cd7e7c15 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.2 + 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 @@ -250,7 +250,7 @@ PlayerSettings: clonedFromGUID: 5f34be1353de5cf4398729fda238591b templatePackageId: com.unity.template.2d@3.3.2 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 2 + AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/JoyPacSDK/Core/Plugins/Android/joypac.keystore' @@ -751,8 +751,8 @@ PlayerSettings: webGLWasmStreaming: 0 scriptingDefineSymbols: 1: TextMeshPro - 4: TextMeshPro;Notifications - 7: TextMeshPro + 4: TextMeshPro + 7: ANDROID_CN;TextMeshPro 13: TextMeshPro 14: TextMeshPro 19: TextMeshPro @@ -762,6 +762,8 @@ PlayerSettings: 28: TextMeshPro 29: TextMeshPro 30: TextMeshPro + 32: TextMeshPro + 33: TextMeshPro platformArchitecture: iPhone: 1 scriptingBackend: