You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
caoyuan 25d928ae2b Merge branch 'master' of https://git.17pkmj.com:3000/sunhengwei/xmmg_1
# Conflicts:
#	配置表/taskSystem/taskSystem.xlsx
2 years ago
..
7days.json 修改错误 2 years ago
Achievements.json 1、调整每日任务的奖励。 2 years ago
adsicon.json 1 2 years ago
dailyRew.json 更新每日任务 2 years ago
dailyRew2.json 1 2 years ago
dailyTask.json 每日任务数值错误修改 2 years ago
facility_0.json 数值调整: 2 years ago
guide.json guide添加参数 2 years ago
item.json 修改item表错误,更新多语言 2 years ago
itemType.json 更新菜谱 2 years ago
menu_1.json 修改错误 2 years ago
package.json 还原原数据 2 years ago
pandaLevel.json 修改错误 2 years ago
position.json 关闭套餐卓1 2 years ago
staff.json 数值调整: 2 years ago
task.json Merge branch 'master' of https://git.17pkmj.com:3000/sunhengwei/xmmg_1 2 years ago