loujiachen / DesignerConfigs

Commit 7da76d8e64481d831818ecf8755f927c33c249eb

Authored by yangjiyue
2 parents c916292c 4f53b2d6

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Showing 5 changed files with 19 additions and 1 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/CarbonMonster.xlsx
View file @7da76d8
No preview for this file type
Datas/pro2d/LuckyCoinGroup.xlsx 0 → 100644
View file @7da76d8
No preview for this file type
Datas/pro2d/SkillLuckyCoinConfig.xlsx 0 → 100644
View file @7da76d8
No preview for this file type
Datas/pro2d/hero.xlsx
View file @7da76d8
No preview for this file type
@@ -194,6 +194,7 @@ @@ -194,6 +194,7 @@
194 <bean name="CarbonMonster"> 194 <bean name="CarbonMonster">
195 <var name="carbonId" type="int"/> 195 <var name="carbonId" type="int"/>
196 <var name="carbonMonsterLevel" type="int"/> 196 <var name="carbonMonsterLevel" type="int"/>
  197 + <var name="LuckyCoin" type="int"/>
197 <var name="mainCarbonWaves" type="list,mainCarbonWaves"/> 198 <var name="mainCarbonWaves" type="list,mainCarbonWaves"/>
198 </bean> 199 </bean>
199 200
@@ -651,7 +652,14 @@ @@ -651,7 +652,14 @@
651 <var name="IntervalTime" type="long"/> 652 <var name="IntervalTime" type="long"/>
652 <var name="DurationTime" type="long"/> 653 <var name="DurationTime" type="long"/>
653 </bean> 654 </bean>
654 - 655 +
  656 + <bean name="LuckyCoinGroup">
  657 + <var name="Id" type="int"/>
  658 + <var name="Name" type="string"/>
  659 + <var name="MaxNum" type="int"/>
  660 + <var name="Probability" type="string"/>
  661 + <var name="Description" type="string"/>
  662 + </bean>
655 663
656 <bean name="mainCarbonWaves"> 664 <bean name="mainCarbonWaves">
657 <var name="key" type="int"/> 665 <var name="key" type="int"/>
@@ -871,6 +879,14 @@ @@ -871,6 +879,14 @@
871 <var name="SkillIcon" type="string"/> 879 <var name="SkillIcon" type="string"/>
872 <var name="SkillDatas" type="map,int,SkillData"/> 880 <var name="SkillDatas" type="map,int,SkillData"/>
873 </bean> 881 </bean>
  882 +
  883 + <bean name="SkillLuckyCoinConfig">
  884 + <var name="Id" type="int"/>
  885 + <var name="Name" type="string"/>
  886 + <var name="ConfigTableUrl" type="string"/>
  887 + <var name="IsBuff" type="bool"/>
  888 + <var name="Description" type="string"/>
  889 + </bean>
874 890
875 <bean name="SkillToSkillConfig"> 891 <bean name="SkillToSkillConfig">
876 <var name="SkillID" type="int"/> 892 <var name="SkillID" type="int"/>
@@ -1005,6 +1021,7 @@ @@ -1005,6 +1021,7 @@
1005 1021
1006 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/> 1022 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
1007 <table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/> 1023 <table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
  1024 + <table name="TbLuckyCoinGroup" value="LuckyCoinGroup" input="pro2d/LuckyCoinGroup.xlsx"/>
1008 <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/> 1025 <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
1009 <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/> 1026 <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
1010 <table name="TbMysticalPowerBUFF" value="MysticalPowerBUFF" input="pro2d/MysticalPowerBUFF.xlsx"/> 1027 <table name="TbMysticalPowerBUFF" value="MysticalPowerBUFF" input="pro2d/MysticalPowerBUFF.xlsx"/>
@@ -1025,6 +1042,7 @@ @@ -1025,6 +1042,7 @@
1025 <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/> 1042 <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
1026 <table name="TbStoreSummary" value="StoreSummary" input="pro2d/StoreSummary.xlsx"/> 1043 <table name="TbStoreSummary" value="StoreSummary" input="pro2d/StoreSummary.xlsx"/>
1027 <table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/> 1044 <table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/>
  1045 + <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/>
1028 <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/> 1046 <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/>
1029 1047
1030 <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/> 1048 <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/>