Commit Graph

794 Commits (c972487af48537f3ed2f1a93df90399d631a7fb9)
 

Author SHA1 Message Date
JieLing c972487af4 Merge branch 'master_develop' into master_local_test 2020-07-26 17:29:09 +08:00
gaoxin 6bfa7d318b 注释代码 2020-07-26 17:28:44 +08:00
JieLing 113eb75be9 Merge branch 'master_develop' into master_local_test 2020-07-26 16:45:20 +08:00
gaoxin eff6ee6d08 临时关闭星级成长礼显示 2020-07-26 16:44:31 +08:00
JieLing 0479331b05 Merge branch 'master_develop' into master_local_test 2020-07-26 16:36:14 +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
JieLing 9612abd004 修复森罗幻境入口白片问题 2020-07-26 16:17:50 +08:00
JieLing 2e1c0b0b81 修复tapDB初始化参数错误的问题 2020-07-26 15:55:21 +08:00
JieLing 817f6e7191 Merge branch 'master_develop' into master_local_test 2020-07-26 12:18:16 +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
JieLing 7c3e970964 内网测试0.16.9 2020-07-25 21:14:11 +08:00
JieLing 83525682c6 Merge branch 'master_develop' into master_local_test 2020-07-25 21:13:03 +08:00
JieLing daa7b0c6b3 Merge branch 'master_develop' into master_local_test 2020-07-25 20:57:10 +08:00
jiaoyangna 1802487345 itemview update 2020-07-25 20:56:23 +08:00
JieLing a7876bca19 Merge branch 'master_develop' into master_local_test 2020-07-25 20:54:59 +08:00
altair e98d50c3db 增加图片文件 2020-07-25 20:51:23 +08:00
JieLing e28776c4bd Merge branch 'master_develop' into master_local_test 2020-07-25 20:48:03 +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
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
JieLing be92f23b18 Merge branch 'master_develop' into master_local_test 2020-07-25 20:14:52 +08:00
JieLing 3294e4b977 Merge branch 'master_develop' into master_local_test 2020-07-25 20:14:24 +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
JieLing e1afd2e60a 内网测试 0.16.8 2020-07-25 19:49:16 +08:00
altair 3b26247c5d 修改图鉴图片 2020-07-25 19:47:49 +08:00
altair 2a356f4695 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-25 19:44:36 +08:00
altair 8afcc5fdf4 修改图鉴图片 2020-07-25 19:43:31 +08:00