Commit Graph

853 Commits (29b60d30c44a19ec33e5a29760476dba19c6e5c6)
 

Author SHA1 Message Date
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
gaoxin b0503f795c 修复技能名称音效没有声音的问题 2020-07-26 11:13:25 +08:00
altair 650c7ffe32 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 23:08:04 +08:00
altair 7692325864 修改图标 2020-07-25 23:07:54 +08:00
jiaoyangna 976431f744 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 22:59:02 +08:00
jiaoyangna 48c209b4aa formation commit 2020-07-25 22:58:55 +08:00
altair 506794d4cd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 22:50:36 +08:00
altair ddd0aff41c 修改图片配置 2020-07-25 22:50:29 +08:00
zhangqiang 7f9c4f6862 提交 2020-09-13 22:25:50 +08:00
jiaoyangna b1bf2876cb 10 star update 2020-07-25 21:57:46 +08:00
jiaoyangna 1802487345 itemview update 2020-07-25 20:56:23 +08:00
altair e98d50c3db 增加图片文件 2020-07-25 20:51:23 +08:00
altair 51c5aa453a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:47:28 +08:00
altair 039e831582 修改图标 2020-07-25 20:47:20 +08:00
gaoxin 1ce7c0db2f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:42:20 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +08:00
altair 82927d38c0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:39:36 +08:00
altair 9f5b75213e 修改特效配置 2020-07-25 20:39:20 +08:00
gaoxin a8abedf426 本地服务器列表请求打印添加 2020-07-25 20:37:06 +08:00
jiaoyangna 24f9860235 close supreme 2020-07-25 20:35:32 +08:00
jiaoyangna f4dc657551 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 20:28:46 +08:00
zhangqiang bedfcdb4f6 车迟怪物显示 2020-09-13 21:56:49 +08:00