diff --git a/Datas/pro2d/hero.xlsx b/Datas/pro2d/hero.xlsx
index 77b1bcc..b43f049 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 41c1999..1eb0b79 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -1,135 +1,136 @@
 <module name="pro2d">
-	<bean name="HeroLvUpValue">
-		<var name="lvUpType" type="int"/>
-		<var name="hp1" type="float"/>
-		<var name="hp2" type="float"/>
-		<var name="hp3" type="float"/>
-		<var name="dodge1" type="float"/>
-		<var name="dodge2" type="float"/>
-		<var name="dodge3" type="float"/>
-		<var name="crit1" type="float"/>
-		<var name="crit2" type="float"/>
-		<var name="crit3" type="float"/>
-		<var name="atkPct1" type="float"/>
-		<var name="atkPct2" type="float"/>
-		<var name="atkPct3" type="float"/>
-	</bean>
-
-    <bean name="Hero">
-	    <var name="id" type="int"/>
-	    <var name="name" type="string"/>
-	    <var name="type" type="int"/>
-	    <var name="profession" type="int"/>
-	    <var name="race" type="int"/>
-	    <var name="star" type="int"/>
-	    <var name="level" type="int"/>
-	    <var name="hp" type="int"/>
-		<var name="sp" type="int"/>
-	    <var name="speed" type="float"/>
-	    <var name="atkRange" type="float"/>
-	    <var name="atkSpeed" type="float"/>
-	    <var name="crit" type="int"/>
-	    <var name="critHurt" type="int"/>
-	    <var name="dodge" type="int"/>
-	    <var name="block" type="int"/>
-	    <var name="parry" type="int"/>
-	    <var name="skillId" type="int"/>
-	    <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"/>
-	    <var name="group" type="int"/>
-	    <var name="occupation" type="int"/>
-		<var name="species" type="int"/>
-		<var name="attackType" type="int"/>
-		<var name="unitType" type="int"/>
-		<var name="ceRevise" type="float"/>
-		<var name="hpBarYpos" type="int"/>
-		<var name="lvUpType" type="int"/>
-		<var name="MaterialsListID" type="int"/>
-		<var name="WeaponType" type="string"/>
-		<var name="ArmorType" type="string"/>
-		<var name="ShoesType" type="string"/>
-		<var name="atks" type="map,NumericType,int"/>
-		<var name="defs" type="map,NumericType,int"/>
-    </bean>
-
-	<bean name="MonsterWave">
-		<var name="id" type="int"/>
-	    <var name="name" type="string"/>
-		<var name="wait" type="float"/>
-		<var name="monsterBorn" type="map,int,MonsterBorn"/>
-    </bean>
-
-	<bean name="MonsterBorn">
-		<var name="enemyID" type="string"/>
-		<var name="count" type="int"/>
-	    <var name="bornId" type="int"/>
-		<var name="delay" type="float"/>
-    </bean>
-
-	<bean name="Skill">
-		<var name="id" type="int"/>
-		<var name="imageUrl" type="string"/>
-		<var name="count" type="int"/>
-		<var name="cd" type="float"/>
-    </bean>
-
-	<bean name="Carbon">
-		<var name="carbonName" type="string"/>
-		<var name="carbonMonster" type="string"/>
-		<var name="firstAward" type="string"/>
-		<var name="normalAward" type="string"/>
-		<var name="progressSum" type="int"/>
-		<var name="carbonExp" type="int"/>
-		<var name="carbonFailExp" type="int"/>
-		<var name="spCost" type="int"/>
-		<var name="bonusCondition_1" type="string"/>
-		<var name="bonusAward_1" type="string"/>
-		<var name="bonusCondition_2" type="string"/>
-		<var name="bonusAward_2" type="string"/>
-		<var name="bonusCondition_3" type="string"/>
-		<var name="bonusAward_3" type="string"/>
-		<var name="recommendPower" type="int"/>
-    </bean>
-
-	<bean name="RogueChapter">
-		<var name="chapterId" type="int"/>
-		<var name="carbons" type="map,int,Carbon"/>
-    </bean>
-
-	<bean name="RogueMonsterCard">
-		<var name="id" type="int"/>
-		<var name="name" type="string"/>
-		<var name="IconUrl" type="string"/>
-    
-		<var name="monsters" type="map,int,int"/>
-		<var name="tag" type="string"/>
-		<var name="atkLevel" type="int"/>
-		<var name="DefLevel" type="int"/>
-		<var name="ComLevel" type="int"/>
-    
-		<var name="SpecialName" type="string"/>
-		<var name="SpecialDescribe" type="string"/>
-    
-		<var name="progressCount" type="int"/>
-		<var name="formationType" type="int"/>
-   
-    </bean>
-
-	<bean name="Wave">
-		<var name="id" type="int"/>
-		<var name="buff" type="string"/>
-    </bean>
-
-	<bean name="RogueMonster">
-		<var name="carbonId" type="int"/>
-		<var name="waves" type="list,Wave"/>
-    </bean>
-  
+  <bean name="HeroLvUpValue">
+    <var name="lvUpType" type="int"/>
+    <var name="hp1" type="float"/>
+    <var name="hp2" type="float"/>
+    <var name="hp3" type="float"/>
+    <var name="dodge1" type="float"/>
+    <var name="dodge2" type="float"/>
+    <var name="dodge3" type="float"/>
+    <var name="crit1" type="float"/>
+    <var name="crit2" type="float"/>
+    <var name="crit3" type="float"/>
+    <var name="atkPct1" type="float"/>
+    <var name="atkPct2" type="float"/>
+    <var name="atkPct3" type="float"/>
+  </bean>
+
+  <bean name="Hero">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="type" type="int"/>
+    <var name="tag" type="int"/>
+    <var name="profession" type="int"/>
+    <var name="race" type="int"/>
+    <var name="star" type="int"/>
+    <var name="level" type="int"/>
+    <var name="hp" type="int"/>
+    <var name="sp" type="int"/>
+    <var name="speed" type="float"/>
+    <var name="atkRange" type="float"/>
+    <var name="atkSpeed" type="float"/>
+    <var name="crit" type="int"/>
+    <var name="critHurt" type="int"/>
+    <var name="dodge" type="int"/>
+    <var name="block" type="int"/>
+    <var name="parry" type="int"/>
+    <var name="skillId" type="int"/>
+    <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"/>
+    <var name="group" type="int"/>
+    <var name="occupation" type="int"/>
+    <var name="species" type="int"/>
+    <var name="attackType" type="int"/>
+    <var name="unitType" type="int"/>
+    <var name="ceRevise" type="float"/>
+    <var name="hpBarYpos" type="int"/>
+    <var name="lvUpType" type="int"/>
+    <var name="MaterialsListID" type="int"/>
+    <var name="WeaponType" type="string"/>
+    <var name="ArmorType" type="string"/>
+    <var name="ShoesType" type="string"/>
+    <var name="atks" type="map,NumericType,int"/>
+    <var name="defs" type="map,NumericType,int"/>
+  </bean>
+
+  <bean name="MonsterWave">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="wait" type="float"/>
+    <var name="monsterBorn" type="map,int,MonsterBorn"/>
+  </bean>
+
+  <bean name="MonsterBorn">
+    <var name="enemyID" type="string"/>
+    <var name="count" type="int"/>
+    <var name="bornId" type="int"/>
+    <var name="delay" type="float"/>
+  </bean>
+
+  <bean name="Skill">
+    <var name="id" type="int"/>
+    <var name="imageUrl" type="string"/>
+    <var name="count" type="int"/>
+    <var name="cd" type="float"/>
+  </bean>
+
+  <bean name="Carbon">
+    <var name="carbonName" type="string"/>
+    <var name="carbonMonster" type="string"/>
+    <var name="firstAward" type="string"/>
+    <var name="normalAward" type="string"/>
+    <var name="progressSum" type="int"/>
+    <var name="carbonExp" type="int"/>
+    <var name="carbonFailExp" type="int"/>
+    <var name="spCost" type="int"/>
+    <var name="bonusCondition_1" type="string"/>
+    <var name="bonusAward_1" type="string"/>
+    <var name="bonusCondition_2" type="string"/>
+    <var name="bonusAward_2" type="string"/>
+    <var name="bonusCondition_3" type="string"/>
+    <var name="bonusAward_3" type="string"/>
+    <var name="recommendPower" type="int"/>
+  </bean>
+
+  <bean name="RogueChapter">
+    <var name="chapterId" type="int"/>
+    <var name="carbons" type="map,int,Carbon"/>
+  </bean>
+
+  <bean name="RogueMonsterCard">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="IconUrl" type="string"/>
+
+    <var name="monsters" type="map,int,int"/>
+    <var name="tag" type="string"/>
+    <var name="atkLevel" type="int"/>
+    <var name="DefLevel" type="int"/>
+    <var name="ComLevel" type="int"/>
+
+    <var name="SpecialName" type="string"/>
+    <var name="SpecialDescribe" type="string"/>
+
+    <var name="progressCount" type="int"/>
+    <var name="formationType" type="int"/>
+
+  </bean>
+
+  <bean name="Wave">
+    <var name="id" type="int"/>
+    <var name="buff" type="string"/>
+  </bean>
+
+  <bean name="RogueMonster">
+    <var name="carbonId" type="int"/>
+    <var name="waves" type="list,Wave"/>
+  </bean>
+
   <bean name="EquipmentData">
     <var name="EquipID" type="int"/>
     <var name="EquipName" type="string"/>
