Commit Graph

824 Commits (0615469bb71896e109749e7a1a68c81ae64337c3)
 

Author SHA1 Message Date
gaoxin 0615469bb7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:45:50 +08:00
gaoxin c25fc7e39d bulletTime字段权限修改 2020-07-27 19:45:37 +08:00
ZhangBiao 6cff95eca9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:42:46 +08:00
ZhangBiao 66d7cc5ccc 2020-07-27 19:42:20 +08:00
shihongyi 854c359043 献祭、归元、吃掉返还调整 2020-07-27 18:23:37 +08:00
szxhzz 8d6448a2bd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:17:54 +08:00
zhangqiang 424d26200b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 01:24:39 +08:00
zhangqiang 5a32cb4eb6 xie yi change 2020-07-29 01:24:21 +08:00
szxhzz c02ccf8545 通用点击音效更新 2020-07-27 18:16:58 +08:00
altair 3f490c64b9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:13:06 +08:00
altair 5d08c6832a 修改受击特效 2020-07-27 18:09:38 +08:00
jiaoyangna 0520ccb297 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 18:01:16 +08:00
jiaoyangna 40345b0ab7 十连抽提交 2020-07-27 18:00:45 +08:00
zhangqiang cf1bd66f22 预设微调 2020-07-29 00:50:13 +08:00
JieLing 64ff767121 Merge branch '接入SDK' into master_develop 2020-07-27 17:53:54 +08:00
JieLing 437d241532 猕猴桃sdk文件替换 2020-07-27 17:49:07 +08:00
JieLing 67914ba7dd 引导打点数据类型修改 2020-07-27 17:48:33 +08:00
ZhangBiao cbd607b479 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 17:22:23 +08:00
zhangqiang ac67088a90 背包合成不弹英雄展示 2020-07-29 00:11:36 +08:00
ZhangBiao 61aadd2cb8 跳过按钮lock大小调整 2020-07-27 17:21:16 +08:00
shihongyi 178b3054b7 道具商城 2020-07-27 17:00:52 +08:00
jiaoyangna 9abf33d1db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 16:49:24 +08:00
zhangqiang 36e18b7519 背包碎片排序 限时兑换调整预设 2020-07-28 23:40:36 +08:00
jiaoyangna 1b9f8478cc role gps star update 2020-07-27 16:49:13 +08:00
JieLing a003779452 Merge branch '接入SDK' of http://60.1.1.230/gaoxin/JL_Client into 接入SDK 2020-07-27 16:41:44 +08:00
JieLing f5d0cc001c 添加打点数据类型 2020-07-27 16:41:38 +08:00
liujiaqi 807d6745ac 描述调整 2020-07-27 16:17:02 +08:00
gaoxin d416d48d46 Merge branch '接入SDK' of http://60.1.1.230/gaoxin/JL_Client into 接入SDK 2020-07-27 16:07:34 +08:00
skuld 974f5a1fd5 添加活动开启时间和描述 2020-07-27 15:54:02 +08:00
JieLing 9465fbd6e4 删除bug初始化的位置 2020-07-27 15:31:11 +08:00
gaoxin ea7ee1141b 修复跳转充值界面后黑屏卡死的问题 2020-07-27 15:25:42 +08:00
gaoxin d1aa82709b 添加一些文档 2020-07-27 15:24:59 +08:00
gaoxin 48715b151a sdk修改 2020-07-27 14:42:25 +08:00
wangzhenxing 19a069994b 修改杨戬锤不死金翅大鹏一直锤的bug 2020-07-27 15:19:17 +09:00
gongjiawei 327cda1f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 14:21:24 +08:00
gongjiawei ffccc6d77a 音频更新 2020-07-27 14:20:50 +08:00
jiaoyangna e71f82795a 编队界面修改提交 2020-07-27 14:13:31 +08:00
altair 29afe73273 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 11:22:17 +08:00
altair 57c748b960 修改挂机文字 2020-07-27 11:22:09 +08:00
ZhangBiao a53b1edd7d 元素共鸣 “已激活”字样删除 2020-07-27 11:00:08 +08:00
ZhangBiao 37e4593381 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 10:00:29 +08:00
ZhangBiao e3eb566008 乾坤宝盒奖励概率错误修改 2020-07-27 09:59:50 +08:00
kansa 2fa696094a 修改竞技场引导战斗用机器人 2020-07-27 09:59:28 +08:00
gaoxin 1af2ee96f4 修复打点静态数据保存不完全的问题 2020-07-26 18:37:31 +08:00
gaoxin 6bfa7d318b 注释代码 2020-07-26 17:28:44 +08:00
gaoxin eff6ee6d08 临时关闭星级成长礼显示 2020-07-26 16:44:31 +08:00
JieLing 0670160fd3 修复森罗幻境入口白片问题 2020-07-26 16:35:38 +08:00
JieLing cabc456d73 修复tapDB初始化参数错误的问题 2020-07-26 16:35:31 +08:00
gaoxin 3cd56b6ccc 修复森罗幻境底部人物星级显示错误的问题 2020-07-26 16:33:27 +08:00
gaoxin b323148076 尝试修改app安装事件在创建角色事件之后触发的问题 2020-07-26 11:14:29 +08:00