Commit b06f9794cac94d385cdfa96edb6e2fb58a521e2e
1 parent
b00e8a6b
-
Showing
6 changed files
with
17 additions
and
4 deletions
Show diff stats
Datas/common/NumericType.xlsx
No preview for this file type
No preview for this file type
Datas/pro2d/EquipmentData.xlsx
No preview for this file type
Defines/common.xml
| @@ -25,6 +25,12 @@ | @@ -25,6 +25,12 @@ | ||
| 25 | <var name="AllBullet" comment="与所有Body类型碰撞"/> | 25 | <var name="AllBullet" comment="与所有Body类型碰撞"/> |
| 26 | </enum> | 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 | <bean name="ColliderRelation"> | 34 | <bean name="ColliderRelation"> |
| 29 | <var name="ColliderA" type="ColliderTag"/> | 35 | <var name="ColliderA" type="ColliderTag"/> |
| 30 | <var name="Others" type="list,ColliderTag"/> | 36 | <var name="Others" type="list,ColliderTag"/> |
| @@ -44,9 +50,16 @@ | @@ -44,9 +50,16 @@ | ||
| 44 | <var name="Anima" type="FGUIAnimaType"/> | 50 | <var name="Anima" type="FGUIAnimaType"/> |
| 45 | </bean> | 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 | <table name="TbUnityScene" index = "id,assetName" value="UnityScene" input="common/UnityScene.xlsx"/> | 59 | <table name="TbUnityScene" index = "id,assetName" value="UnityScene" input="common/UnityScene.xlsx"/> |
| 48 | <table name="TbDevLog" value="DevLog" input="common/DevLog.xlsx"/> | 60 | <table name="TbDevLog" value="DevLog" input="common/DevLog.xlsx"/> |
| 49 | <table name="TbColliderRelation" value="ColliderRelation" input="common/ColliderRelation.xlsx"/> | 61 | <table name="TbColliderRelation" value="ColliderRelation" input="common/ColliderRelation.xlsx"/> |
| 50 | <table name="TbGlobalDefine" value="GlobalDefine" input="common/GlobalDefine.xlsx"/> | 62 | <table name="TbGlobalDefine" value="GlobalDefine" input="common/GlobalDefine.xlsx"/> |
| 51 | <table name="TbFUIPanel" value="FUIPanel" input="common/FUIPanel.xlsx"/> | 63 | <table name="TbFUIPanel" value="FUIPanel" input="common/FUIPanel.xlsx"/> |
| 64 | + <table name="TbNumericTypeEx" value="NumericTypeEx" input="common/NumericTypeEx.xlsx"/> | ||
| 52 | </module> | 65 | </module> |
| 53 | \ No newline at end of file | 66 | \ No newline at end of file |
Defines/pro2d.xml
| @@ -190,10 +190,10 @@ | @@ -190,10 +190,10 @@ | ||
| 190 | <var name="HpLv3" type="int"/> | 190 | <var name="HpLv3" type="int"/> |
| 191 | <var name="Hp" type="int"/> | 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 | <var name="Speed" type="float"/> | 197 | <var name="Speed" type="float"/> |
| 198 | 198 | ||
| 199 | <var name="StrengthenMaterialsCombinationID" type="int"/> | 199 | <var name="StrengthenMaterialsCombinationID" type="int"/> |