@@ -150,7 +151,7 @@
 
     <var name="AtkSpeed" type="float"/>
     <var name="AtkRange" type="float"/>
-    
+
     <var name="Crit" type="float"/>
     <var name="CritLv1" type="float"/>
     <var name="CritLv2" type="float"/>
@@ -170,27 +171,27 @@
     <var name="SoilDef" type="float"/>
     <var name="IceDef" type="float"/>
     <var name="PoisonDef" type="float"/>
-    
+
     <var name="DodgeLv1" type="float"/>
     <var name="DodgeLv2" type="float"/>
     <var name="DodgeLv3" type="float"/>
     <var name="Dodge" type="float"/>
-    
+
     <var name="BlockLv1" type="float"/>
     <var name="BlockLv2" type="float"/>
     <var name="BlockLv3" type="float"/>
     <var name="Block" type="float"/>
-    
+
     <var name="ParryLv1" type="float"/>
     <var name="ParryLv2" type="float"/>
     <var name="ParryLv3" type="float"/>
     <var name="Parry" type="float"/>
-    
+
     <var name="HpLv1" type="float"/>
     <var name="HpLv2" type="float"/>
     <var name="HpLv3" type="float"/>
     <var name="Hp" type="float"/>
-    
+
     <var name="HpPerUp" type="float"/>
     <var name="Steal" type="float"/>
     <var name="DropUp" type="float"/>
