Commit Graph

19 Commits (7fb91910fd0da047c5ccd4add2e84bf85e78ee81)

Author SHA1 Message Date
gongjiawei 781a1e8453 音频更新 2020-07-21 14:24:57 +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
jiaoyangna e15bf9a7b2 轩辕宝镜资源提交 2020-07-15 16:27:58 +08:00
ZhangBiao 7785a7c472 神将生阶属性显示错误问题修复 2020-07-14 14:03:08 +08:00
gaoxin db1118aa9c 修复打包后不能充值得bug 2020-07-13 16:48:50 +08:00
JieLing 9b97aef3d7 内网 0.15.15 2020-07-10 18:20:58 +08:00
2han9B1a0 12d9208f90 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 21:19:49 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
gaoxin b999786cbb 部分技能配置 2020-07-08 10:34:41 +08:00
gaoxin 3b7e9e2cdd 特效文件新增 2020-07-07 14:33:48 +08:00
gaoxin cf93ea3910 新技能资源添加 2020-07-03 16:48:33 +08:00
gaoxin 8653437ee1 修复退出战斗界面持续伤害特效导致报错的问题,修复2号位立绘第一次没有淡出效果的问题 2020-07-01 18:35:45 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing 90e12f1a4a 外网0.16.5,测试0.15.11 2020-06-08 20:18:49 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00