Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Plugins/Android/AndroidManifest.xml

@@ -9,7 +9,7 @@
     <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">
             <intent-filter>

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: