zhangqiang
|
af8aed7701
|
图鉴错乱修改
|
2021-04-17 16:35:38 +08:00 |
JieLing
|
eb5cfeb7f8
|
【每日礼包】一键购买修改
|
2021-04-17 16:16:10 +08:00 |
JieLing
|
f30d2f042e
|
【提审切换】开关活动
|
2021-04-17 16:16:03 +08:00 |
zhangqiang
|
1ee7063569
|
【限时招募】 提交
|
2021-04-16 18:13:09 +08:00 |
jiaoyangna
|
f45c7fa166
|
活动修改提交
|
2021-04-16 16:49:34 +08:00 |
gaoxin
|
5105747314
|
【配置】异步获取配置文件
|
2021-04-16 15:22:35 +08:00 |
gaoxin
|
60ccfce6dc
|
【累计充值】第二次销毁时报错
|
2021-04-16 14:23:31 +08:00 |
jiaoyangna
|
444e1e4428
|
限时招募提交
|
2021-04-16 10:08:33 +08:00 |
jiaoyangna
|
5f29447434
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 20:37:00 +08:00 |
jiaoyangna
|
c844a72609
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-15 19:54:30 +08:00 |
gaoxin
|
8eb6c30d95
|
【战斗】战斗开始时清除轮转方法,(伏虎罗汉无限攻击的bug)
|
2021-04-15 19:05:01 +08:00 |
gaoxin
|
2974d71d13
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 19:04:05 +08:00 |
gaoxin
|
fe74e55bc9
|
【十绝阵】文字显示修改 军团战 改为 十绝阵
|
2021-04-15 19:04:00 +08:00 |
JieLing
|
bb79e2839a
|
Merge branch 'china/local' into china/test
|
2021-04-15 18:17:56 +08:00 |
JieLing
|
afe41246d0
|
【森罗幻境】修改2
|
2021-04-15 18:17:30 +08:00 |
zhangqiang
|
3a4d593fdb
|
【礼包 公会援助】列表刷新置顶问题
|
2021-04-15 16:25:00 +08:00 |
JieLing
|
d47f7ace07
|
Merge branch 'china/local' into china/test
|
2021-04-15 16:10:34 +08:00 |
JieLing
|
aff624a2ba
|
【森罗幻境】修改
|
2021-04-15 16:09:58 +08:00 |
ZhangBiao
|
749fd32ed0
|
【森罗幻境】选择英雄按战力发送英雄顺序
|
2021-04-15 15:28:04 +08:00 |
zhangqiang
|
bf4145ff73
|
【宝物分解】
|
2021-04-15 15:25:57 +08:00 |
gaoxin
|
8f611f0340
|
【大闹天宫】敌人详情弹窗,有图片超框
|
2021-04-15 15:17:43 +08:00 |
gaoxin
|
196a319a4e
|
【跳过战斗】灵兽释放技能时,点击跳过战斗按钮无效
|
2021-04-15 15:11:25 +08:00 |
ZhangBiao
|
4b429e2a87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 14:57:01 +08:00 |
ZhangBiao
|
ac6697b461
|
【森罗】提交
|
2021-04-15 14:56:51 +08:00 |
zhangqiang
|
b37f61f988
|
【宝物分解】
|
2021-04-15 14:35:19 +08:00 |
ZhangBiao
|
d5879c2445
|
【森罗幻境】暂时还原
|
2021-04-15 14:24:40 +08:00 |
ZhangBiao
|
5d47d0b42e
|
【森罗】排序,选择相同将,修复
|
2021-04-15 12:26:47 +08:00 |
ZhangBiao
|
204e922062
|
【礼包判空】略过id=0的礼包
|
2021-04-15 10:28:09 +08:00 |
ZhangBiao
|
fff121933f
|
【森罗幻境】选择相同神将报错修复
|
2021-04-15 09:35:24 +08:00 |
ZhangBiao
|
12a4d787c2
|
|
2021-04-14 20:11:53 +08:00 |
ZhangBiao
|
16625adb84
|
|
2021-04-14 20:06:07 +08:00 |
ZhangBiao
|
5ae5555011
|
【森罗幻境】选择英雄按战力发送英雄顺序
|
2021-04-14 20:00:06 +08:00 |
ZhangBiao
|
de85b844e5
|
【逐圣商店】取消主胜商店红点
|
2021-04-14 17:41:44 +08:00 |
JieLing
|
773a21608e
|
Merge branch 'china/local' into china/test
|
2021-04-13 18:28:38 +08:00 |
JieLing
|
234bc919e0
|
Merge branch 'china/dev' into china/local
|
2021-04-13 18:28:17 +08:00 |
zhangqiang
|
8cf7de1811
|
【大闹天宫】试炼节点显示有问题
|
2021-04-13 18:26:37 +08:00 |
JieLing
|
2b549e6de8
|
Merge branch 'china/local' into china/test
|
2021-04-13 17:15:32 +08:00 |
JieLing
|
798cf5acde
|
Merge branch 'china/dev' into china/local
|
2021-04-13 17:15:06 +08:00 |
zhangqiang
|
6d21fd41fb
|
【大闹天宫】试炼节点显示bug
|
2021-04-13 17:14:29 +08:00 |
ZhangBiao
|
2214d15550
|
【福星高照】拍脸增加主线引导冲突限制
|
2021-04-13 17:12:28 +08:00 |
ZhangBiao
|
f1864ae6cf
|
Revert "【每日累充】banner和按钮资源替换"
This reverts commit c34a3fcc24 .
|
2021-04-13 16:54:48 +08:00 |
zhangqiang
|
0e8f87f32e
|
【魂印战力计算】bug
|
2021-04-13 16:34:30 +08:00 |
ZhangBiao
|
3e6d68ee34
|
【福星高照】关闭upview
|
2021-04-13 14:39:35 +08:00 |
ZhangBiao
|
314301c3b0
|
【活动优化】每日礼包(一键购买)按钮 资源替换
|
2021-04-13 14:22:00 +08:00 |
ZhangBiao
|
6e87c6b41c
|
【十五日登录】奖励领完不关闭修复
|
2021-04-13 14:06:42 +08:00 |
ZhangBiao
|
c34a3fcc24
|
【每日累充】banner和按钮资源替换
|
2021-04-13 13:46:09 +08:00 |
JieLing
|
6d7c8e50a4
|
Merge branch 'china/local' into china/test
|
2021-04-13 00:39:32 +08:00 |
JieLing
|
e1f37be94c
|
Merge branch 'china/dev' into china/local
|
2021-04-13 00:39:05 +08:00 |
gaoxin
|
f210a35821
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-13 00:38:39 +08:00 |
gaoxin
|
a895a311d7
|
【超值基金】修改开启根据豪华月卡
|
2021-04-13 00:38:31 +08:00 |