ZhangBiao
|
2e57796328
|
礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
|
2020-10-13 19:12:24 +08:00 |
ZhangBiao
|
745983b30a
|
Merge branch '0活动开发聚集地/推送礼包' of http://60.1.1.230/gaoxin/JL_Client into 0活动开发聚集地/推送礼包
|
2020-10-13 18:40:05 +08:00 |
ZhangBiao
|
e063c2c23d
|
推送礼包。。。。
|
2020-10-13 18:39:55 +08:00 |
ZhangBiao
|
71313c63c2
|
推送礼包
|
2020-10-13 18:24:11 +08:00 |
ZhangBiao
|
5efebacbbb
|
推送礼包,恢复被覆盖的部分
|
2020-10-13 18:20:35 +08:00 |
ZhangBiao
|
9ddfb22e3a
|
Merge branch 'master_develop' into 0活动开发聚集地/推送礼包
|
2020-10-13 17:26:13 +08:00 |
jiaoyangna
|
0b344eb1c0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-22 01:39:08 +08:00 |
jiaoyangna
|
eceb50c114
|
no message
|
2020-10-22 01:39:04 +08:00 |
jiaoyangna
|
9a980bf88b
|
主题活动修改
|
2020-10-21 23:20:41 +08:00 |
ZhangBiao
|
b359ae2df9
|
推送礼包 完事儿
|
2020-10-13 17:21:27 +08:00 |
jiaoyangna
|
89c7961154
|
推送礼包修改
|
2020-10-22 03:24:22 +08:00 |
jiaoyangna
|
598eac1d3a
|
推送礼包修改
|
2020-10-22 02:57:40 +08:00 |
ZhangBiao
|
677dca14e7
|
森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
|
2020-10-13 14:01:05 +08:00 |
ZhangBiao
|
3b19043f34
|
森罗幻境 炸弹使用描述修改
|
2020-10-13 14:00:41 +08:00 |
ZhangBiao
|
c4fac7b58f
|
Revert "关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改"
This reverts commit 63a1588f66.
|
2020-10-13 13:55:31 +08:00 |
ZhangBiao
|
45c9c20dd6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 13:52:41 +08:00 |
ZhangBiao
|
63a1588f66
|
关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改
|
2020-10-13 13:51:11 +08:00 |
gaoxin
|
91173e3f91
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 12:44:20 +08:00 |
gaoxin
|
a107de4ebe
|
删除新增的打点事件
|
2020-10-13 12:44:15 +08:00 |
gaoxin
|
c3e94843c6
|
打点事件新增
|
2020-10-13 11:35:32 +08:00 |
gaoxin
|
557216c617
|
参数分割符修改
|
2020-10-13 10:02:14 +08:00 |
gaoxin
|
c862bc6623
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-13 09:59:59 +08:00 |
JieLing
|
5db40d2743
|
监听事件未移除正确
|
2020-10-12 20:48:15 +08:00 |
jiaoyangna
|
bd99b9c1ec
|
限时兑换层级错误修改
|
2020-10-12 18:30:14 +08:00 |
jiaoyangna
|
1defb2559f
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 17:12:34 +08:00 |
gaoxin
|
8978b6c906
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-12 17:10:39 +08:00 |
gaoxin
|
e4ceea35af
|
ios包名修改
|
2020-10-12 17:10:28 +08:00 |
jiaoyangna
|
3bb6821083
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:57:22 +08:00 |
jiaoyangna
|
7bd92923da
|
【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态
|
2020-10-12 16:57:15 +08:00 |
wangzhenxing
|
965906baf2
|
修改bug:【ID1010120】
【魂印】5000054 描述传递的伤害是直接伤害,击杀没有触发追击
|
2020-10-12 16:36:59 +09:00 |
ZhangBiao
|
252fec5bbd
|
回春散手动使用次数不刷新修复
|
2020-10-12 16:10:04 +08:00 |
zhangqiang
|
bf37ff8cea
|
打点修改 dev 分支漏提
|
2020-10-12 16:00:12 +08:00 |
zhangqiang
|
f16636b76a
|
线上问题 宝器分解bug
|
2020-10-12 15:54:05 +08:00 |
ZhangBiao
|
f087c0258b
|
|
2020-10-12 15:39:23 +08:00 |
zhangqiang
|
01d537118b
|
线上问题 bug 规避修改位置
|
2020-10-12 15:18:16 +08:00 |
gaoxin
|
faa065f7b1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-12 15:16:14 +08:00 |
gaoxin
|
3ea925661b
|
修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。
|
2020-10-12 15:15:46 +08:00 |
ZhangBiao
|
62f185c859
|
森罗回春散使用bug修改
|
2020-10-12 15:13:37 +08:00 |
ZhangBiao
|
69fee1514f
|
森罗回春散使用 问题修复
|
2020-10-12 14:43:44 +08:00 |
gaoxin
|
2f4bc32d63
|
修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。
|
2020-10-12 14:34:38 +08:00 |
gongjiawei
|
7663abebb6
|
ui音效优化
|
2020-10-12 14:15:50 +08:00 |
zhangqiang
|
2c9d7c7224
|
线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错
|
2020-10-12 14:02:17 +08:00 |
wangzhenxing
|
e50b03ea89
|
修改bug:【ID1010307】
【技能】红孩儿6星天赋,追加普攻必定暴击无效
|
2020-10-12 13:56:58 +09:00 |
zhangqiang
|
99636ac662
|
线上问题 vip 战力计算打开 只是表的 pvp 评分配成0
|
2020-10-12 13:53:59 +08:00 |
ZhangBiao
|
197b1628a3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-10-12 12:13:20 +08:00 |
zhangqiang
|
756db024dc
|
修复三界降魔头像框点击无反应
(cherry picked from commit 42f0f9b5fe)
|
2020-10-12 12:13:03 +08:00 |
gongjiawei
|
ec0946359e
|
音频更新
|
2020-10-12 11:57:26 +08:00 |
gaoxin
|
285a41ae05
|
修改bug 限时活动itemView报错
|
2020-10-12 11:28:20 +08:00 |
jiaoyangna
|
1184cd3f76
|
【跳转】碧海卷使用按钮跳转位置不正确
|
2020-10-12 11:01:17 +08:00 |
jiaoyangna
|
25d4148059
|
【丹心碧血】限时兑换活动界面黑屏
|
2020-10-12 11:00:31 +08:00 |