From a32c3e1a22b761694bbaefd23fed0d613164aff5 Mon Sep 17 00:00:00 2001
From: cebgcontract <99630598+cebgcontract@users.noreply.github.com>
Date: Sat, 28 May 2022 15:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/AndroidManifest.xml |  5 +----
 app/build.gradle        | 37 ++++++++++++++++++-------------------
 gradle.properties       |  2 +-
 settings.gradle         |  2 +-
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 0a9b6f8..467c395 100755
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -8,11 +8,8 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <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="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
@@ -30,7 +27,7 @@
 
         <activity
             android:name="org.cocos2dx.javascript.AppActivity"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:usesCleartextTraffic="true"
diff --git a/app/build.gradle b/app/build.gradle
index e14a548..3e366bc 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,9 +36,9 @@ android {
                     targets 'cocos2djs'
                     arguments 'NDK_TOOLCHAIN_VERSION=clang'
 
-                    def module_paths = [project.file("/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/cocos2d-x"),
-                                        project.file("/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/cocos2d-x/cocos"),
-                                        project.file("/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/cocos2d-x/external")]
+                    def module_paths = [project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x"),
+                                        project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x/cocos"),
+                                        project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x/external")]
                     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
                         arguments 'NDK_MODULE_PATH=' + module_paths.join(";")
                     }
@@ -132,8 +132,7 @@ android.applicationVariants.all { variant ->
     delete "${buildDir}/intermediates/merged_assets/${variant.dirName}"
 
     variant.mergeAssets.doLast {
-        def sourceDir = "/Users/zhl/Documents/workspace/game/TestChain/build/jsb-link"
-//        def sourceDir = "${buildDir}/../../../jsb-default"
+        def sourceDir = "${buildDir}/../../../jsb-default"
 
         // copy {
         //     from "${sourceDir}/res"
@@ -160,20 +159,20 @@ android.applicationVariants.all { variant ->
         //     from "${sourceDir}/project.json"
         //     into outputDir
         // }
-        copy{
-            from "${sourceDir}"
-            include "res/**"
-            include "src/**"
-            include "jsb-adapter/**"
-
-            into outputDir
-        }
-
-        copy {
-            from "${sourceDir}/main.js"
-            from "${sourceDir}/project.json"
-            into outputDir
-        }
+//        copy{
+//            from "${sourceDir}"
+//            include "res/**"
+//            include "src/**"
+//            include "jsb-adapter/**"
+//
+//            into outputDir
+//        }
+//
+//        copy {
+//            from "${sourceDir}/main.js"
+//            from "${sourceDir}/project.json"
+//            into outputDir
+//        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 649a61c..947807e 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=30.0.2
 PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
 
 # fill in sign information for release mode
-RELEASE_STORE_FILE=/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/static/build-templates/native/debug.keystore
+RELEASE_STORE_FILE=/Applications/CocosCreator.app/Contents/Resources/static/build-templates/native/debug.keystore
 RELEASE_STORE_PASSWORD=123456
 RELEASE_KEY_ALIAS=debug_keystore
 RELEASE_KEY_PASSWORD=123456
diff --git a/settings.gradle b/settings.gradle
index 6f7fec3..085fba4 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 include ':libcocos2dx'
-project(':libcocos2dx').projectDir = new File('/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/cocos2d-x/cocos/platform/android/libcocos2dx')
+project(':libcocos2dx').projectDir = new File('/Applications/CocosCreator.app/Contents/Resources/cocos2d-x/cocos/platform/android/libcocos2dx')
 include ':install_time_asset_pack'
 include ':TestChain'
 project(':TestChain').projectDir = new File(settingsDir, 'app')