Commit Graph

237 Commits (142956ca6ac91b39c7ba59be38cf1b7d7934a24c)

Author SHA1 Message Date
zhangqiang b63e9b7e81 英雄添加按战力排序 2020-07-31 14:45:32 +08:00
zhangqiang 3b11c5737a 空判断 2020-09-12 14:42:55 +08:00
ZhangBiao b3ddd8fc96 2020-07-24 15:22:17 +08:00
ZhangBiao f27300721a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 12:14:52 +08:00
ZhangBiao 1f5440c2e6 bug修复 2020-07-24 12:11:00 +08:00
jiaoyangna 667b3e0bf5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:32:45 +08:00
jiaoyangna 15976637f4 log提交 2020-07-24 10:32:27 +08:00
zhangqiang 3588a17c00 Merge branch 'master_develop' into master_arena
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/UIConfig.xlsx
2020-07-23 21:24:00 +08:00
jiaoyangna 5894babbf0 英雄献祭修改提交 2020-07-23 16:26:51 +08:00
zhangqiang 3b3dbec6a7 添加巅峰赛编队 2020-07-23 14:36:28 +08:00
wangzhenxing 228d2da247 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 11:34:22 +09:00
wangzhenxing e12c485c99 添加225效果及 添加减乘运算 2020-07-23 11:34:08 +09:00
jiaoyangna 404a0ffedb 归元报错修改 2020-07-22 16:13:25 +08:00
jiaoyangna 69f61467a2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-22 15:57:01 +08:00
jiaoyangna ba8b5a3c93 【宝物合成】一键合成预览处显示错误 2020-07-22 15:50:18 +08:00
ZhangBiao ae502e8322 bug修复 2020-07-21 16:04:07 +08:00
jiaoyangna adc3b71e40 分解修改提交 2020-07-16 10:49:01 +08:00
zhangqiang 592d3385e8 129 战力计算 2020-07-14 14:49:15 +08:00
jiaoyangna 0b26bb33c6 归元修改 2020-07-13 18:31:39 +08:00
jiaoyangna 889d3abf68 【送神祠】归元,点敖丙报错 2020-07-13 17:32:24 +08:00
jiaoyangna d2f25e1845 归元修改 2020-07-13 17:12:46 +08:00
zhangqiang bc270de90d 提交 2020-07-13 15:39:29 +08:00
jiaoyangna 6ff6b5315b 分解、重置相关功能修改 2020-07-13 11:15:53 +08:00
jiaoyangna fdf82e47ac 分解、重置相关功能修改 2020-07-11 18:00:07 +08:00
ZhangBiao 310802e967 language导出 2020-07-10 19:13:29 +08:00
jiaoyangna 3a85c6e339 分解,限时召唤提交 2020-07-10 18:29:38 +08:00
jiaoyangna 7f54e3c88a 装备提交 2020-07-06 20:35:39 +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 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 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 266b9065d8 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
JieLing 00892194b5 提交 2020-05-11 09:38:52 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00