Commit Graph

529 Commits (18c6ad6555ebcb8898286ee3adf23673adca648d)

Author SHA1 Message Date
jiaoyangna 18c6ad6555 carbon prefab commit 2020-07-27 20:08:23 +08:00
jiaoyangna e1ebc7c169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-27 19:48:16 +08:00
jiaoyangna 54b3aad5e9 【副本优化】副本入口处增加文字提示 2020-07-27 19:48:05 +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
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 5a32cb4eb6 xie yi change 2020-07-29 01:24:21 +08:00
szxhzz c02ccf8545 通用点击音效更新 2020-07-27 18:16:58 +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 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
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
gaoxin ea7ee1141b 修复跳转充值界面后黑屏卡死的问题 2020-07-27 15:25:42 +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
ZhangBiao a53b1edd7d 元素共鸣 “已激活”字样删除 2020-07-27 11:00:08 +08:00
ZhangBiao e3eb566008 乾坤宝盒奖励概率错误修改 2020-07-27 09:59:50 +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
jiaoyangna 48c209b4aa formation commit 2020-07-25 22:58:55 +08:00
jiaoyangna b1bf2876cb 10 star update 2020-07-25 21:57:46 +08:00
zhangqiang 7f9c4f6862 提交 2020-09-13 22:25:50 +08:00
jiaoyangna 1802487345 itemview update 2020-07-25 20:56:23 +08:00
altair e98d50c3db 增加图片文件 2020-07-25 20:51:23 +08:00
gaoxin b0002cf781 语言文字替换 2020-07-25 20:42:11 +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
skuld fcc1424cd5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 22:37:33 +08:00
skuld 7731aa45b8 修改猎妖之路为大闹天宫 2020-07-28 22:36:17 +08:00
jiaoyangna 46f091f09c 头像框修改提交 2020-07-25 20:28:41 +08:00
jiaoyangna 0ec835f540 获取头像框通用方法修改 2020-07-25 20:04:02 +08:00
jiaoyangna 48ff5b8b28 头像框通用方法修改 2020-07-25 20:02:24 +08:00
jiaoyangna d8fa2b9459 头像背景修改 2020-07-25 19:59:43 +08:00