Commit 9f8e8f6d471519dfc67b6e0bb6e30b4c8ef4c983
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
# Conflicts: # Defines/pro2d.xml
Showing
3 changed files
with
2 additions
and
1 deletions
Show diff stats
Datas/pro2d/HeroToSkill.xlsx
No preview for this file type
Datas/pro2d/SkillConfig.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -224,7 +224,8 @@ | @@ -224,7 +224,8 @@ | ||
| 224 | <var name="atkId" type="int"/> | 224 | <var name="atkId" type="int"/> |
| 225 | <var name="SkillId" type="list,int"/> | 225 | <var name="SkillId" type="list,int"/> |
| 226 | <var name="PassiveSkillId" type="list,int"/> | 226 | <var name="PassiveSkillId" type="list,int"/> |
| 227 | - <var name="skillOrders" type="map,int,SkillOrder"/> | 227 | + <!-- <var name="skillOrders" type="map,int,SkillOrder"/> --> |
| 228 | + <var name="ShowPassiveSkillId" type="list,int"/> | ||
| 228 | </bean> | 229 | </bean> |
| 229 | 230 | ||
| 230 | <bean name = "mainCarbonWave"> | 231 | <bean name = "mainCarbonWave"> |