@@ -209,15 +210,15 @@
     <var name="EquipTypeName" type="string"/>
     <var name="TypeImagePath" type="string"/>
   </bean>
-  
+
   <bean name="BraekdownResult">
     <var name="ItemID" type="int"/>
     <var name="MinNum" type="int"/>
     <var name="MaxNum" type="int"/>
     <var name="RandomWeight" type="int"/>
   </bean>
-      
-    
+
+
   <bean name="EquipBreakdown">
     <var name="EquipID" type="int"/>
     <var name="BraekdownResults" type="list,BraekdownResult"/>
@@ -228,9 +229,9 @@
     <var name="MaterialsCombinationID" type="int"/>
     <var name="MaterialsCombinations" type="map,int,string"/>
   </bean>
-  
-  
-  
+
+
+
   <bean name="ItemData">
     <var name="ID" type="int"/>
     <var name="Name" type="string"/>
@@ -249,11 +250,11 @@
     <var name="DetailText" type="string"/>
     <var name="GetWay" type="string"/>
   </bean>
-  
+
   <bean name="ItemRandom">
-	<var name="ID" type="int"/>
+    <var name="ID" type="int"/>
     <var name="Name" type="string"/>
-	<var name="Gifts" type="string"/>
+    <var name="Gifts" type="string"/>
     <var name="Num" type="int"/>
   </bean>
 
