From 199978554db9b389f0eaf886093f07ec7e2db41d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 13 八月 2024 11:24:46 +0800
Subject: [PATCH] 0312 官网包同步最新引擎
---
Channel/Android/hyyngame_gw/launcherTemplate.gradle | 26 +++-----
Channel/Android/hyyngame_gw/LauncherManifest.xml | 33 +++++++++++
Channel/Android/hyyngame_gw/release/libs/library-release-hyyngame.aar | 0
Channel/Android/hyyngame_gw/mainTemplate.gradle | 31 +++++----
Channel/Android/hyyngame_gw/debug/libs/library-debug-hyyngame.aar | 0
Channel/Android/hyyngame_gw/settingsTemplate.gradle | 37 ++++++++++++
Channel/Android/hyyngame_gw/baseProjectTemplate.gradle | 39 +++---------
7 files changed, 108 insertions(+), 58 deletions(-)
diff --git a/Channel/Android/hyyngame_gw/LauncherManifest.xml b/Channel/Android/hyyngame_gw/LauncherManifest.xml
new file mode 100644
index 0000000..5a978c2
--- /dev/null
+++ b/Channel/Android/hyyngame_gw/LauncherManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.unity3d.player"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:installLocation="preferExternal">
+ <supports-screens
+ android:smallScreens="true"
+ android:normalScreens="true"
+ android:largeScreens="true"
+ android:xlargeScreens="true"
+ android:anyDensity="true"/>
+
+ <application android:label="@string/app_name"
+ android:icon="@mipmap/app_icon">
+ <activity
+ android:name="com.facebook.CustomTabActivity"
+ android:exported="false"
+ tools:replace="android:exported"
+ tools:ignore="AppLinkUrlError">
+
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.BROWSABLE" />
+
+ <data android:scheme="@string/fb_login_protocol_scheme"
+ tools:ignore="ManifestResource" />
+ </intent-filter>
+ </activity>
+ </application>
+</manifest>
diff --git a/Channel/Android/hyyngame_gw/baseProjectTemplate.gradle b/Channel/Android/hyyngame_gw/baseProjectTemplate.gradle
index ba07618..e9ff3ad 100644
--- a/Channel/Android/hyyngame_gw/baseProjectTemplate.gradle
+++ b/Channel/Android/hyyngame_gw/baseProjectTemplate.gradle
@@ -1,31 +1,14 @@
-// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
-
-allprojects {
- buildscript {
- repositories {**ARTIFACTORYREPOSITORY**
- google()
- jcenter()
- }
-
- dependencies {
- // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity
- // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html
- // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
- // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version
- classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
- classpath 'com.android.tools.build:gradle:4.0.1'
- classpath 'com.google.gms:google-services:4.3.10'
- **BUILD_SCRIPT_DEPS**
- }
- }
-
- repositories {**ARTIFACTORYREPOSITORY**
- google()
- jcenter()
- flatDir {
- dirs "${project(':unityLibrary').projectDir}/libs"
- }
- }
+plugins {
+ // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity
+ // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html
+ // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
+ // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version
+ id 'com.android.application' version '7.1.2' apply false
+ id 'com.android.library' version '7.1.2' apply false
+ //id 'com.android.tools.build' version "7.3.0" apply false
+ id "com.google.gms.google-services" version "4.3.10" apply false
+ id 'com.google.firebase.crashlytics' version '2.8.1' apply false
+ **BUILD_SCRIPT_DEPS**
}
task clean(type: Delete) {
diff --git a/Channel/Android/hyyngame_gw/debug/libs/library-debug-hyyngame.aar b/Channel/Android/hyyngame_gw/debug/libs/library-debug-hyyngame.aar
index 45a7983..7d3f2f1 100644
--- a/Channel/Android/hyyngame_gw/debug/libs/library-debug-hyyngame.aar
+++ b/Channel/Android/hyyngame_gw/debug/libs/library-debug-hyyngame.aar
Binary files differ
diff --git a/Channel/Android/hyyngame_gw/launcherTemplate.gradle b/Channel/Android/hyyngame_gw/launcherTemplate.gradle
index 55464b1..d2b0427 100644
--- a/Channel/Android/hyyngame_gw/launcherTemplate.gradle
+++ b/Channel/Android/hyyngame_gw/launcherTemplate.gradle
@@ -5,23 +5,20 @@
}
android {
- compileSdkVersion **APIVERSION**
- buildToolsVersion '33.0.0'
- repositories {
- flatDir {
- dirs 'libs'
- }
- }
+ ndkPath "**NDKPATH**"
+
+ compileSdkVersion 34
+ buildToolsVersion '34.0.0'
+
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
packagingOptions {exclude 'META-INF/rxjava.properties'}
-
defaultConfig {
- minSdkVersion **MINSDKVERSION**
- targetSdkVersion **TARGETSDKVERSION**
+ minSdkVersion 24
+ targetSdkVersion 34
applicationId '**APPLICATIONID**'
ndk {
abiFilters **ABIFILTERS**
@@ -32,7 +29,7 @@
aaptOptions {
noCompress = ['.unity3d', '.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
- ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+ ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
}**SIGN**
lintOptions {
@@ -43,13 +40,11 @@
buildTypes {
debug {
minifyEnabled **MINIFY_DEBUG**
- useProguard **PROGUARD_DEBUG**
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
jniDebuggable true
}
release {
minifyEnabled **MINIFY_RELEASE**
- useProguard **PROGUARD_RELEASE**
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
}
}**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS**
@@ -68,6 +63,5 @@
}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**
task copyJsonFile {
-
}
diff --git a/Channel/Android/hyyngame_gw/mainTemplate.gradle b/Channel/Android/hyyngame_gw/mainTemplate.gradle
index 8b95824..df8e8e3 100644
--- a/Channel/Android/hyyngame_gw/mainTemplate.gradle
+++ b/Channel/Android/hyyngame_gw/mainTemplate.gradle
@@ -1,6 +1,5 @@
apply plugin: 'com.android.library'
-//**APPLY_PLUGINS**
-apply from: 'deps.gradle'
+**APPLY_PLUGINS**
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -12,7 +11,7 @@
implementation(name: 'sdk_mycard-release', ext: 'aar')
implementation(name: 'sdk_oaid-release', ext: 'aar')
implementation(name: 'sdk_res_ald-release', ext: 'aar')
- //SDK鍩虹鑳藉姏
+ //SDK基础能力
implementation 'com.appsflyer:af-android-sdk:6.9.0'
implementation 'com.android.installreferrer:installreferrer:2.2'
api 'androidx.annotation:annotation:1.5.0'
@@ -27,24 +26,25 @@
}
//base theme
api 'androidx.appcompat:appcompat:1.2.0'
- //ald ui鐢�
+ //ald ui用
api 'androidx.cardview:cardview:1.0.0'
**DEPS**}
android {
- compileSdkVersion **APIVERSION**
- buildToolsVersion '33.0.0'
+ ndkPath "**NDKPATH**"
+
+ compileSdkVersion 34
+ buildToolsVersion '34.0.0'
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
-
+
packagingOptions {exclude 'META-INF/rxjava.properties'}
-
defaultConfig {
- minSdkVersion **MINSDKVERSION**
- targetSdkVersion **TARGETSDKVERSION**
+ minSdkVersion 24
+ targetSdkVersion 34
ndk {
abiFilters **ABIFILTERS**
}
@@ -59,7 +59,10 @@
}
aaptOptions {
- ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+ noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
+ ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
}**PACKAGING_OPTIONS**
-}**REPOSITORIES****SOURCE_BUILD_SETUP**
+}
+**IL_CPP_BUILD_SETUP**
+**SOURCE_BUILD_SETUP**
**EXTERNAL_SOURCES**
diff --git a/Channel/Android/hyyngame_gw/release/libs/library-release-hyyngame.aar b/Channel/Android/hyyngame_gw/release/libs/library-release-hyyngame.aar
index 45b74a9..fd2cfa4 100644
--- a/Channel/Android/hyyngame_gw/release/libs/library-release-hyyngame.aar
+++ b/Channel/Android/hyyngame_gw/release/libs/library-release-hyyngame.aar
Binary files differ
diff --git a/Channel/Android/hyyngame_gw/settingsTemplate.gradle b/Channel/Android/hyyngame_gw/settingsTemplate.gradle
new file mode 100644
index 0000000..afbe7d6
--- /dev/null
+++ b/Channel/Android/hyyngame_gw/settingsTemplate.gradle
@@ -0,0 +1,37 @@
+pluginManagement {
+ repositories {
+ **ARTIFACTORYREPOSITORY**
+ maven { url "https://jitpack.io" }
+ maven { url 'https://maven.aliyun.com/repository/releases' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
+ maven { url 'https://maven.aliyun.com/repository/central' }
+ maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+ maven { url 'https://maven.aliyun.com/repository/public' }
+ gradlePluginPortal()
+ google()
+ mavenCentral()
+ }
+}
+
+include ':launcher', ':unityLibrary'
+**INCLUDES**
+
+dependencyResolutionManagement {
+ repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+ repositories {
+ **ARTIFACTORYREPOSITORY**
+ maven { url "https://jitpack.io" }
+ maven { url 'https://maven.aliyun.com/repository/releases' }
+ maven { url 'https://maven.aliyun.com/repository/jcenter' }
+ maven { url 'https://maven.aliyun.com/repository/google' }
+ maven { url 'https://maven.aliyun.com/repository/central' }
+ maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+ maven { url 'https://maven.aliyun.com/repository/public' }
+ google()
+ mavenCentral()
+ flatDir {
+ dirs "${project(':unityLibrary').projectDir}/libs"
+ }
+ }
+}
--
Gitblit v1.8.0