From 67053545e1ff8236821c17446f64e775a644ff2c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 13 八月 2024 11:19:23 +0800
Subject: [PATCH] 0312 官网包同步最新引擎
---
SdkProject/library/src/main/java/com/secondworld/sdk/UnityPlayerActivity.java | 22 +++++++++++-----------
Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar | 0
SdkProject/gradle/wrapper/gradle-wrapper.properties | 12 ++++++------
Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar | 0
SdkProject/library/build.gradle | 10 +++++-----
SdkProject/build.gradle | 2 +-
SdkProject/library/libs/unity-classes.jar | 0
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
index 45a7983..7d3f2f1 100644
--- a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
+++ b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
Binary files differ
diff --git a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
index 45b74a9..fd2cfa4 100644
--- a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
+++ b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
Binary files differ
diff --git a/SdkProject/build.gradle b/SdkProject/build.gradle
index ee9e181..84aaa05 100644
--- a/SdkProject/build.gradle
+++ b/SdkProject/build.gradle
@@ -8,7 +8,7 @@
}
dependencies {
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
- classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath "com.android.tools.build:gradle:7.3.0"
classpath 'com.google.gms:google-services:4.3.10'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module deps.gradle files
diff --git a/SdkProject/gradle/wrapper/gradle-wrapper.properties b/SdkProject/gradle/wrapper/gradle-wrapper.properties
index 510ee81..ef753c6 100644
--- a/SdkProject/gradle/wrapper/gradle-wrapper.properties
+++ b/SdkProject/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 30 14:46:25 CST 2020
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+#Tue Aug 13 11:11:28 CST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 7e5b84d..7a48ff6 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -33,12 +33,12 @@
def channelJavaFiles = getAllFiles(new ArrayList<File>(), "${channelPath}/java")
android {
- compileSdkVersion 33
- buildToolsVersion "33.0.0"
+ compileSdkVersion 34
+ buildToolsVersion "34.0.0"
defaultConfig {
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
@@ -62,8 +62,8 @@
}
}
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'}
lintOptions {
diff --git a/SdkProject/library/libs/unity-classes.jar b/SdkProject/library/libs/unity-classes.jar
index 502ff04..81301f9 100644
--- a/SdkProject/library/libs/unity-classes.jar
+++ b/SdkProject/library/libs/unity-classes.jar
Binary files differ
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/UnityPlayerActivity.java b/SdkProject/library/src/main/java/com/secondworld/sdk/UnityPlayerActivity.java
index ee5653c..d9f5101 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/UnityPlayerActivity.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/UnityPlayerActivity.java
@@ -1,4 +1,3 @@
-// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN
package com.secondworld.sdk;
import android.app.Activity;
@@ -12,8 +11,10 @@
import android.view.Window;
import android.view.WindowManager;
import android.os.Process;
+
import com.unity3d.player.IUnityPlayerLifecycleEvents;
import com.unity3d.player.UnityPlayer;
+
public class UnityPlayerActivity extends Activity implements IUnityPlayerLifecycleEvents
{
@@ -50,9 +51,8 @@
moveTaskToBack(true);
}
- // When Unity player quited kill process
+ // Callback before Unity player process is killed
@Override public void onUnityPlayerQuitted() {
- Process.killProcess(Process.myPid());
}
@Override protected void onNewIntent(Intent intent)
@@ -79,27 +79,27 @@
@Override protected void onStop()
{
super.onStop();
- mUnityPlayer.pause();
+ mUnityPlayer.onStop();
}
@Override protected void onStart()
{
super.onStart();
- mUnityPlayer.resume();
+ mUnityPlayer.onStart();
}
// Pause Unity
@Override protected void onPause()
{
super.onPause();
- mUnityPlayer.pause();
+ mUnityPlayer.onPause();
}
// Resume Unity
@Override protected void onResume()
{
super.onResume();
- mUnityPlayer.resume();
+ mUnityPlayer.onResume();
}
// Low Memory Unity
@@ -143,8 +143,8 @@
}
// Pass any events not handled by (unfocused) views straight to UnityPlayer
- @Override public boolean onKeyUp(int keyCode, KeyEvent event) { return mUnityPlayer.injectEvent(event); }
- @Override public boolean onKeyDown(int keyCode, KeyEvent event) { return mUnityPlayer.injectEvent(event); }
- @Override public boolean onTouchEvent(MotionEvent event) { return mUnityPlayer.injectEvent(event); }
- /*API12*/ public boolean onGenericMotionEvent(MotionEvent event) { return mUnityPlayer.injectEvent(event); }
+ @Override public boolean onKeyUp(int keyCode, KeyEvent event) { return mUnityPlayer.onKeyUp(keyCode, event); }
+ @Override public boolean onKeyDown(int keyCode, KeyEvent event) { return mUnityPlayer.onKeyDown(keyCode, event); }
+ @Override public boolean onTouchEvent(MotionEvent event) { return mUnityPlayer.onTouchEvent(event); }
+ @Override public boolean onGenericMotionEvent(MotionEvent event) { return mUnityPlayer.onGenericMotionEvent(event); }
}
--
Gitblit v1.8.0