更新工具

kbengine · kbengine · commit 6832b0494e4a · 2014-07-14T17:01:22.000+08:00
diff --git a/kbe/tools/xlsx2py/xlsx2py/functions.py b/kbe/tools/xlsx2py/xlsx2py/functions.py
@@ -190,3 +190,17 @@ def funcUNZipFloat(mapDict, dctData, chilidDict, data):
 
 	return int(data) / 10000.0
 	
+def funcFlags(mapDict, dctData, chilidDict, data):
+	"""
+	���ر���������
+	���磺 ����excel�����ñ�����
+	���̹���:0x00000001
+	Զ�̹���:0x00000002
+	����:0x00000004
+	�ô˺�������������������һ��uint32������
+	"""
+	val = 0
+	for x in data.split(","):
+		val |= int(mapDict[x])
+		
+	return val

-Original file line number
+Diff line change
 	return int(data) / 10000.0
 +def funcFlags(mapDict, dctData, chilidDict, data):
 +	"""
 +	返回标记组合数据
 +	比如： 想在excel上配置标记组合
 +	近程攻击:0x00000001
 +	远程攻击:0x00000002
 +	暴击:0x00000004
 +	用此函数可以输出多个标记组成一个uint32的数字
 +	"""
 +	val = 0
 +	for x in data.split(","):
 +		val |= int(mapDict[x])
++
 +	return val