@@ -261,23 +262,23 @@
     <var name="ID" type="int"/>
     <var name="UniqueValue" type="int"/>
   </bean>
-  
 
-	<bean name="QuestDataStruct">
-		<var name="QuestName" type="string"/>
-		<var name="QuestGoalText" type="string"/>
-		<var name="Active" type="int"/>
-		<var name="QuestGoal" type="int"/>
-		<var name="QuestGoalTypeTag" type="int"/>
-		<var name="QuestGoalProgressMax" type="int"/>
-		<var name="QuestPrecondition" type="int"/>
-		<var name="QuestAward" type="string"/>
-	</bean>
 
-	<bean name="QuestDatas">
-		<var name="QuestTag" type="int"/>
-		<var name="QuestDataStructs" type="map,int,QuestDataStruct"/>
-	</bean>
+  <bean name="QuestDataStruct">
+    <var name="QuestName" type="string"/>
+    <var name="QuestGoalText" type="string"/>
+    <var name="Active" type="int"/>
+    <var name="QuestGoal" type="int"/>
+    <var name="QuestGoalTypeTag" type="int"/>
+    <var name="QuestGoalProgressMax" type="int"/>
+    <var name="QuestPrecondition" type="int"/>
+    <var name="QuestAward" type="string"/>
+  </bean>
+
+  <bean name="QuestDatas">
+    <var name="QuestTag" type="int"/>
+    <var name="QuestDataStructs" type="map,int,QuestDataStruct"/>
+  </bean>
 
   <bean name="IntervalTable">
     <var name="ResetCycleTag" type="int"/>
@@ -285,18 +286,18 @@
     <var name="IntervalTime" type="long"/>
     <var name="DurationTime" type="long"/>
   </bean>
-  
+
   <bean name="GoodsDataStruct">
     <var name="GoodsName" type="string"/>
     <var name="GoodsDescription" type="string"/>
     <var name="GoodsItems" type="string"/>
-	  <var name="GoodsStar" type="int"/>
-	  <var name="GoodsCurrency" type="int"/>
+    <var name="GoodsStar" type="int"/>
+    <var name="GoodsCurrency" type="int"/>
     <var name="GoodsBuyPrice" type="int"/>
     <var name="GoodsSellPrice" type="int"/>
     <var name="GoodsBuyLimit" type="int"/>
     <var name="GoodsImage" type="string"/>
-    </bean>
+  </bean>
 
   <bean name="StoreDatas">
     <var name="StoreType" type="int"/>
@@ -304,7 +305,7 @@
     <var name="StoreTitle" type="string"/>
     <var name="GoodsDataStructs" type="map,int,GoodsDataStruct"/>
   </bean>
-  
+
   <bean name="RechargeDatas">
     <var name="StoreType" type="int"/>
     <var name="StoreResetCycle" type="int"/>
@@ -313,48 +314,48 @@
   </bean>
 
   <bean name="Materials">
-  	<var name="ItemID" type="int"/>
-  	<var name="ItemNum" type="int"/>
+    <var name="ItemID" type="int"/>
+    <var name="ItemNum" type="int"/>
   </bean>
-	
+
   <bean name="HeroReinMaterials">
     <var name="MaterialsListID" type="int"/>
     <var name="MaterialsList" type="list,Materials"/>
   </bean>
 
