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 |
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 |
JieLing
|
37874cea47
|
Merge branch 'china/local' into china/test
|
2021-04-13 00:23:47 +08:00 |
JieLing
|
0a2756ce46
|
Merge branch 'china/dev' into china/local
|
2021-04-13 00:23:23 +08:00 |
ZhangBiao
|
41c34b4a9b
|
【十五日登录】连续点击报错提交
|
2021-04-12 23:33:16 +08:00 |
JieLing
|
3d25ff6b6d
|
Merge branch 'china/local' into china/test
|
2021-04-12 22:38:33 +08:00 |
gaoxin
|
dfe13f78be
|
Merge branch 'china/local' into china/dev
|
2021-04-12 22:35:54 +08:00 |
JieLing
|
01797f302e
|
Merge branch 'china/dev' into china/local
|
2021-04-12 22:31:27 +08:00 |
gaoxin
|
0958baf1c0
|
【图鉴】皮肤显示打开
|
2021-04-12 22:30:46 +08:00 |
JieLing
|
bfce2a542a
|
【资源】重名文件处理,meta文件提交
|
2021-04-12 22:06:58 +08:00 |
JieLing
|
097c8225a3
|
Merge branch 'china/local' into china/test
|
2021-04-12 21:31:25 +08:00 |
JieLing
|
e0f79aaccc
|
Merge branch 'china/dev' into china/local
|
2021-04-12 20:20:11 +08:00 |
gaoxin
|
bc323406e6
|
【buildconfig】国内删除本地化资源
|
2021-04-12 20:10:41 +08:00 |
ZhangBiao
|
4de980bf34
|
【十五日登陆】不改了
|
2021-04-12 20:02:56 +08:00 |
ZhangBiao
|
3d35e67c74
|
gameevent报错提交
|
2021-04-12 19:40:10 +08:00 |
ZhangBiao
|
bcfb68a40a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 19:29:14 +08:00 |
ZhangBiao
|
090b0c8f70
|
【十五日登录】提交
|
2021-04-12 19:29:05 +08:00 |
gaoxin
|
2a94f1127f
|
【寻宝】文字显示还原
|
2021-04-12 19:17:28 +08:00 |
gaoxin
|
93da11a3b7
|
【引导】关闭假战斗引导,修改sdk获取玩家信息的接口
|
2021-04-12 18:56:07 +08:00 |
zhangqiang
|
412616ff78
|
【屏蔽称号页签】
|
2021-04-12 18:29:17 +08:00 |
ZhangBiao
|
833510e93e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 18:20:21 +08:00 |
ZhangBiao
|
73b3a2e268
|
【十五日登录】活动刷新延迟容错
|
2021-04-12 18:20:08 +08:00 |
gaoxin
|
cdb9e35fd1
|
【config】修改serverversion = 0
|
2021-04-12 18:19:56 +08:00 |
gaoxin
|
c338637ddc
|
【引导战斗】新的内容
|
2021-04-12 18:11:37 +08:00 |
gaoxin
|
867bcc62db
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 18:10:43 +08:00 |
gaoxin
|
f56c620709
|
【假战斗】添加先后手配置
|
2021-04-12 18:10:39 +08:00 |
zhangqiang
|
e6ca3f625d
|
【魂印】唯一限制的魂印会检测大闹天宫招募神将
|
2021-04-12 17:57:37 +08:00 |
ZhangBiao
|
4770fbae89
|
|
2021-04-12 17:14:57 +08:00 |
ZhangBiao
|
e818791d38
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:07:59 +08:00 |
ZhangBiao
|
4ae91eda8e
|
【森罗幻境】修改数独小游戏的数字图片,将?居中
|
2021-04-12 17:07:27 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |