Commit cefa535e84d0ec0431041e0767f14121b6f574fa
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
3 changed files
with
1 additions
and
1 deletions
Show diff stats
Datas/__enums__.xlsx
No preview for this file type
Datas/common/FUIPanel.xlsx
No preview for this file type
Defines/common.xml
| ... | ... | @@ -38,7 +38,7 @@ |
| 38 | 38 | <var name="Id" type="FGUIType"/> |
| 39 | 39 | <var name="Group" type="FGUIGroup"/> |
| 40 | 40 | <var name="Backgroud" type="string"/> |
| 41 | - <var name="Mask" type="int"/> | |
| 41 | + <var name="Mask" type="FGUIMaskType"/> | |
| 42 | 42 | </bean> |
| 43 | 43 | |
| 44 | 44 | <table name="TbUnityScene" index = "id,assetName" value="UnityScene" input="common/UnityScene.xlsx"/> | ... | ... |