Commit ef1cb296a4e86040976b6d0d055feb7ad4803fbe

Authored by yangjiyue
2 parents 1db351e8 7880058a

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/AccountLevelExp.xlsx deleted
No preview for this file type
Datas/pro2d/AdvanceHero.xlsx
No preview for this file type
Datas/pro2d/HeroItemFragment.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Datas/pro2d/PopupsDatas.xlsx
No preview for this file type
Datas/pro2d/RoleEnergy.xlsx renamed to Datas/pro2d/RoleLevelValue.xlsx
No preview for this file type
Datas/pro2d/SkillConfig.xlsx
No preview for this file type
Defines/pro2d.xml
... ... @@ -441,10 +441,6 @@
441 441 </bean>
442 442  
443 443  
444   - <bean name="AccountLevelExp">
445   - <var name="level" type="int"/>
446   - <var name="needExp" type="int"/>
447   - </bean>
448 444  
449 445 <bean name="HeroLevelExp">
450 446 <var name="level" type="int"/>
... ... @@ -840,9 +836,10 @@
840 836  
841 837 </bean>
842 838  
843   - <bean name="RoleEnergy">
  839 + <bean name="RoleLevelValue">
844 840 <var name="Lv" type="int"/>
845 841 <var name="EnergyMax" type="int"/>
  842 + <var name="needExp" type="int"/>
846 843 </bean>
847 844  
848 845 <bean name="ActivityCtl">
... ... @@ -923,7 +920,6 @@
923 920 <table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/>
924 921  
925 922  
926   - <table name="TbAccountLevelExp" value="AccountLevelExp" input="pro2d/Now@AccountLevelExp.xlsx"/>
927 923 <table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
928 924 <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/>
929 925 <table name="TbBuff" value="Buff" input="pro2d/Buff.xlsx"/>
... ... @@ -953,6 +949,6 @@
953 949 <table name="TbActivityCtl" value="ActivityCtl" input="pro2d/activity/ActivityCtl.xlsx"/>
954 950 <table name="TbActivitySign" value="ActivitySign" input="pro2d/activity/ActivitySign.xlsx"/>
955 951 <table name="TbActivityReward" value="ActivityReward" input="pro2d/activity/ActivityReward.xlsx"/>
956   - <table name="TbRoleEnergy" value="RoleEnergy" input="pro2d/RoleEnergy.xlsx"/>
  952 + <table name="TbRoleLevelValue" value="RoleLevelValue" input="pro2d/RoleLevelValue.xlsx"/>
957 953 <table name="TbAdvanceHero" value="AdvanceHero" input="pro2d/AdvanceHero.xlsx"/>
958 954 </module>
959 955 \ No newline at end of file
... ...