同步Unity平台下的调整

Author: vimfung

Source/Unity3D/UnityCommon/LuaScriptCoreForUnity.cpp

@@ -222,7 +222,7 @@ extern "C" {
         LuaContext *context = dynamic_cast<LuaContext *>(LuaObjectManager::SharedInstance() -> getObject(nativeContextId));
         if (context != NULL && message != NULL)
         {
-            context -> raiseException(message);
+            context -> getCurrentSession() -> reportLuaException(message);
         }
     }
 
@@ -546,7 +546,7 @@ extern "C" {
                 {
                     std::string methodName = decoder -> readString();
                     //分割方法组成部分
-                    std::vector<std::string> methodComps = StringUtils::split(methodName, "_", false);
+                    std::deque<std::string> methodComps = StringUtils::split(methodName, "_", false);
                     LuaUnityExportMethodDescriptor *methodDescriptor = new LuaUnityExportMethodDescriptor(methodComps[0], methodComps[1], classMethodRouteHandler);
                     typeDescriptor -> addClassMethod(methodComps[0], methodDescriptor);
                     methodDescriptor -> release();
@@ -563,7 +563,7 @@ extern "C" {
                 {
                     std::string methodName = decoder -> readString();
                     //分割方法组成部分
-                    std::vector<std::string> methodComps = StringUtils::split(methodName, "_", false);
+                    std::deque<std::string> methodComps = StringUtils::split(methodName, "_", false);
                     LuaUnityExportMethodDescriptor *methodDescriptor = new LuaUnityExportMethodDescriptor(methodComps[0], methodComps[1],  instanceMethodRouteHandler);
                     typeDescriptor -> addInstanceMethod(methodComps[0], methodDescriptor);
                     methodDescriptor -> release();
@@ -579,7 +579,7 @@ extern "C" {
                 for (int i = 0; i < size; i++)
                 {
                     std::string fieldName = decoder -> readString();
-                    std::vector<std::string> fieldNameComps = StringUtils::split(fieldName, "_", false);
+                    std::deque<std::string> fieldNameComps = StringUtils::split(fieldName, "_", false);
 
                     bool canRead = false;
                     bool canWrite = false;

Source/Unity3D/UnityCommon/LuaUnityExportTypeDescriptor.cpp

@@ -9,6 +9,7 @@
 #include "LuaUnityExportTypeDescriptor.hpp"
 #include "LuaUnityEnv.hpp"
 #include "LuaObjectDescriptor.h"
+#include "LuaSession.h"
 
 LuaUnityExportTypeDescriptor::LuaUnityExportTypeDescriptor(std::string name, LuaExportTypeDescriptor *parentTypeDescriptor) : LuaExportTypeDescriptor(name, parentTypeDescriptor)
 {
@@ -33,12 +34,12 @@ LuaObjectDescriptor* LuaUnityExportTypeDescriptor::createInstance(LuaSession *se
     if (createInstanceHandler != NULL)
     {
         long long instanceId = createInstanceHandler(objectId());
-        objectDescriptor = new LuaObjectDescriptor((void *)instanceId, this);
+        objectDescriptor = new LuaObjectDescriptor(session -> getContext(), (void *)instanceId, this);
 
         //设置本地对象标识
         LuaUnityEnv::sharedInstance() -> setNativeObjectId(objectDescriptor -> getObject(),
                                                            objectDescriptor -> objectId(),
-                                                           objectDescriptor -> getLinkId());
+                                                           objectDescriptor -> getExchangeId());
     }
 
     return objectDescriptor;

Source/Unity3D/UnityProject/Assets/Plugins/LuaScriptCore/LuaContext.cs

@@ -177,6 +177,7 @@ public void onException(LuaExceptionHandler handler)
 		public void raiseException(string message)
 		{
 			NativeUtils.raiseException (_nativeObjectId, message);
+			throw new Exception (message);
 		}
 
 		/// <summary>

Source/Unity3D/UnityProject/Assets/Scripts/Person.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.CodeDom;
 using cn.vimfung.luascriptcore;
+using System;
 
 public class Person : LuaExportType 
 {
@@ -31,8 +32,15 @@ public static Person createPerson()
 
 	public static Person createPersonError()
 	{
-		LuaContext.currentContext.raiseException ("can't create person");
-		return new Person ();
+		try
+		{
+			LuaContext.currentContext.raiseException ("can't create person");
+			return new Person ();
+		}
+		catch (Exception ex)
+		{
+			return null;
+		}
 	}
 
 	public void speak()

Source/lua-common/LuaFunction.cpp

@@ -54,12 +54,14 @@ std::string LuaFunction::typeName()
 LuaFunction::LuaFunction (LuaObjectDecoder *decoder)
     :LuaManagedObject(decoder)
 {
+    decoder -> readInt32(); //读取Unity中传过来的ContextID，并忽略(decoder中包含context对象)
     _exchangeId = decoder -> readString();
 }
 
 void LuaFunction::serialization (LuaObjectEncoder *encoder)
 {
     LuaObject::serialization(encoder);
+    encoder -> writeInt32(getContext() -> objectId());
     encoder -> writeString(_exchangeId);
 }
 
@@ -140,4 +142,4 @@ LuaValue* LuaFunction::invoke(LuaArgumentList *arguments)
     getContext() -> gc();
 
     return retValue;
-}
+}