Commit 6879a3acf43d2da08882ab944e4fb54f603786f9

Authored by zhanghualin
1 parent 5123328e

HeroToSkill add SkillOrder

Showing 1 changed file with 5 additions and 6 deletions   Show diff stats
@@ -208,15 +208,14 @@ @@ -208,15 +208,14 @@
208 </bean> 208 </bean>
209 209
210 <enum name="SkillOrderType"> 210 <enum name="SkillOrderType">
211 - <var name="Time" comment="固定间隔固定轴"/>  
212 - <var name="CustomTime" comment="纯时间轴"/>  
213 - <var name="Random" comment="固定间隔随机轴"/> 211 + <var name="Regular" comment="固定顺序"/>
  212 + <var name="Random" comment="随机顺序"/>
214 </enum> 213 </enum>
215 214
216 <bean name="SkillOrder"> 215 <bean name="SkillOrder">
217 <var name="skillOrderType" type="SkillOrderType"/> 216 <var name="skillOrderType" type="SkillOrderType"/>
218 - <var name="skillId" type="string"/>  
219 - <var name="time" type="float"/> 217 + <var name="skillIdList" type="list,int"/>
  218 + <var name="time" type="list,int"/>
220 </bean> 219 </bean>
221 220
222 <bean name="HeroToSkill"> 221 <bean name="HeroToSkill">
@@ -224,8 +223,8 @@ @@ -224,8 +223,8 @@
224 <var name="atkId" type="int"/> 223 <var name="atkId" type="int"/>
225 <var name="SkillId" type="list,int"/> 224 <var name="SkillId" type="list,int"/>
226 <var name="PassiveSkillId" type="list,int"/> 225 <var name="PassiveSkillId" type="list,int"/>
227 - <!-- <var name="skillOrders" type="map,int,SkillOrder"/> -->  
228 <var name="ShowPassiveSkillId" type="list,int"/> 226 <var name="ShowPassiveSkillId" type="list,int"/>
  227 + <var name="skillOrders" type="list,SkillOrder"/>
229 </bean> 228 </bean>
230 229
231 <bean name = "mainCarbonWave"> 230 <bean name = "mainCarbonWave">