Commit f97c833038cdaa7a1816c5301380c50183888e1a
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
# Conflicts: # Datas/pro2d/ItemData.xlsx # Datas/pro2d/PopupsDatas.xlsx
Showing
20 changed files
Show diff stats
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
Datas/pro2d/CatSurvivorMonster.xlsx
No preview for this file type
Datas/pro2d/CatSurvivorMonster_备份.xlsx deleted
No preview for this file type
Datas/pro2d/DialogueAll.xlsx
No preview for this file type
Datas/pro2d/DropChildGroup.xlsx
No preview for this file type
Datas/pro2d/DropGroup.xlsx
No preview for this file type
Datas/pro2d/Email.xlsx
No preview for this file type
Datas/pro2d/GlobalBaseDatas.xlsx
No preview for this file type
Datas/pro2d/HeroLvUpValue.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/MonsterUpValue.xlsx
No preview for this file type
Datas/pro2d/PopupsDatas.xlsx
No preview for this file type
Datas/pro2d/SkillConfig.xlsx
No preview for this file type
Datas/pro2d/StoreDatas.xlsx
No preview for this file type
Datas/pro2d/SurvivalCarbon.xlsx deleted
No preview for this file type
Datas/pro2d/activity/ActivitySign.xlsx
No preview for this file type
Datas/pro2d/hero.xlsx
No preview for this file type
Datas/pro2d/quest/QuestDatas.xlsx
No preview for this file type
Datas/pro2d/quest_carbon/SurvivalCarbon.xlsx
No preview for this file type