Merge remote-tracking branch 'origin/master'

ZhaoLu-Hoshea\Administrator
2 parents c81b5836 cbb5f366
Showing 6 changed files with 12 additions and 0 deletions Show diff stats
Datas/__enums__.xlsx
Datas/common/FUIPanel.xlsx
Datas/pro2d/HeroItemFragment.xlsx
Datas/pro2d/PopupsDatas.xlsx
Datas/pro2d/SmallDialoge.xlsx
Defines/pro2d.xml
@@ -910,6 +910,17 @@
         <var name="SkillSpendType" type="int"/>
         <var name="MappingDatas" type="map,int,MapingData"/>
     </bean>
+  
+    <bean name="SmallDialoge">
+      <var name="ID" type="int"/>
+      <var name="HeroID" type="int"/>
+      <var name="HeroName" type="string"/>
+      <var name="DialogText" type="string"/>
+      <var name="Type" type="int"/>
+      <var name="Weight" type="int"/>
+      <var name="Interact" type="string"/>
+      <var name="image" type="int"/>
+    </bean>
  
     <enum name="SkillOrderType">
         <var name="Regular" comment="固定顺序"/>
@@ -1080,6 +1091,7 @@
     <table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
     <table name="TbStoreSummary" value="StoreSummary" input="pro2d/StoreSummary.xlsx"/>
     <table name="TbSkillToSkillConfig" value="SkillToSkillConfig" input="pro2d/SkillToSkillConfig.xlsx"/>
+    <table name="TbSmallDialoge" value="SmallDialoge" input="pro2d/SmallDialoge.xlsx"/>
     <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/>
     <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/>