还原配置文件
This commit is contained in:
parent
fb0e1422ca
commit
a32c3e1a22
@ -8,11 +8,8 @@
|
|||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||||
<uses-permission android:name="android.permission.ACCESS_WIFI_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.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.CHANGE_WIFI_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.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||||
@ -30,7 +27,7 @@
|
|||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name="org.cocos2dx.javascript.AppActivity"
|
android:name="org.cocos2dx.javascript.AppActivity"
|
||||||
android:screenOrientation="sensorPortrait"
|
android:screenOrientation="sensorLandscape"
|
||||||
android:configChanges="orientation|keyboardHidden|screenSize"
|
android:configChanges="orientation|keyboardHidden|screenSize"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
|
@ -36,9 +36,9 @@ android {
|
|||||||
targets 'cocos2djs'
|
targets 'cocos2djs'
|
||||||
arguments 'NDK_TOOLCHAIN_VERSION=clang'
|
arguments 'NDK_TOOLCHAIN_VERSION=clang'
|
||||||
|
|
||||||
def module_paths = [project.file("/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/cocos2d-x"),
|
def module_paths = [project.file("/Applications/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.app/Contents/Resources/cocos2d-x/cocos"),
|
||||||
project.file("/Applications/CocosCreator/Creator/2.0.10/CocosCreator.app/Contents/Resources/cocos2d-x/external")]
|
project.file("/Applications/CocosCreator.app/Contents/Resources/cocos2d-x/external")]
|
||||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
||||||
arguments 'NDK_MODULE_PATH=' + module_paths.join(";")
|
arguments 'NDK_MODULE_PATH=' + module_paths.join(";")
|
||||||
}
|
}
|
||||||
@ -132,8 +132,7 @@ android.applicationVariants.all { variant ->
|
|||||||
delete "${buildDir}/intermediates/merged_assets/${variant.dirName}"
|
delete "${buildDir}/intermediates/merged_assets/${variant.dirName}"
|
||||||
|
|
||||||
variant.mergeAssets.doLast {
|
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 {
|
// copy {
|
||||||
// from "${sourceDir}/res"
|
// from "${sourceDir}/res"
|
||||||
@ -160,20 +159,20 @@ android.applicationVariants.all { variant ->
|
|||||||
// from "${sourceDir}/project.json"
|
// from "${sourceDir}/project.json"
|
||||||
// into outputDir
|
// into outputDir
|
||||||
// }
|
// }
|
||||||
copy{
|
// copy{
|
||||||
from "${sourceDir}"
|
// from "${sourceDir}"
|
||||||
include "res/**"
|
// include "res/**"
|
||||||
include "src/**"
|
// include "src/**"
|
||||||
include "jsb-adapter/**"
|
// include "jsb-adapter/**"
|
||||||
|
//
|
||||||
into outputDir
|
// into outputDir
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
copy {
|
// copy {
|
||||||
from "${sourceDir}/main.js"
|
// from "${sourceDir}/main.js"
|
||||||
from "${sourceDir}/project.json"
|
// from "${sourceDir}/project.json"
|
||||||
into outputDir
|
// into outputDir
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ PROP_BUILD_TOOLS_VERSION=30.0.2
|
|||||||
PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
|
PROP_APP_ABI=armeabi-v7a:arm64-v8a:x86
|
||||||
|
|
||||||
# fill in sign information for release mode
|
# 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_STORE_PASSWORD=123456
|
||||||
RELEASE_KEY_ALIAS=debug_keystore
|
RELEASE_KEY_ALIAS=debug_keystore
|
||||||
RELEASE_KEY_PASSWORD=123456
|
RELEASE_KEY_PASSWORD=123456
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
include ':libcocos2dx'
|
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 ':install_time_asset_pack'
|
||||||
include ':TestChain'
|
include ':TestChain'
|
||||||
project(':TestChain').projectDir = new File(settingsDir, 'app')
|
project(':TestChain').projectDir = new File(settingsDir, 'app')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user