Commit 04ccc822a716970e6aa5514f58ab70e7b50a05f2

Authored by yangjiyue
2 parents 7e04c3ad 85b9b39f

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

# Conflicts:
#	Datas/pro2d/ItemData.xlsx
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