Merge commit 'e8da273f47a6b6073f125d10478638fce283a61c' into Taptap

# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml   resolved by e8da273 version
#	Assets/Scenes/testCombat.scene   resolved by e8da273 version

Assets/Plugins/Android/AndroidManifest.xml

@@ -1,35 +1,22 @@
 <?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">
-
-
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
     <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"/>
-
-    <application
-            android:allowBackup="false"
-            tools:replace="android:allowBackup"
-            android:theme="@style/TuanjieThemeSelector">
-
-        <activity android:name="com.unity3d.player.PrivacyActivity"
-                  android:theme="@style/TuanjieThemeSelector"
-                  android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
+    <application>
         <meta-data
                 android:name="Crasheye_appkey"
-                android:value="djpz510z"/>
+                android:value="sm0zzhed" />
         <activity android:name="com.taptap.xy.yousanjie.MainActivity"
                   android:theme="@style/TuanjieThemeSelector">
-            <meta-data android:name="unityplayer.UnityActivity" android:value="true"/>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
         </activity>
     </application>
 </manifest>
-

Assets/Res/CombatScenes/CombatRoot.prefab

@@ -74,7 +74,7 @@ Camera:
   field of view: 60
   orthographic: 0
   orthographic size: 5
-  m_Depth: -1
+  m_Depth: 1
   m_CullingMask:
     serializedVersion: 2
     m_Bits: 1911
@@ -259,7 +259,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7320235550895006129
 Transform:
   m_ObjectHideFlags: 0

Assets/Res/UI/Canvas/Canvas.prefab

@@ -427,7 +427,7 @@ MonoBehaviour:
   m_RenderShadows: 0
   m_RequiresDepthTextureOption: 0
   m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
+  m_CameraType: 1
   m_Cameras: []
   m_RendererIndex: -1
   m_VolumeLayerMask: