Commit Graph

238 Commits (TCX_LongZhu)

Author SHA1 Message Date
gongjiawei 8640cc4327 音频更新 2020-07-17 16:13:57 +08:00
JieLing c46047fe2c Merge branch 'master_develop' into master_test
# Conflicts:
#	data_execl/base_data/GuideConfig.xlsx
2020-07-17 16:13:04 +08:00
gongjiawei 61bee0b20b 音频更新 2020-07-17 15:49:57 +08:00
szxhzz 95e9f57db5 音频更新 2020-07-17 15:41:04 +08:00
gongjiawei 765e2350ab 音频更新 2020-07-17 14:47:10 +08:00
szxhzz e95d071139 音频更新 2020-07-17 11:25:09 +08:00
szxhzz 531a21608b 音频更新 2020-07-16 20:53:40 +08:00
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
szxhzz 663ff26d71 音频更新 2020-07-16 19:41:40 +08:00
gongjiawei c3f24ec725 音频更新 2020-07-16 18:20:25 +08:00
gongjiawei f087cec5d1 音频更新 2020-07-16 18:10:24 +08:00
szxhzz eb08bc7f57 音频更新 2020-07-16 17:34:31 +08:00
szxhzz 06e6b90d54 音频更新 2020-07-16 17:22:35 +08:00
gongjiawei 9334944455 音频更新 2020-07-16 16:06:45 +08:00
gongjiawei d770d288eb 音频更新 2020-07-16 15:46:00 +08:00
szxhzz 045e07cff0 音频更新 2020-07-16 14:41:07 +08:00
szxhzz 43f2a437a6 音频更新 2020-07-16 11:03:09 +08:00
gongjiawei b175124c6b 音频更新 2020-07-15 18:39:45 +08:00
gongjiawei f84d08ffeb 音频更新 2020-07-15 18:14:51 +08:00
gongjiawei cb7af0967b 音频更新 2020-07-15 16:19:11 +08:00
gongjiawei deee98f641 音频更新 2020-07-15 15:48:00 +08:00
gongjiawei dc5799c229 音频更新 2020-07-15 14:54:27 +08:00
JieLing 325d9c7224 内网测试 0.15.28 2020-07-11 17:33:26 +08:00
gaoxin 8be0056346 技能名称音效添加 2020-07-11 16:26:33 +08:00
gaoxin 679752e628 技能音效添加 2020-07-11 16:26:27 +08:00
gaoxin 5c1e235228 技能名称音效添加 2020-07-11 15:42:56 +08:00
gaoxin ee0c035731 技能音效添加 2020-07-11 15:19:49 +08:00
2han9B1a0 73c6cc9582 删除meta文件 2020-07-02 17:58:34 +08:00
JieLing 461c64b04a svn逻辑同步 2020-07-02 14:53:44 +08:00
gaoxin 52f8a9922f 无用meta文件删除 2020-07-01 17:43:55 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 7382b2db77 版本开发提交 2020-06-28 17:52:29 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing ab3dbad074 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 6b3a4b5fb9 切换为android平台 2020-05-15 17:46:08 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00