Commit d8582137f324a3c5872423864557bb610186f144

Authored by yjj
2 parents f2e5c8f0 b79f2bfb

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/GlobalBaseDatas.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Datas/pro2d/StoreDatas.xlsx
No preview for this file type
Datas/pro2d/StoreSummary.xlsx
No preview for this file type
Datas/pro2d/quest_carbon/HeroFragmentsCarbon.xlsx
No preview for this file type
Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx
No preview for this file type
@@ -1161,7 +1161,7 @@ @@ -1161,7 +1161,7 @@
1161 <bean name="StoreSummary"> 1161 <bean name="StoreSummary">
1162 <var name="Title" type="string"/> 1162 <var name="Title" type="string"/>
1163 <var name="Image" type="string"/> 1163 <var name="Image" type="string"/>
1164 - <var name="PanelEnum" type="int"/> 1164 + <var name="PanelEnum" type="string"/>
1165 </bean> 1165 </bean>
1166 1166
1167 <bean name="SkillData"> 1167 <bean name="SkillData">