Commit Graph

847 Commits (9d5280d025ed030ed5b9423bbdbdbe9cd7a9877a)
 

Author SHA1 Message Date
gongjiawei 8640cc4327 音频更新 2020-07-17 16:13:57 +08:00
JieLing c46047fe2c Merge branch 'master_develop' into master_test
# Conflicts:
#	data_execl/base_data/GuideConfig.xlsx
2020-07-17 16:13:04 +08:00
ZhangBiao ea564d7a7d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 16:06:01 +08:00
ZhangBiao 2db96229ca 战斗跳过按钮大小调整 2020-07-17 16:05:39 +08:00
shihongyi ca8db6ccce Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 15:58:10 +08:00
shihongyi 44fde17a80 VIPbug 2020-07-17 15:56:27 +08:00
gaoxin 4e67a3f0bc 修复挂机界面黑边为题 2020-07-17 15:55:20 +08:00
gaoxin 62c282f6e0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 15:55:00 +08:00
gongjiawei 61bee0b20b 音频更新 2020-07-17 15:49:57 +08:00
szxhzz 95e9f57db5 音频更新 2020-07-17 15:41:04 +08:00
zhangqiang 264f0b7323 bug 2020-07-17 15:14:15 +08:00
gaoxin 720c82aa0b 删除开场视频 2020-07-17 14:53:22 +08:00
gongjiawei 7e72d741c9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:48:27 +08:00
gongjiawei 765e2350ab 音频更新 2020-07-17 14:47:10 +08:00
liujiaqi 70c580bb57 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:46:17 +08:00
liujiaqi b354c2b214 共工敌方大小,4星英雄技能 2020-07-17 14:46:01 +08:00
ZhangBiao 064ad3b8b7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:40:43 +08:00
ZhangBiao b20e5e2f54 十绝阵伤害显示调整 2020-07-17 14:40:33 +08:00
jiaoyangna e63fb9e0cf 修改文字 2020-07-17 14:35:38 +08:00
jiaoyangna 068980325a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 14:15:56 +08:00
jiaoyangna 7faa067c52 宝物分解提交 2020-07-17 14:15:42 +08:00
ZhangBiao cb745e26c9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 13:58:45 +08:00
ZhangBiao 058d079190 18岁 2020-07-17 13:58:22 +08:00
zhangqiang 98670958a0 首冲拍脸 寻宝红点条件 2020-07-17 13:56:30 +08:00
ZhangBiao 63b8b36a37 剔除logo等信息 2020-07-17 13:38:02 +08:00
kansa e6bbfa659f 修改怪物属性,修改森罗幻境系统刷新时间 2020-07-17 12:13:57 +08:00
JieLing 00422c4be7 修复战斗报错 2020-07-17 11:51:36 +08:00
gaoxin 76d00dce34 支付接口调试 2020-07-17 11:39:24 +08:00
jiaoyangna d1fd538542 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-17 11:38:26 +08:00
jiaoyangna 96c16ca7f8 去掉log 2020-07-17 11:38:18 +08:00
zhangqiang 25896729ff 商店去掉刷新红点 2020-07-17 11:32:20 +08:00
zhangqiang ebca764861 首冲 2020-07-17 11:27:03 +08:00
szxhzz e95d071139 音频更新 2020-07-17 11:25:09 +08:00
jiaoyangna adc5895d94 首充十级英雄属性天赋错误修改提交 2020-07-17 11:16:44 +08:00
jiaoyangna 3ae13a9762 首充英雄十级属性天赋修改提交 2020-07-17 11:14:07 +08:00
zhangqiang 897b14aa65 巅峰战提交 2020-07-17 10:28:02 +08:00
ZhangBiao 817d80e77e 每日签到点击按钮出现时间调整 2020-07-17 10:09:25 +08:00
JieLing 8d29ad39e1 包名修改 2020-07-17 09:34:52 +08:00
JieLing c4bceb2276 内网热更0.15.30 2020-07-17 09:22:11 +08:00
ZhangBiao 3f1c10f668 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 20:55:52 +08:00
ZhangBiao bfe29c5601 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
2020-07-16 20:55:34 +08:00
szxhzz 531a21608b 音频更新 2020-07-16 20:53:40 +08:00
ZhangBiao 3231f857af 工会祭祀援助红点、十绝阵排行修改 2020-07-16 20:53:17 +08:00
gaoxin 542c76916d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-16 20:43:23 +08:00
gaoxin 3152ff0f41 修复部分技能报错的问题 2020-07-16 20:43:11 +08:00
jiaoyangna 3ae65767d0 幸运探宝, 2020-07-16 20:36:54 +08:00
jiaoyangna 1838823c37 幸运探宝提交 2020-07-16 20:24:28 +08:00
gaoxin d8b88221da 修复中心全屏特效显示错误的问题 2020-07-16 20:23:11 +08:00
liujiaqi 67f4f4d5ee 东海寻仙关闭限时招募假战斗 2020-07-16 20:20:38 +08:00
gaoxin bc43f00abc 资源名重复刷新 2020-07-16 20:14:19 +08:00