Commit Graph

3792 Commits (2888bf53441547e37e17b753eca853a807d4c5e4)

Author SHA1 Message Date
ZhangBiao 40bc700f65 【累充】周刷新的累充,页签会显示每日累充 2021-05-08 12:01:18 +08:00
ZhangBiao b88d05061c 【点金达人】在活动界面跳转点金,需要切换页签,次数才会刷新 2021-05-08 11:45:05 +08:00
ZhangBiao 9fda08c7ba 【碎片合成】神将达上限,选择合成数量时没有合理提示 2021-05-08 11:03:46 +08:00
jiaoyangna fb51497d38 主题活动提交 2021-05-07 18:05:09 +08:00
jiaoyangna 25cfb730b6 灵兽特惠提交 2021-05-07 17:49:23 +08:00
jiaoyangna 21e5c3b78d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-05-07 17:01:34 +08:00
jiaoyangna dd862760cd 图片修改提交 2021-05-07 17:00:54 +08:00
ZhangBiao bad91c3b25 【月卡】月卡界面关闭后报错修改 2021-05-07 16:39:23 +08:00
ZhangBiao 02be5bb730 【森罗幻境】boss不生成修改 2021-05-07 15:10:06 +08:00
ZhangBiao 782588b1ef 【森罗幻境】修复打boss弹出恭喜获得弹窗 2021-05-07 11:43:37 +08:00
jiaoyangna c6a5a7ce01 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-05-07 11:02:14 +08:00
jiaoyangna ff8b9b57cc 限时up 提交 2021-05-07 11:01:33 +08:00
ZhangBiao 04e3fec068 【灵兽宝阁】有免费抽的时候不显示倒计时 2021-05-07 10:55:04 +08:00
JieLing 0259fc6834 Merge branch 'china/dev' into china/local 2021-05-06 18:33:31 +08:00
jiaoyangna 8e44dca9b5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-05-06 18:22:48 +08:00
jiaoyangna 885c8bc53c 限时兑换在两个活动里出现修改 2021-05-06 18:22:15 +08:00
zhangqiang 601f5c09b9 【拍脸】修改 2021-05-06 18:08:53 +08:00
jiaoyangna 7ec568e48d 新添加主题活动限时兑换跳转 2021-05-06 17:49:43 +08:00
JieLing 19ced1b570 Merge branch 'china/dev' into china/local 2021-04-30 17:15:33 +08:00
gaoxin d574d2ee2a Merge branch 'china/dev-c' into china/dev 2021-04-30 16:36:09 +08:00
jiaoyangna 412a4ec851 没有找到剧情继续执行,不卡死 2021-04-30 16:13:00 +08:00
ZhangBiao 252454272a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-30 15:27:57 +08:00
ZhangBiao 81b82ea509 【云游商人】跨天红点不刷新修改 2021-04-30 15:27:47 +08:00
gaoxin 65454a8e23 【bug】车迟斗法挑战报错,再次延长天尊降世的可关闭时间 2021-04-30 14:07:24 +08:00
JieLing 7af3a5c0e4 Merge branch 'china/dev' into china/local 2021-04-30 12:43:43 +08:00
gaoxin 7c54586379 Merge branch 'china/dev-c' into china/dev 2021-04-30 12:43:11 +08:00
jiaoyangna 08ef62eb2b 至尊降世 前往修改 2021-04-30 12:42:31 +08:00
gaoxin 0f01c9eb2b Merge branch 'china/dev-c' into china/dev 2021-04-30 12:40:23 +08:00
ZhangBiao 7711c08fbe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-30 11:49:55 +08:00
ZhangBiao 1980c01573 【竞技场】时间到弹出 2021-04-30 11:49:45 +08:00
JieLing 7dd2b6b9c3 Merge branch 'china/dev' into china/local 2021-04-30 11:34:09 +08:00
gaoxin de827b3ae3 【至尊降世】延时四秒后才能关闭界面否则会出现立绘消失的问题 2021-04-30 11:29:40 +08:00
wangzhenxing d4a0a902bd 聊天界面称号特效显示修改 2021-04-30 11:17:02 +08:00
jiaoyangna 6c673de50a 剧情提交 2021-04-30 09:50:35 +08:00
JieLing 70a45fd450 Merge branch 'china/dev' into china/local 2021-04-29 21:28:57 +08:00
jiaoyangna 1ab93a245a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 21:17:45 +08:00
jiaoyangna a26b2b7829 公会刷新时间修改 2021-04-29 21:17:40 +08:00
JieLing b41a64a135 Merge branch 'china/dev' into china/local 2021-04-29 20:53:56 +08:00
gaoxin 5f09e64257 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 20:19:10 +08:00
jiaoyangna 3578f57882 关闭假战斗回放 2021-04-29 20:16:37 +08:00
jiaoyangna 8e976f0cab Merge branch 'china/dev' into china/dev-c 2021-04-29 19:44:54 +08:00
jiaoyangna 45eef519df 战斗剧情播放两边修改 2021-04-29 19:44:41 +08:00
jiaoyangna fd79af8e4b Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-29 19:38:26 +08:00
jiaoyangna dd8d7df89f 剧情特效提交 2021-04-29 18:55:31 +08:00
gaoxin 7bae49b1c2 【至尊降世】特效修改 2021-04-29 17:53:40 +08:00
ZhangBiao 22df869cd9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 17:46:40 +08:00
ZhangBiao 4f2c8ad573 【竞技场】回滚提交 2021-04-29 17:46:23 +08:00
jiaoyangna f86caefd7d Merge branch 'china/dev' into china/dev-c 2021-04-29 17:44:52 +08:00
jiaoyangna fb9d2b7272 剧情提交 2021-04-29 17:44:35 +08:00
ZhangBiao f634ae4e4b 【竞技场、云游商人】竞技场时间到未弹出,云游增加log 2021-04-29 17:42:35 +08:00
ZhangBiao 2133dc0209 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 17:23:16 +08:00
ZhangBiao 441495fcfe 【踏碎凌霄】奖励增加序号 2021-04-29 17:23:06 +08:00
gaoxin 4950e48b2f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 17:12:38 +08:00
gaoxin d413915c6a 【竞技场】修复竞技场赛季切换时也会显示红点儿的问题 2021-04-29 17:12:12 +08:00
jiaoyangna aba55c9b7c Merge branch 'china/dev' into china/dev-c 2021-04-29 17:10:13 +08:00
gaoxin bfe66493ab Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 17:03:47 +08:00
gaoxin e4fea4a6dd 【竞技场】新赛季重置积分,一进来是上赛季的积分,再点进去才是本赛季的积分 2021-04-29 17:03:41 +08:00
jiaoyangna ed9c058ece 修改剧情入口 2021-04-29 17:00:12 +08:00
ZhangBiao e5a19b76f1 【踏碎凌霄】报错修改 2021-04-29 16:24:55 +08:00
ZhangBiao bc1b55d7f3 【踏碎凌霄】增加包厢数量显示 2021-04-29 16:19:58 +08:00
ZhangBiao c8cd8174d9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-29 15:40:19 +08:00
ZhangBiao a725565ac6 【踏碎凌霄】修改提交 2021-04-29 15:40:10 +08:00
jiaoyangna bd1f264452 剧情提交 2021-04-29 15:36:36 +08:00
jiaoyangna 73b094b9a4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-29 15:35:22 +08:00
jiaoyangna 1da013efda 剧情提交 2021-04-29 15:35:18 +08:00
gaoxin b6366a970e 【首充】云动画每天只播放一次 2021-04-29 15:08:34 +08:00
zhangqiang f6a600b3fc 【月卡时间】时分秒时候刷新延迟一秒 2021-04-29 14:56:19 +08:00
ZhangBiao ecccb455a2 Merge branch 'china/dev' into china/dev-c 2021-04-29 14:35:28 +08:00
ZhangBiao 5da3914599 【踏碎凌霄优化】玩法界面上显示下一个目标的血条 2021-04-29 14:33:58 +08:00
zhangqiang c202e03703 【英雄详情升星】升星后的属性没有加团队属性 2021-04-29 10:09:27 +08:00
jiaoyangna 660299a6d2 六星玉帝入口跳转特定礼包修改提交 2021-04-29 10:08:28 +08:00
JieLing 3b136941e4 Merge branch 'china/dev' into china/local 2021-04-28 19:11:42 +08:00
gaoxin f570a522fe 【挂机】修复偶现生成怪的位置不够的问题 2021-04-28 19:02:02 +08:00
gaoxin fb29ac6187 Merge branch 'china/dev-c' into china/dev 2021-04-28 05:44:12 +08:00
gaoxin 262b07d1af 【剧情】修复连续播放两个剧情导致重复引导首充的问题 2021-04-28 05:43:52 +08:00
DESKTOP-98AVA47\Administrator 3bde92fa6e 【超值基金】月卡判断去掉修改2--- 张强 2021-10-31 01:06:49 +07:00
DESKTOP-98AVA47\Administrator da44c05e9f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-07-14 01:46:26 +07:00
DESKTOP-98AVA47\Administrator d9d1e50e9c 【超值基金】去掉月卡激活判断 2021-07-14 01:45:47 +07:00
ZhangBiao 23d3fa42fd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 05:10:31 +08:00
ZhangBiao 95b4b8197a 【特权商城】特效消失修改 2021-04-28 05:10:00 +08:00
wangzhenxing 46857168c1 6星玉帝入口消失逻辑添加容错 2021-04-28 03:34:53 +08:00
JieLing e24e6cbebe Merge branch 'china/dev' into china/local 2021-04-28 03:30:42 +08:00
JieLing 3105fc3dd0 Merge branch 'china/dev' into china/local 2021-04-28 03:02:34 +08:00
wangzhenxing 4e61e39e53 主城 六星玉帝入口,16日登陆入口适配 2021-04-28 02:52:56 +08:00
gaoxin db174bd4b9 【剧情】修改女性角色的立绘信息为表配置,id写死为5402 2021-04-28 02:44:03 +08:00
ZhangBiao 03babfe313 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 01:51:24 +08:00
ZhangBiao a8353cf884 【踏碎凌霄】掉落修改 2021-04-28 01:51:16 +08:00
zhangqiang 23e9de7611 Revert "【超值基金】购买后显示天数+1特殊处理"
This reverts commit 9f1c678482.
2021-04-28 01:41:15 +08:00
zhangqiang 9f1c678482 【超值基金】购买后显示天数+1特殊处理 2021-04-28 01:23:42 +08:00
zhangqiang dc13bc21cf 【超值基金】未购买隐藏礼包的时间 2021-04-28 00:58:11 +08:00
jiaoyangna d55dfb5130 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 00:43:30 +08:00
jiaoyangna cbc49ace13 屏蔽跳过按钮
(cherry picked from commit 479931095c)
2021-04-28 00:43:18 +08:00
wangzhenxing 34b49c5aed Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 00:33:56 +08:00
wangzhenxing 54601fb463 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 00:33:07 +08:00
wangzhenxing e918945386 主城六星玉帝入口进入成长礼包滑动到指定条目 2021-04-28 00:32:55 +08:00
ZhangBiao 874da03cb8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 00:32:53 +08:00
ZhangBiao 1cbebc79d4 【推送礼包】文字修改 2021-04-28 00:32:43 +08:00
jiaoyangna 5223d8f865 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 00:25:39 +08:00
jiaoyangna e009f94f48 删除多余按钮 2021-04-28 00:25:27 +08:00
gaoxin c70840f7db 【踏碎凌霄】boss不再放大
(cherry picked from commit c391b5885e)
2021-04-28 00:22:18 +08:00