Commit edc1ffa0e6fa20814dccccd3bc974d5ec5bb12ce

Authored by zhanghualin
2 parents 7c85e7eb 78107761

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/ExpItemData.xlsx renamed to Datas/pro2d/ConsumptionItemData.xlsx
No preview for this file type
Datas/pro2d/DialogueAll.xlsx
No preview for this file type
Datas/pro2d/DialogueToChapter.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
@@ -249,10 +249,11 @@ @@ -249,10 +249,11 @@
249 <var name="Num" type="int"/> 249 <var name="Num" type="int"/>
250 </bean> 250 </bean>
251 251
252 - <bean name="ExpItemData"> 252 + <bean name="ConsumptionItemData">
253 <var name="ID" type="int"/> 253 <var name="ID" type="int"/>
254 - <var name="Exp" type="int"/> 254 + <var name="UniqueValue" type="int"/>
255 </bean> 255 </bean>
  256 +
256 257
257 <bean name="QuestDataStruct"> 258 <bean name="QuestDataStruct">
258 <var name="QuestName" type="string"/> 259 <var name="QuestName" type="string"/>
@@ -535,7 +536,8 @@ @@ -535,7 +536,8 @@
535 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/> 536 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
536 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/> 537 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
537 <table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/> 538 <table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/>
538 - <table name="TbExpItemData" value="ExpItemData" input="pro2d/ExpItemData.xlsx"/> 539 + <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
  540 +
539 <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/> 541 <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
540 <table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/> 542 <table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
541 <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/> 543 <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>