diff --git a/AndroidSDK/.idea/caches/build_file_checksums.ser b/AndroidSDK/.idea/caches/build_file_checksums.ser
index 2c408fca8e..6bf82f0ad9 100644
Binary files a/AndroidSDK/.idea/caches/build_file_checksums.ser and b/AndroidSDK/.idea/caches/build_file_checksums.ser differ
diff --git a/AndroidSDK/.idea/caches/gradle_models.ser b/AndroidSDK/.idea/caches/gradle_models.ser
new file mode 100644
index 0000000000..e8b2f8f3ba
Binary files /dev/null and b/AndroidSDK/.idea/caches/gradle_models.ser differ
diff --git a/AndroidSDK/.idea/codeStyles/Project.xml b/AndroidSDK/.idea/codeStyles/Project.xml
index 30aa626c23..ae78c113ff 100644
--- a/AndroidSDK/.idea/codeStyles/Project.xml
+++ b/AndroidSDK/.idea/codeStyles/Project.xml
@@ -1,29 +1,113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
\ No newline at end of file
diff --git a/AndroidSDK/.idea/codeStyles/codeStyleConfig.xml b/AndroidSDK/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000000..79ee123c2b
--- /dev/null
+++ b/AndroidSDK/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/AndroidSDK/.idea/gradle.xml b/AndroidSDK/.idea/gradle.xml
index 7ac24c777f..ee635a314d 100644
--- a/AndroidSDK/.idea/gradle.xml
+++ b/AndroidSDK/.idea/gradle.xml
@@ -3,6 +3,9 @@
diff --git a/AndroidSDK/.idea/misc.xml b/AndroidSDK/.idea/misc.xml
index eb655f9fae..10118312f2 100644
--- a/AndroidSDK/.idea/misc.xml
+++ b/AndroidSDK/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
@@ -13,23 +13,33 @@
+
+
+
+
+
-
+
+
+
+
+
+
-
+
diff --git a/AndroidSDK/.idea/vcs.xml b/AndroidSDK/.idea/vcs.xml
new file mode 100644
index 0000000000..6c0b863585
--- /dev/null
+++ b/AndroidSDK/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity
index 51dc360e33..db2d514c33 100644
--- a/Assets/LuaFramework/Scenes/Logo.unity
+++ b/Assets/LuaFramework/Scenes/Logo.unity
@@ -311,7 +311,7 @@ MonoBehaviour:
tokens:
- appid: debug-appid
serverUrl: http://thinkingdata.18183g.com
- mode: 2
+ mode: 1
timeZone: 0
timeZoneId:
--- !u!1 &3471622135844523394
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index de2025a7d2..59e0b83757 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: Test
- productName: "\u6D4B\u8BD5\u5305"
+ productName: "\u592A\u521D\u884C\u6D4B\u8BD5\u5305"
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@@ -155,7 +155,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1
applicationIdentifier:
- Android: com.mht.tcxcsb.test
+ Android: com.mht.tcxcsb.project
Standalone: com.doudou.dwc
Tizen: com.junfine.luaframework
iOS: com.doudou.dwc
@@ -251,8 +251,8 @@ PlayerSettings:
AndroidTargetArchitectures: 1
AndroidSplashScreenScale: 2
androidSplashScreen: {fileID: 0}
- AndroidKeystoreName:
- AndroidKeyaliasName:
+ AndroidKeystoreName: E:/Git/JL/KeyStore/mhthw_test.keystore
+ AndroidKeyaliasName: mhthwtest
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 0
AndroidIsGame: 1