Commit b06f9794cac94d385cdfa96edb6e2fb58a521e2e

Authored by zhanghualin
1 parent b00e8a6b

-

.gitignore 0 → 100644
Datas/common/NumericType.xlsx
No preview for this file type
Datas/common/NumericTypeEx.xlsx 0 → 100644
No preview for this file type
Datas/pro2d/EquipmentData.xlsx
No preview for this file type
Defines/common.xml
... ... @@ -25,6 +25,12 @@
25 25 <var name="AllBullet" comment="与所有Body类型碰撞"/>
26 26 </enum>
27 27  
  28 + <enum name="ValueType" comment="数值类型">
  29 + <var name="TInt" />
  30 + <var name="TFloat" />
  31 + <var name="TPercent" />
  32 + </enum>
  33 +
28 34 <bean name="ColliderRelation">
29 35 <var name="ColliderA" type="ColliderTag"/>
30 36 <var name="Others" type="list,ColliderTag"/>
... ... @@ -44,9 +50,16 @@
44 50 <var name="Anima" type="FGUIAnimaType"/>
45 51 </bean>
46 52  
  53 +
  54 + <bean name="NumericTypeEx">
  55 + <var name="id" type="NumericType"/>
  56 + <var name="valueType" type="ValueType"/>
  57 + </bean>
  58 +
47 59 <table name="TbUnityScene" index = "id,assetName" value="UnityScene" input="common/UnityScene.xlsx"/>
48 60 <table name="TbDevLog" value="DevLog" input="common/DevLog.xlsx"/>
49 61 <table name="TbColliderRelation" value="ColliderRelation" input="common/ColliderRelation.xlsx"/>
50 62 <table name="TbGlobalDefine" value="GlobalDefine" input="common/GlobalDefine.xlsx"/>
51 63 <table name="TbFUIPanel" value="FUIPanel" input="common/FUIPanel.xlsx"/>
  64 + <table name="TbNumericTypeEx" value="NumericTypeEx" input="common/NumericTypeEx.xlsx"/>
52 65 </module>
53 66 \ No newline at end of file
... ...
Defines/pro2d.xml
... ... @@ -190,10 +190,10 @@
190 190 <var name="HpLv3" type="int"/>
191 191 <var name="Hp" type="int"/>
192 192  
193   - <var name="HpPerUp" type="int"/>
194   - <var name="Steal" type="int"/>
195   - <var name="DropUp" type="int"/>
196   - <var name="Sp" type="int"/>
  193 + <var name="HpPerUp" type="float"/>
  194 + <var name="Steal" type="float"/>
  195 + <var name="DropUp" type="float"/>
  196 + <var name="Sp" type="float"/>
197 197 <var name="Speed" type="float"/>
198 198  
199 199 <var name="StrengthenMaterialsCombinationID" type="int"/>
... ...