-	<bean name="HeroSharpenSkillPoint">
-		<var name="SkillType" type="int"/>
-		<var name="SkillExpend" type="map,int,int"/>
-	</bean>
-
-
-	<bean name="AccountLevelExp">
-		<var name="level" type="int"/>
-		<var name="needExp" type="int"/>
-    </bean>
-
-	<bean name="HeroLevelExp">
-		<var name="level" type="int"/>
-		<var name="needExp" type="int"/>
-    </bean>
-  
-	<bean name="SkillData">
-		<var name="Value1" type="double"/>
-		<var name="Value2" type="double"/>
-		<var name="Value3" type="double"/>
-		<var name="Value4" type="double"/>
-  </bean>
- 
-	<bean name="SkillConfig">
-		<var name="SkillID" type="string"/>
-		<var name="SkillName" type="string"/>
-		<var name="SkillDescribe" type="string"/>
-		<var name="SkillIcon" type="string"/>
-		<var name="SkillPath" type="string"/>
-		<var name="SkillCount" type="int"/>
-		<var name="SkillCD" type="float"/>
-		<var name="SkillDatas" type="map,int,SkillData"/>
-    </bean>
+  <bean name="HeroSharpenSkillPoint">
+    <var name="SkillType" type="int"/>
+    <var name="SkillExpend" type="map,int,int"/>
+  </bean>
+
+
+  <bean name="AccountLevelExp">
+    <var name="level" type="int"/>
+    <var name="needExp" type="int"/>
+  </bean>
+
+  <bean name="HeroLevelExp">
+    <var name="level" type="int"/>
+    <var name="needExp" type="int"/>
+  </bean>
+
+  <bean name="SkillData">
+    <var name="Value1" type="double"/>
+    <var name="Value2" type="double"/>
+    <var name="Value3" type="double"/>
+    <var name="Value4" type="double"/>
+  </bean>
+
+  <bean name="SkillConfig">
+    <var name="SkillID" type="string"/>
+    <var name="SkillName" type="string"/>
+    <var name="SkillDescribe" type="string"/>
+    <var name="SkillIcon" type="string"/>
+    <var name="SkillPath" type="string"/>
+    <var name="SkillCount" type="int"/>
+    <var name="SkillCD" type="float"/>
+    <var name="SkillDatas" type="map,int,SkillData"/>
+  </bean>
 
   <bean name="MapingData">
     <var name="SkillConfigID" type="string"/>
@@ -362,105 +363,105 @@
   </bean>
 
   <bean name="SkillToSkillConfig">
-		<var name="SkillID" type="int"/>
+    <var name="SkillID" type="int"/>
     <var name="SkillSharpenType" type="int"/>
     <var name="MappingDatas" type="map,int,MapingData"/>
