Commit Graph

435 Commits (e6b0cbcf3eac06b069d7492da9889f98e159d81a)

Author SHA1 Message Date
gaoxin e6b0cbcf3e 无用meta文件删除 2020-07-25 15:31:11 +08:00
gaoxin 7c47d7c6a4 攻击音效提前0.3秒 2020-07-25 15:30:33 +08:00
zhangqiang 1845d662ab 巅峰战竞猜结果新加界面 新手引导修改主线开始战斗按钮名称 2020-09-07 21:15:40 +08:00
zhangqiang f19188797f 英雄背景替换修改出发位置 2020-08-25 15:11:32 +08:00
zhangqiang 4117095996 一键上阵优化 2020-08-24 23:38:17 +08:00
ZhangBiao ae1d8b4e97 2020-07-24 18:49:17 +08:00
zhangqiang a6744aaa90 替换英雄详情背景 2020-08-24 22:03:28 +08:00
zhangqiang a11919fbd9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 21:46:33 +08:00
zhangqiang abfde3e8a9 巅峰战bug and 使用按钮需求 2020-08-24 21:46:19 +08:00
ZhangBiao 4945f99452 --(24暂时关闭) 2020-07-24 18:30:26 +08:00
ZhangBiao f1755d0efa --(24暂时关闭) 2020-07-24 16:52:36 +08:00
ZhangBiao d398804a83 --(24暂时关闭) 2020-07-24 16:38:04 +08:00
ZhangBiao 7fb91910fd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 15:22:30 +08:00
ZhangBiao b3ddd8fc96 2020-07-24 15:22:17 +08:00
zhangqiang 6238892d99 巅峰赛刷新调位置 赛程增加-1 2020-08-05 21:28:16 +08:00
zhangqiang 4d0b53adf9 巅峰赛货币显示 2020-08-05 21:03:36 +08:00
ZhangBiao 0ad52a3855 活动暂时关闭 2020-07-24 13:39:02 +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
zhangqiang 42959d0257 编队bug 2020-07-24 11:05:40 +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
ZhangBiao 5edb6c9234 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:30:56 +08:00
ZhangBiao f7424e83ca 元素共鸣 2020-07-24 10:30:33 +08:00
zhangqiang dbb563fbe5 播放第三场战斗动画修改 2020-07-24 10:01:48 +08:00
zhangqiang 485c81da9f 禁止上下阵提示文字 2020-07-24 09:36:19 +08:00
zhangqiang 3fa23c25ea 修改界面id 2020-07-23 21:29:40 +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
zhangqiang 688662836a 修改 2020-07-23 21:18:46 +08:00
zhangqiang 6a855cf7a2 巅峰赛问题修改 2020-07-23 20:39:21 +08:00
ZhangBiao c268538c0e 共鸣资源替换 2020-07-23 19:46:54 +08:00
ZhangBiao 7b795f0daa 森罗bug 2020-07-23 19:05:43 +08:00
zhangqiang 94684153c3 回放三局两胜显示 2020-07-23 18:06:55 +08:00
ZhangBiao 259daf6a92 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 17:42:46 +08:00
ZhangBiao e0d156ad74 森罗英雄全部死亡战斗报错 2020-07-23 17:42:17 +08:00
jiaoyangna 5894babbf0 英雄献祭修改提交 2020-07-23 16:26:51 +08:00
ZhangBiao 4114a241dd 2020-07-23 16:02:11 +08:00
ZhangBiao 7fb5ac778f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:44:51 +08:00
ZhangBiao 9b290c1ed5 图片资源替换 2020-07-23 15:44:40 +08:00
jiaoyangna 4af617da49 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 15:43:23 +08:00
jiaoyangna aefa2b0cac 添加一个万象境的入口列表 2020-07-23 15:42:42 +08:00
wangzhenxing 60b7e750a6 【ID1007274】
【技能】无敌盾应清除目标所有负面状态
2020-07-23 16:19:00 +09:00
jiaoyangna 578d81e12e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-07-23 16:07:43 +08:00
jiaoyangna 561c3299f2 .asset commit 2020-07-23 16:05:56 +08:00
jiaoyangna 2fd0311c3c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-07-23 16:02:06 +08:00
jiaoyangna b424927bbb tupian tijiao 2020-07-23 16:01:26 +08:00
zhangqiang 3b3dbec6a7 添加巅峰赛编队 2020-07-23 14:36:28 +08:00
ZhangBiao c7da3db86d 大闹天宫打完boss不加积分问题修复 2020-07-23 13:55:12 +08:00
ZhangBiao 6f35ad19c2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 12:47:22 +08:00
ZhangBiao 207dd8e2ec 天宫秘宝刷新时间修改 2020-07-23 12:46:48 +08:00