tanghai 7 лет назад
Родитель
Сommit
30bb0d06ba

+ 1 - 0
.gitignore

@@ -47,3 +47,4 @@ Server/.DS_Store
 /Server/.vscode/
 .vs/
 .objs/
+/Unity/.gradle

+ 1 - 1
Unity/Assets/Hotfix/Base/Object/Component.cs

@@ -1,7 +1,7 @@
 using System;
 using ETModel;
 using MongoDB.Bson.Serialization.Attributes;
-#if UNITY_EDITOR
+#if !SERVER
 using UnityEngine;
 #endif
 

+ 1 - 1
Unity/Assets/Model/Base/Object/Component.cs

@@ -1,7 +1,7 @@
 using System;
 using ETModel;
 using MongoDB.Bson.Serialization.Attributes;
-#if UNITY_EDITOR
+#if !SERVER
 using UnityEngine;
 #endif
 

+ 1 - 0
Unity/ProjectSettings/GraphicsSettings.asset

@@ -37,6 +37,7 @@ GraphicsSettings:
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

+ 94 - 2
Unity/ProjectSettings/ProjectSettings.asset

@@ -265,7 +265,99 @@ PlayerSettings:
       m_Width: 128
       m_Height: 128
       m_Kind: 0
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
@@ -572,7 +664,7 @@ PlayerSettings:
   platformArchitecture:
     iOS: 2
   scriptingBackend:
-    Android: 1
+    Android: 0
     Standalone: 0
     iOS: 1
   il2cppCompilerConfiguration: {}

+ 1 - 0
Unity/ProjectSettings/UnityConnectSettings.asset

@@ -21,6 +21,7 @@ UnityConnectSettings:
   UnityAnalyticsSettings:
     m_Enabled: 0
     m_TestMode: 0
+    m_InitializeOnStartup: 1
   UnityAdsSettings:
     m_Enabled: 0
     m_InitializeOnStartup: 1