Commit 06be52f824ccb394aab7d1695cdd6383e560267c

Authored by yangjiyue
2 parents 918b86d8 10e19b0a

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/__enums__.xlsx
No preview for this file type
Datas/common/FUIPanel.xlsx
No preview for this file type
Datas/pro2d/EquipmentData.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
@@ -291,6 +291,7 @@ @@ -291,6 +291,7 @@
291 <var name="ImageName" type="string"/> 291 <var name="ImageName" type="string"/>
292 <var name="DetailText" type="string"/> 292 <var name="DetailText" type="string"/>
293 <var name="GetWay" type="string"/> 293 <var name="GetWay" type="string"/>
  294 + <var name="GetWayLink" type="string"/>
294 </bean> 295 </bean>
295 296
296 297
@@ -344,6 +345,7 @@ @@ -344,6 +345,7 @@
344 <var name="ImageName" type="string"/> 345 <var name="ImageName" type="string"/>
345 <var name="DetailText" type="string"/> 346 <var name="DetailText" type="string"/>
346 <var name="GetWay" type="string"/> 347 <var name="GetWay" type="string"/>
  348 + <var name="GetWayLink" type="string"/>
347 </bean> 349 </bean>
348 350
349 351