override一个泛型父类时的处理

Domain · Mar 20, 2018 · 5debef8 · 5debef8
1 parent 64b28a6
commit 5debef8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Assets/XLua/Src/Editor/Hotfix.cs b/Assets/XLua/Src/Editor/Hotfix.cs
@@ -648,7 648,25 @@ static MethodReference findBase(TypeDefinition type, MethodDefinition method)
  var m = findOverride(tbase, method);
  if (m != null)
  {
- return m;
  if (type.BaseType.IsGenericInstance)
  {
  //(type.BaseType as GenericInstanceType).GenericArguments
  var reference = new MethodReference(m.Name, m.ReturnType, type.BaseType)
  {
  HasThis = m.HasThis,
  ExplicitThis = m.ExplicitThis,
  CallingConvention = m.CallingConvention
  };
  foreach (var parameter in m.Parameters)
  reference.Parameters.Add(new ParameterDefinition(parameter.ParameterType));
  foreach (var generic_parameter in m.GenericParameters)
  reference.GenericParameters.Add(new GenericParameter(generic_parameter.Name, reference));
  return reference;
  }
  else
  {
  return m;
  }
  }
  tbase = tbase.BaseType.Resolve();
  }

diff --git a/Tools/XLuaHotfixInject.exe b/Tools/XLuaHotfixInject.exe
diff --git a/Tools/XLuaHotfixInject.pdb b/Tools/XLuaHotfixInject.pdb