Commit 04ccc822a716970e6aa5514f58ab70e7b50a05f2
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
# Conflicts: # Datas/pro2d/ItemData.xlsx
Showing
6 changed files
Show diff stats
Datas/common/UnityScene.xlsx
No preview for this file type
Datas/pro2d/AttributesEntry.xlsx
No preview for this file type
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Datas/pro2d/MainChapter.xlsx
No preview for this file type
Datas/pro2d/hero.xlsx
No preview for this file type