Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

yangjiyue
2 parents c916292c 4f53b2d6
Showing 5 changed files with 19 additions and 1 deletions Show diff stats
Datas/pro2d/CarbonMonster.xlsx
Datas/pro2d/LuckyCoinGroup.xlsx
Datas/pro2d/SkillLuckyCoinConfig.xlsx
Datas/pro2d/hero.xlsx
Defines/pro2d.xml
@@ -194,6 +194,7 @@
     <bean name="CarbonMonster">
         <var name="carbonId" type="int"/>
         <var name="carbonMonsterLevel" type="int"/>
+        <var name="LuckyCoin" type="int"/>
         <var name="mainCarbonWaves" type="list,mainCarbonWaves"/>
     </bean>
  
@@ -651,7 +652,14 @@
         <var name="IntervalTime" type="long"/>
         <var name="DurationTime" type="long"/>
     </bean>
-
+  
+   <bean name="LuckyCoinGroup">
+     <var name="Id" type="int"/>
+     <var name="Name" type="string"/>
+     <var name="MaxNum" type="int"/>
+     <var name="Probability" type="string"/>
+     <var name="Description" type="string"/>
+   </bean>
  
     <bean name="mainCarbonWaves">
         <var name="key" type="int"/>
@@ -871,6 +879,14 @@
         <var name="SkillIcon" type="string"/>
         <var name="SkillDatas" type="map,int,SkillData"/>
     </bean>
+  
+    <bean name="SkillLuckyCoinConfig">
+      <var name="Id" type="int"/>
+      <var name="Name" type="string"/>
+      <var name="ConfigTableUrl" type="string"/>
+      <var name="IsBuff" type="bool"/>
+      <var name="Description" type="string"/>
+    </bean>
  
     <bean name="SkillToSkillConfig">
         <var name="SkillID" type="int"/>
@@ -1005,6 +1021,7 @@
  
     <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
     <table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
+    <table name="TbLuckyCoinGroup" value="LuckyCoinGroup" input="pro2d/LuckyCoinGroup.xlsx"/>
     <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
     <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
     <table name="TbMysticalPowerBUFF" value="MysticalPowerBUFF" input="pro2d/MysticalPowerBUFF.xlsx"/>
@@ -1025,6 +1042,7 @@
     <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
     <table name="TbStoreSummary" value="StoreSummary" input="pro2d/StoreSummary.xlsx"/>
     <table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/>
+    <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/>
     <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/>
  
     <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/>