-    </bean>
-		
-	<bean name="Buff">
-		<var name="id" type="int"/>
-		<var name="name" type="string"/>
-		<var name="path" type="string"/>
-    </bean>
-
-	<bean name="Bullet">
-		<var name="id" type="int"/>
-		<var name="name" type="string"/>
-		<var name="path" type="string"/>
-    </bean>
-
-	<enum name="SkillOrderType">
-		<var name="Regular" comment="固定顺序"/>
-		<var name="Random" comment="随机顺序"/>
-	</enum>
-
-	<bean name="SkillOrder">
-		<var name="skillOrderType" type="SkillOrderType"/>
-		<var name="skillIdList" type="list,int"/>
-		<var name="time" type="list,int"/>
-    </bean>
-
-	<bean name="HeroToSkill">
-		<var name="heroType" type="int"/>
-		<var name="atkId" type="int"/>
-		<var name="SkillId" type="list,int"/>
-		<var name="Buffs" type="list,int"/>
-		<var name="PassiveSkillId" type="list,int"/>
-		<var name="ShowPassiveSkillId" type="list,int"/>
-		<var name="skillOrders" type="list,SkillOrder"/>
-	</bean>
-
-	<bean name = "mainCarbonWave">
-		<var name="WaveId" type="string"/>
-		<var name="mapId" type="string"/>
-	</bean>
-
-	<bean name="CarbonMonster">
-		<var name="carbonId" type="int"/>
-		<var name="mainCarbonWaves" type="map,int,mainCarbonWave"/>
-	</bean>
-
-	<bean name="mainCarbon">
-		<var name="carbonName" type="string"/>
-		<var name="firstAward" type="string"/>
-		<var name="normalAward" type="string"/>
-		<var name="carbonExp" type="int"/>
-		<var name="carbonFailExp" type="int"/>
-		<var name="spCost" type="int"/>
-		<var name="bonusCondition_1" type="string"/>
-		<var name="bonusAward_1" type="string"/>
-		<var name="bonusCondition_2" type="string"/>
-		<var name="bonusAward_2" type="string"/>
-		<var name="bonusCondition_3" type="string"/>
-		<var name="bonusAward_3" type="string"/>
-		<var name="recommendPower" type="int"/>
-		<var name="showCarbonEnemy" type="string"/>
-    </bean>
-
-	<bean name="MainChapter">
-		<var name="chapterId" type="int"/>
-		<var name="chapterName" type="string"/>
-		<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>
-  
-  	<bean name="RogBuff">
-		<var name="ID" type="int"/>
-		<var name="Name" type="string"/>
+  </bean>
+
+  <bean name="Buff">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="path" type="string"/>
+  </bean>
+
+  <bean name="Bullet">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="path" type="string"/>
+  </bean>
+
+  <enum name="SkillOrderType">
+    <var name="Regular" comment="固定顺序"/>
+    <var name="Random" comment="随机顺序"/>
+  </enum>
+
+  <bean name="SkillOrder">
+    <var name="skillOrderType" type="SkillOrderType"/>
+    <var name="skillIdList" type="list,int"/>
+    <var name="time" type="list,int"/>
+  </bean>
+
+  <bean name="HeroToSkill">
+    <var name="heroType" type="int"/>
+    <var name="atkId" type="int"/>
+    <var name="SkillId" type="list,int"/>
+    <var name="Buffs" type="list,int"/>
+    <var name="PassiveSkillId" type="list,int"/>
+    <var name="ShowPassiveSkillId" type="list,int"/>
+    <var name="skillOrders" type="list,SkillOrder"/>
+  </bean>
+
+  <bean name = "mainCarbonWave">
+    <var name="WaveId" type="string"/>
+    <var name="mapId" type="string"/>
+  </bean>
+
+  <bean name="CarbonMonster">
+    <var name="carbonId" type="int"/>
+    <var name="mainCarbonWaves" type="map,int,mainCarbonWave"/>
+  </bean>
+
+  <bean name="mainCarbon">
+    <var name="carbonName" type="string"/>
+    <var name="firstAward" type="string"/>
+    <var name="normalAward" type="string"/>
+    <var name="carbonExp" type="int"/>
+    <var name="carbonFailExp" type="int"/>
+    <var name="spCost" type="int"/>
+    <var name="bonusCondition_1" type="string"/>
+    <var name="bonusAward_1" type="string"/>
+    <var name="bonusCondition_2" type="string"/>
+    <var name="bonusAward_2" type="string"/>
+    <var name="bonusCondition_3" type="string"/>
+    <var name="bonusAward_3" type="string"/>
+    <var name="recommendPower" type="int"/>
+    <var name="showCarbonEnemy" type="string"/>
+  </bean>
+
+  <bean name="MainChapter">
+    <var name="chapterId" type="int"/>
+    <var name="chapterName" type="string"/>
+    <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>
+
+  <bean name="RogBuff">
+    <var name="ID" type="int"/>
+    <var name="Name" type="string"/>
     <var name="Type" type="bool"/>
-		<var name="Level" type="int"/>
-		<var name="IconPath" type="string"/>
-		<var name="Describe" type="string"/>
-		<var name="P_damage_W" type="float"/>
-		<var name="P_attackSpeed_W" type="float"/>
-		<var name="P_attackDistance_W" type="float"/>
-		<var name="P_defense_W" type="float"/>
-		<var name="P_speed_W" type="float"/>
-		<var name="P_maxHp_W" type="float"/>
-		<var name="P_recover_W" type="float"/>
-		<var name="P_damage_A" type="int"/>
-		<var name="P_crit_A" type="float"/>
-		<var name="P_recover_A" type="float"/>
-		<var name="M_num_A" type="int"/>
-		<var name="Treasure" type="int"/>
-		<var name="Event" type="string"/>
-    </bean>
-  
+    <var name="Level" type="int"/>
+    <var name="IconPath" type="string"/>
+    <var name="Describe" type="string"/>
+    <var name="P_damage_W" type="float"/>
+    <var name="P_attackSpeed_W" type="float"/>
+    <var name="P_attackDistance_W" type="float"/>
+    <var name="P_defense_W" type="float"/>
+    <var name="P_speed_W" type="float"/>
+    <var name="P_maxHp_W" type="float"/>
+    <var name="P_recover_W" type="float"/>
+    <var name="P_damage_A" type="int"/>
+    <var name="P_crit_A" type="float"/>
+    <var name="P_recover_A" type="float"/>
+    <var name="M_num_A" type="int"/>
+    <var name="Treasure" type="int"/>
+    <var name="Event" type="string"/>
+  </bean>
+
   <bean name="MysticalPowerBUFF">
     <var name="ID" type="int"/>
     <var name="Name" type="string"/>
