Commit Graph

2 Commits (be59c5923054253d5dadef8bfa5a067fa1f548bf)

Author SHA1 Message Date
JieLing 2be4cc20e6 Merge branch 'master_develop' into master_test
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	data_execl/base_data/CombatControl.xlsx
#	data_execl/base_data/GuideConfig.xlsx
2020-07-16 20:08:11 +08:00
JieLing 9b97aef3d7 内网 0.15.15 2020-07-10 18:20:58 +08:00