Răsfoiți Sursa

客户端不需要StructBsonSerialize这个类,放到Editor中

tanghai 4 ani în urmă
părinte
comite
566bf5934a

+ 3 - 0
Robot/Model/Robot.Model.csproj

@@ -25,6 +25,9 @@
         <Compile Include="..\..\Unity\Assets\Editor\Helper\MongoHelper.cs">
           <Link>Base\MongoHelper.cs</Link>
         </Compile>
+        <Compile Include="..\..\Unity\Assets\Editor\Helper\StructBsonSerialize.cs">
+          <Link>Base\StructBsonSerialize.cs</Link>
+        </Compile>
         <Compile Include="..\..\Unity\Assets\Model\Module\Config\**\*.cs">
             <Link>Module\Config\%(RecursiveDir)%(FileName)%(Extension)</Link>
         </Compile>

+ 4 - 0
Server/Model/Server.Model.csproj

@@ -26,6 +26,10 @@
       <Link>Base\MongoHelper.cs</Link>
     </Compile>
 
+    <Compile Include="..\..\Unity\Assets\Editor\Helper\StructBsonSerialize.cs">
+      <Link>Base\StructBsonSerialize.cs</Link>
+    </Compile>
+
     <Compile Include="..\..\Unity\Assets\Model\Core\**\*.cs"> 
       <Link>Core\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Compile>

+ 1 - 1
Unity/Assets/Bundles/Lua/CSharpLua/All.lua.txt

@@ -53,7 +53,7 @@ return function(dir, conf)
   load("Reflection.Assembly")
   load("Threading.Timer")
   load("Threading.Thread")
-  load("Threading.Task")
+  --load("Threading.Task")
   load("Utilities")
   load("Globalization.Globalization")
   load("Numerics.HashCodeHelper")

+ 0 - 0
Unity/Assets/Model/Core/StructBsonSerialize.cs → Unity/Assets/Editor/Helper/StructBsonSerialize.cs


+ 0 - 11
Unity/Assets/Model/Core/StructBsonSerialize.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7856d777b53954b63b254ab613ceb77f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 7
Unity/Assets/Mono/XLua/LuaEntry.cs

@@ -21,13 +21,7 @@ namespace ET
             
             scriptEnv = luaEnv.NewTable();
 
-            LuaTable meta = luaEnv.NewTable();
-            meta.Set("__index", luaEnv.Global);
-            scriptEnv.SetMetaTable(meta);
-            meta.Dispose();
-
-            scriptEnv.Set("self", this);
-            this.luaEnv.DoString("require 'Main.lua'(true)");
+            this.luaEnv.DoString("require 'Main.lua'()");
 
             scriptEnv.Get("Update", out this.update);
             scriptEnv.Get("LateUpdate", out this.lateUpdate);