@@ -496,7 +497,7 @@
     <var name="Treasure" type="int"/>
     <var name="Event" type="string"/>
   </bean>
-  
+
   <bean name="DialogueAll">
     <var name="ID" type="int"/>
     <var name="ChapterID" type="int"/>
@@ -519,7 +520,7 @@
     <var name="reply_4_Text" type="string"/>
     <var name="reply_4_NextId" type="int"/>
   </bean>
-  
+
   <bean name="DialogueToChapter">
     <var name="ChapterID" type="int"/>
     <var name="ChapterName" type="string"/>
@@ -527,43 +528,43 @@
     <var name="DBG" 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"/>
-	<table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/>
-	<table name="TbHeroToSkill" value="HeroToSkill" input="pro2d/HeroToSkill.xlsx"/>
-	<table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
-	<table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
-	<table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
-
-	<table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
-	<table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
-
-	<table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
-	<table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType.xlsx"/>
-	<table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
-	<table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
-	<table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
-	<table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/>
-	<table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
- 
-	<table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
-	<table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
-	<table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
-	<table name="TbRechargeDatas" value="RechargeDatas" input="pro2d/RechargeDatas.xlsx"/>
-	<table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/>
-	<table name="TbHeroSharpenSkillPoint" value="HeroSharpenSkillPoint" input="pro2d/HeroSharpenSkillPoint.xlsx"/>
-	<table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/>
-
-	<table name="TbAccountLevelExp" value="AccountLevelExp" input="pro2d/AccountLevelExp.xlsx"/>
-	<table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
-	<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="TbRogBuff" value="RogBuff" input="pro2d/RogBuff.xlsx"/>
-  	<table name="TbMysticalPowerBUFF" value="MysticalPowerBUFF" input="pro2d/MysticalPowerBUFF.xlsx"/>
-  
-	<table name="TbWeapon" value="Weapon" input="pro2d/Weapon.xlsx"/>
+  <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"/>
+  <table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/>
+  <table name="TbHeroToSkill" value="HeroToSkill" input="pro2d/HeroToSkill.xlsx"/>
+  <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
+  <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
+  <table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
+
+  <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
+  <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
+
+  <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
+  <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType.xlsx"/>
+  <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
+  <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
+  <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
+  <table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/>
+  <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
+
+  <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
+  <table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
+  <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
+  <table name="TbRechargeDatas" value="RechargeDatas" input="pro2d/RechargeDatas.xlsx"/>
+  <table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/>
+  <table name="TbHeroSharpenSkillPoint" value="HeroSharpenSkillPoint" input="pro2d/HeroSharpenSkillPoint.xlsx"/>
+  <table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/>
+
+  <table name="TbAccountLevelExp" value="AccountLevelExp" input="pro2d/AccountLevelExp.xlsx"/>
+  <table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
+  <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="TbRogBuff" value="RogBuff" input="pro2d/RogBuff.xlsx"/>
+  <table name="TbMysticalPowerBUFF" value="MysticalPowerBUFF" input="pro2d/MysticalPowerBUFF.xlsx"/>
+
+  <table name="TbWeapon" value="Weapon" input="pro2d/Weapon.xlsx"/>
   <table name="TbDialogueAll" value="DialogueAll" input="pro2d/DialogueAll.xlsx"/>
   <table name="TbDialogueToChapter" value="DialogueToChapter" input="pro2d/DialogueToChapter.xlsx"/>
 </module>
\ No newline at end of file
--
libgit2 0.21.2