From fdee1279bf0c85158e6f7f2f5166f2182eb0eda1 Mon Sep 17 00:00:00 2001
From: zhanghualin <286990256@qq.com>
Date: Mon, 20 Jun 2022 16:16:23 +0800
Subject: [PATCH] ColliderRelation

---
 Datas/common/ColliderRelation.xlsx | Bin 0 -> 9363 bytes
 Defines/common.xml                 | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 Datas/common/ColliderRelation.xlsx

diff --git a/Datas/common/ColliderRelation.xlsx b/Datas/common/ColliderRelation.xlsx
new file mode 100644
index 0000000..87d9a3e
Binary files /dev/null and b/Datas/common/ColliderRelation.xlsx differ
diff --git a/Defines/common.xml b/Defines/common.xml
index f381d9c..070a417 100644
--- a/Defines/common.xml
+++ b/Defines/common.xml
@@ -13,6 +13,22 @@
 		<var name="title" type="string"/>
 	</bean>
 
+	<enum name="ColliderTag" comment="碰撞标签">
+		<var name="EnemyBody" />
+		<var name="PlayerBody" />
+		<var name="EnemyBullet" />
+		<var name="PlayerBullet" />
+		<var name="CatBody" />
+		<var name="HitCatBullet" comment="只与CatBody碰撞"/>
+		<var name="AllBullet" comment="与所有Body类型碰撞"/>
+	</enum>
+
+	<bean name="ColliderRelation">
+		<var name="ColliderA" type="ColliderTag"/>
+		<var name="Others" type="list,ColliderTag"/>
+	</bean>
+
     <table name="TbUnityScene" index = "id,assetName" value="UnityScene" input="common/UnityScene.xlsx"/>
 	<table name="TbDevLog" value="DevLog" input="common/DevLog.xlsx"/>
+	<table name="TbColliderRelation" value="ColliderRelation" input="common/ColliderRelation.xlsx"/>
 </module>
\ No newline at end of file
--
libgit2 0.21.2