From c6b000eb526d431541a5cf7ecd716fc2593949fe Mon Sep 17 00:00:00 2001
From: zhanghualin <286990256@qq.com>
Date: Thu, 4 Aug 2022 11:10:24 +0800
Subject: [PATCH] 新增 Weapon 表

---
 Datas/pro2d/Buff.xlsx             | Bin 9302 -> 0 bytes
 Datas/pro2d/CarbonMonster.xlsx    | Bin 10901 -> 0 bytes
 Datas/pro2d/HeroToSkill.xlsx      | Bin 10695 -> 0 bytes
 Datas/pro2d/RogueMonsterCard.xlsx | Bin 10819 -> 0 bytes
 Datas/pro2d/Weapon.xlsx           | Bin 0 -> 9344 bytes
 Datas/pro2d/hero.xlsx             | Bin 15873 -> 0 bytes
 Defines/pro2d.xml                 |  9 +++++++++
 7 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 Datas/pro2d/Weapon.xlsx

diff --git a/Datas/pro2d/Buff.xlsx b/Datas/pro2d/Buff.xlsx
index fdcbb57..a1d6217 100644
Binary files a/Datas/pro2d/Buff.xlsx and b/Datas/pro2d/Buff.xlsx differ
diff --git a/Datas/pro2d/CarbonMonster.xlsx b/Datas/pro2d/CarbonMonster.xlsx
index 85a24c7..02d8f09 100644
Binary files a/Datas/pro2d/CarbonMonster.xlsx and b/Datas/pro2d/CarbonMonster.xlsx differ
diff --git a/Datas/pro2d/HeroToSkill.xlsx b/Datas/pro2d/HeroToSkill.xlsx
index def88e9..5319a19 100644
Binary files a/Datas/pro2d/HeroToSkill.xlsx and b/Datas/pro2d/HeroToSkill.xlsx differ
diff --git a/Datas/pro2d/RogueMonsterCard.xlsx b/Datas/pro2d/RogueMonsterCard.xlsx
index 1729443..f0edb99 100644
Binary files a/Datas/pro2d/RogueMonsterCard.xlsx and b/Datas/pro2d/RogueMonsterCard.xlsx differ
diff --git a/Datas/pro2d/Weapon.xlsx b/Datas/pro2d/Weapon.xlsx
new file mode 100644
index 0000000..73c5d36
Binary files /dev/null and b/Datas/pro2d/Weapon.xlsx differ
diff --git a/Datas/pro2d/hero.xlsx b/Datas/pro2d/hero.xlsx
index 1384a3e..780d440 100644
Binary files a/Datas/pro2d/hero.xlsx and b/Datas/pro2d/hero.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 89e5bbf..2c2180b 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -36,6 +36,7 @@
 	    <var name="passiveSkillId1" type="int"/>
 	    <var name="passiveSkillId2" type="int"/>
 	    <var name="passiveSkillId3" type="int"/>
+		<var name="weapon" type="int"/>
 	    <var name="perfabName" type="string"/>
 		<var name="iconUrl" type="string"/>
 	    <var name="attackLv" type="int"/>
@@ -327,6 +328,12 @@
 		<var name="mainCarbons" type="map,int,mainCarbon"/>
     </bean>
 
+	<bean name="Weapon">
+		<var name="id" type="int"/>
+		<var name="atlasAsset" type="string"/>
+		<var name="region" type="string"/>
+    </bean>
+
     <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/>
 	<table name="TbHeroLvUpValue" value="HeroLvUpValue" input="pro2d/HeroLvUpValue.xlsx"/>
 	<table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
@@ -352,4 +359,6 @@
 	<table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/>
 	<table name="TbBuff" value="Buff" input="pro2d/Buff.xlsx"/>
 	<table name="TbBullet" value="Bullet" input="pro2d/Bullet.xlsx"/>
+
+	<table name="TbWeapon" value="Weapon" input="pro2d/Weapon.xlsx"/>
 </module>
\ No newline at end of file
--
libgit2 0.21.2