Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chunkname 应和脚本文件名一致(否则IDE调试不了) #600

Merged
merged 1 commit into from
Jun 21, 2019
Merged

Conversation

tangzx
Copy link
Contributor

@tangzx tangzx commented Jun 21, 2019

No description provided.

@chexiongsheng chexiongsheng merged commit b9d36ba into Tencent:master Jun 21, 2019
onlyfeng added a commit to onlyfeng/xLua that referenced this pull request Oct 26, 2019
* upstream/master: (24 commits)
  当方法返回指针时过滤掉 (Tencent#660)
  更新iOS cmake toolchain以支持macOS 10.15 (Tencent#657)
  修复生成扩展方法未判断方法是否过时 (Tencent#649)
  删除unity2018下的Generate Minimize Code选项
  * fix LazyReflectionCall with overloaded methods (Tencent#638)
  update: [98989] cmake在osx平台添加一个预编译定义,为了能在Emmy-Lua在ide下调试时能够加载cpath (Tencent#629)
  示例hotfix配置修改为GetTypes,否则照抄这个非public类型不被注入
  直接通过CS.XX访问一个内嵌类时,会在加载外层类的时候顺便加载了内嵌类,但没有建立type到id的映射,导致xlua.private_accessible认为改内嵌类并未加载,fix Tencent#622
  fix error display when StaticLuaCallbacks::ImportType throws
  unity 2018以后版本的兼容性问题的新解决办法。
  支持通过代码来过滤不需生成代码的方法,主要用于解决2018以后unity运行和编译用的mono不一致的问题。
  非Assembly-CSharp程序集注入时,out参数处理有误
  这里有可能是通过反射得到未设置泛型的类型导致lua脚本报错生成代码失败 (Tencent#617)
  unity的.net 4下,object obj = new sbyte[] { 1, 2 };obj is byte[]会判断为true,修改为兼容性更好的写法,防止sbyte[] 在.net 4下push到lua变成字符串
  自动配置CSharpCallLua列表示例里头,过滤掉未实例化的泛型和引用了editor的类型
  解决bug:当采用反射方式注册枚举值时,如果一个枚举有多个相同的值,比如A,B都是1,那么在lua里头访问B将会为空
  最小生成模式枚举生成代码报错
  最小生成模式枚举生成代码报错
  fix dependence alert
  chunkname 应和脚本文件名一致(否则IDE调试不了) (Tencent#600)
  ...

# Conflicts:
#	build/CMakeLists.txt
#	build/cmake/ios.toolchain.cmake
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants