浏览代码

Convert: fix modelProps collide null not overwriting global config

Yuxiao Mao 3 天之前
父节点
当前提交
9abd757c15
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      hxd/fs/Convert.hx

+ 4 - 3
hxd/fs/Convert.hx

@@ -127,7 +127,7 @@ class ConvertFBX2HMD extends Convert {
 			var res = hxd.File.getBytes(modelPropsPath).toString();
 			var modelProps = haxe.Json.parse(res);
 			for( mp in Reflect.fields(modelProps) ) {
-				if( mp.substring(0, mp.lastIndexOf("/")) == filePath && Reflect.field(modelProps, mp).collide != null ) {
+				if( mp.substring(0, mp.lastIndexOf("/")) == filePath && Reflect.hasField(Reflect.field(modelProps, mp), "collide") ) {
 					foundModelProps = true;
 					break;
 				}
@@ -159,8 +159,9 @@ class ConvertFBX2HMD extends Convert {
 				var mpFile = mp.substring(0, mp.lastIndexOf("/"));
 				if( mpFile == filePath ) {
 					var mpModel = mp.substring(mp.lastIndexOf("/") + 1);
-					var collide = Reflect.field(modelProps, mp).collide;
-					if( collide != null ) {
+					var mpProps = Reflect.field(modelProps, mp);
+					if( Reflect.hasField(mpProps, "collide") ) {
+						var collide = mpProps.collide;
 						modelCollides.set(mpModel, collide);
 						foundModelProps = true;
 					}