Commit Graph

667 Commits (99315ac3c6e2372b232c7480d84e73bf6353892c)
 

Author SHA1 Message Date
gaoxin 99315ac3c6 首充引导关闭 2020-07-25 16:05:27 +08:00
gaoxin 761745dc63 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 16:02:50 +08:00
zhangqiang fe01796ded 修改 2020-09-11 21:10:39 +08:00
gaoxin 0b62abdb72 修复左右黑边的问题 2020-07-25 16:02:38 +08:00
jiaoyangna 50e50475be Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 15:46:48 +08:00
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
jiaoyangna 6742056a93 冲突解决提交 2020-07-25 15:18:07 +08:00
jiaoyangna ea95537641 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 14:21:38 +08:00
jiaoyangna a688050060 修改星星提交 2020-07-25 14:21:33 +08:00
shihongyi ab7e0c022d test 2020-07-25 14:06:55 +08:00
zhangqiang f19188797f 英雄背景替换修改出发位置 2020-08-25 15:11:32 +08:00
zhangqiang 4117095996 一键上阵优化 2020-08-24 23:38:17 +08:00
jiaoyangna 5f556b7b5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
2020-07-25 13:22:33 +08:00
jiaoyangna 0c2239bd11 编队修改提交 2020-07-25 13:21:30 +08:00
jiaoyangna caadda04e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab
2020-07-24 20:04:44 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
shihongyi 5623050a01 变强屏蔽充值跳转、屏蔽巅峰商店 2020-07-24 19:20:13 +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
skuld f6415aa772 修改巅峰赛规则 2020-08-05 23:19:28 +08:00
ZhangBiao b67269d2f7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 18:30:36 +08:00
ZhangBiao 4945f99452 --(24暂时关闭) 2020-07-24 18:30:26 +08:00
shihongyi 05f0d11729 巅峰战战斗回合、充值留特权商城 2020-07-24 17:15:30 +08:00
kansa 44b83f6fdd 修改圣物错误描述 2020-07-24 17:13:25 +08:00
ZhangBiao f1755d0efa --(24暂时关闭) 2020-07-24 16:52:36 +08:00
ZhangBiao 206c3d93a0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 16:39:15 +08:00
ZhangBiao d398804a83 --(24暂时关闭) 2020-07-24 16:38:04 +08:00
shihongyi 409874c052 限时折扣推送 18级 因屏蔽充值 改998 2020-07-24 16:15:43 +08:00
shihongyi cac0384012 屏充值 2020-07-24 16:04:31 +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
shihongyi 1ffb97cf9f 巅峰赛开启时间 2020-07-24 15:16:44 +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
shihongyi bffd51518d 归元 2020-07-24 12:10:35 +08:00
skuld be095cbb7b 修改竞技场帮助文本 2020-07-24 11:19:16 +08:00
zhangqiang 42959d0257 编队bug 2020-07-24 11:05:40 +08:00
shihongyi a5e0f98bcd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:46:12 +08:00
shihongyi d4f48e575d 暂屏付费之2 2020-07-24 10:45:51 +08:00
kansa cbfc420a96 修改竞技场刷新时间为7天 2020-07-24 10:43:32 +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