Pārlūkot izejas kodu

1.忽略unity工程文件
2.所有工程警告当错误

tanghai 4 gadi atpakaļ
vecāks
revīzija
412b8f376e

+ 6 - 0
.gitignore

@@ -50,3 +50,9 @@ Server/.DS_Store
 /Unity/.gradle
 /*.user
 /ToolsApp/
+/Unity/Unity.Editor.csproj
+/Unity/Unity.Hotfix.csproj
+/Unity/Unity.HotfixView.csproj
+/Unity/Unity.Model.csproj
+/Unity/Unity.ModelView.csproj
+/Unity/Unity.ThirdParty.csproj

+ 2 - 0
Server/ThirdParty/Server.ThirdParty.csproj

@@ -9,10 +9,12 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
         <DefineConstants>TRACE;SERVER;FEAT_SAFE</DefineConstants>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DefineConstants>TRACE;SERVER;FEAT_SAFE</DefineConstants>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <ItemGroup>

+ 2 - 0
Tools/ExcelExporter/ExcelExporter.csproj

@@ -14,10 +14,12 @@
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <OutputPath>./Bin</OutputPath>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <OutputPath>./Bin</OutputPath>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
     
     <ItemGroup>

+ 2 - 0
Tools/Proto2CS/Proto2CS.csproj

@@ -14,10 +14,12 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
       <OutputPath>./Bin</OutputPath>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
       <OutputPath>./Bin</OutputPath>
+      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
     <ItemGroup>

+ 1 - 0
Unity/Assets/Editor/csc.rsp

@@ -0,0 +1 @@
+-warnaserror

+ 1 - 2
Unity/Assets/Hotfix/Move.meta → Unity/Assets/Editor/csc.rsp.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 84316c4a00543419e88a3df1a10cd574
-folderAsset: yes
+guid: eaba7ce2bbb8544748d7136ff679d5a2
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 1 - 0
Unity/Assets/Hotfix/csc.rsp

@@ -0,0 +1 @@
+-warnaserror

+ 1 - 2
Unity/Assets/Hotfix/Scene.meta → Unity/Assets/Hotfix/csc.rsp.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 3939451e28db94f9c88ce0818cd4620c
-folderAsset: yes
+guid: a4c6a67c730344e4e99e7a66c4de3f00
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 1 - 0
Unity/Assets/HotfixView/csc.rsp

@@ -0,0 +1 @@
+-warnaserror

+ 1 - 2
Unity/Assets/Hotfix/Session.meta → Unity/Assets/HotfixView/csc.rsp.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: adf5deae1d9ac4153813f55bed293bb4
-folderAsset: yes
+guid: 499e13d9835d44504a6b7dc6a5ce8447
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 0 - 8
Unity/Assets/Model/Base/Async.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4b5c03796fa58a842afafcfb2c4a70b4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Unity/Assets/Model/Base/Event.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f4a531a7e2c04874fb0e829ae1773978
-folderAsset: yes
-timeCreated: 1498117616
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Unity/Assets/Model/Base/Helper.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ed9c96775abf00744a273222165c1a03
-folderAsset: yes
-timeCreated: 1474942922
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Unity/Assets/Model/Base/Object.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 600c9bb417aba1641897df52e4ea0eeb
-folderAsset: yes
-timeCreated: 1498116852
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Unity/Assets/Model/Base/RecyclableMemoryStream.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 70be99fa9645c134cb2894b12b106b3f
-folderAsset: yes
-timeCreated: 1527234045
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Model/Core/RecyclableMemoryStream.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c45f2097ae5964e149a1fa74e462fb2d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Unity/Assets/Model/Helper.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 750b9e7f02770174ba6d2e9aa59d68ae
-folderAsset: yes
-timeCreated: 1476935213
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Model/Scene.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: da44f331d6f7c4109be8c2a5f7672697
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Model/Session.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 265cfb8640ede454dbb0d70ea53fed94
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Unity/Assets/Model/Unit.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0f062045221a94d40af71e6c7cab5644
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 0
Unity/Assets/Model/csc.rsp

@@ -0,0 +1 @@
+-warnaserror

+ 1 - 2
Unity/Assets/Hotfix/Unit.meta → Unity/Assets/Model/csc.rsp.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 400db3603c5ab40fa84bbc1563fb5d65
-folderAsset: yes
+guid: 67f2a6c99f6894a41940c7af1a2b24fa
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 1 - 0
Unity/Assets/ModelView/csc.rsp

@@ -0,0 +1 @@
+-warnaserror

+ 7 - 0
Unity/Assets/ModelView/csc.rsp.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ab95aee78df764ef5a4e4bab55f0d4f9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 2
Unity/Packages/manifest.json

@@ -2,13 +2,12 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.analytics": "3.5.3",
     "com.unity.assetbundlebrowser": "1.7.0",
     "com.unity.collab-proxy": "1.3.9",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.textmeshpro": "3.0.4",
-    "com.unity.timeline": "1.4.6",
+    "com.unity.timeline": "1.4.7",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

+ 1 - 10
Unity/Packages/packages-lock.json

@@ -12,15 +12,6 @@
       "source": "builtin",
       "dependencies": {}
     },
-    "com.unity.analytics": {
-      "version": "3.5.3",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.assetbundlebrowser": {
       "version": "1.7.0",
       "depth": 0,
@@ -81,7 +72,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.timeline": {
-      "version": "1.4.6",
+      "version": "1.4.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 29
Unity/Unity.Editor.csproj


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 29
Unity/Unity.Hotfix.csproj


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 29
Unity/Unity.HotfixView.csproj


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 29
Unity/Unity.Model.csproj


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 29
Unity/Unity.ModelView.csproj


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 29
Unity/Unity.ThirdParty.csproj


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels