Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

meibo
2 parents 80fb0089 e93c8a25
Showing 6 changed files with 25 additions and 0 deletions Show diff stats
Datas/pro2d/GlobalBaseDatas.xlsx
Datas/pro2d/ItemData.xlsx
Datas/pro2d/Punchboard.xlsx
Datas/pro2d/SkillConfig.xlsx
Datas/pro2d/SmallDialoge.xlsx
Defines/pro2d.xml
@@ -881,6 +881,30 @@
         <var name="PropertiesNameText" type="string"/>
     </bean>
  
+  <bean name="Punchboard">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="IconName" type="string"/>
+    <var name="Weight" type="int"/>
+    <var name="Grade" type="string"/>
+    <var name="Description" type="string"/>
+    <var name="type" type="int"/>
+    <var name="FixedGold" type="int"/>
+    <var name="isRandom" type="bool"/>
+    <var name="RandomGold" type="(list#sep==),int"/>
+    <var name="isAdjacent" type="bool"/>
+    <var name="AdjacentId"  type="(list#sep==),int"/>
+    <var name="AdjacentGold" type="int"/>
+    <var name="isAccumulate" type="bool"/>
+    <var name="AccumulateGold" type="int"/>
+    <var name="isCountdown" type="bool"/>
+    <var name="CountdownTime" type="int"/>
+    <var name="CountdownToId" type="(list#sep==),int"/>
+    <var name="isEliminate" type="bool"/>
+    <var name="EliminateID"  type="(list#sep==),int"/>
+    <var name="EliminateGold" type="int"/>
+  </bean>
+
     <bean name="QuestDataStruct">
         <var name="QuestName" type="string"/>
         <var name="QuestGoalText" type="string"/>
@@ -1254,6 +1278,7 @@
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
     <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
     <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
+    <table name="TbPunchboard" value="Punchboard" input="pro2d/Punchboard.xlsx"/>
     <table name="TbQuestDatas" value="QuestDatas" input="pro2d/task/QuestDatas.xlsx"/>
     <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/>