Commit Graph

650 Commits (4117095996d0c095c4b1b3e793b932be0167fb57)
 

Author SHA1 Message Date
zhangqiang 4117095996 一键上阵优化 2020-08-24 23:38:17 +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
ZhangBiao f7424e83ca 元素共鸣 2020-07-24 10:30:33 +08:00
shihongyi dc9fa4e880 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-24 10:08:06 +08:00
shihongyi 7418fd2fa7 暂屏充值test 2020-07-24 10:06:54 +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 2d84c3137f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-23 19:05:51 +08:00
ZhangBiao 7b795f0daa 森罗bug 2020-07-23 19:05:43 +08:00
shihongyi d820ef152a bugfix 2020-07-23 18:19:26 +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
shihongyi de99aed8a5 充值表修改备注、献祭表id大小写、调整转盘奖励 2020-07-23 17:32:12 +08:00