浏览代码

Merge branch 'master' of http://10.108.64.190:3000/gfg/client

zhaoyang 2 年之前
父节点
当前提交
96e5d50cc7
共有 2 个文件被更改,包括 4 次插入5 次删除
  1. 1 2
      GameClient/Assets/link.xml
  2. 3 3
      GameClient/ProjectSettings/ProjectSettings.asset

+ 1 - 2
GameClient/Assets/link.xml

@@ -3,7 +3,6 @@
 	<assembly fullname="UnityEngine.SpriteMaskModule">
 		<type fullname="UnityEngine.SpriteMask" preserve="all" />
 	</assembly>
-	<assembly fullname="UnityEngine.CoreModule">
-		<type fullname="UnityEngine.Rendering.SortingGroup" preserve="all" />
+	<assembly fullname="UnityEngine.CoreModule" preserve="all">
 	</assembly>
 </linker>

+ 3 - 3
GameClient/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: gfg
-  productName: "\u4E07\u4E16\u955C_zy"
+  productName: "\u4E07\u4E16\u955C"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1}
@@ -164,7 +164,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.shenyou.gfg.zy
+    Android: com.shenyou.gfg.local
     Standalone: com.DefaultCompany.GFGClient
   buildNumber:
     Standalone: 0
@@ -699,7 +699,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    7: ILRuntime1;PT_DEV111;PT_TEMP111
+    7: 
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: