Commit Graph

1347 Commits (9745834de46a793fca9ed406d80ece15b89649b9)

Author SHA1 Message Date
jiaoyangna 9745834de4 添加动画 2020-09-14 18:31:21 +08:00
jiaoyangna 93dbd1648a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 15:31:54 +08:00
jiaoyangna 9846aebcf2 图鉴2460适配修改,【十绝阵】开启后没有显示主城入口,十绝阵活动结束后吗,入口显示0000不关闭,【青龙秘宝】活动描述和背景重叠 2020-09-14 15:31:33 +08:00
zhangqiang fafbaa3617 音效 2020-09-14 15:11:07 +08:00
zhangqiang 1933a9b7ae Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 14:50:25 +08:00
zhangqiang c985f4d874 跳转公会 2020-09-14 14:50:18 +08:00
ZhangBiao 2d9643c127 点击万象境后 点击切换账号卡死问题修复 2020-09-14 14:39:24 +08:00
ZhangBiao e4ca9c100c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 14:24:01 +08:00
ZhangBiao 3594501654 大闹天宫 重置时把玩家踢出天宫密保 、天宫秘宝刷新bug修复, 2020-09-14 14:23:47 +08:00
zhangqiang b3898fe07a 音效修改 加 公会副本接不可扫荡推送 2020-09-14 13:54:45 +08:00
gaoxin cbb0a8462c 修改透传参数consumerId 为 角色id#商品id 修复sdk支付基金不刷新的问题, 2020-09-14 11:28:54 +08:00
gaoxin 62635bf604 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-12 19:24:53 +08:00
gaoxin ab9e397ee2 添加用于定位商品充值成功后无法刷新界面问题的log 2020-09-12 19:24:49 +08:00
jiaoyangna 48f4fb5913 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-12 15:31:40 +08:00
jiaoyangna 6a47476673 公会副本 添加动画 2020-09-12 15:24:20 +08:00
gaoxin 2d44877d6f 尝试修复战斗中重连偶现关卡数据丢失的问题 2020-09-11 21:09:14 +08:00
wangzhenxing 28655e9732 秒杀效果修改 2020-09-11 18:57:51 +09:00
wangzhenxing e80d4c7e6a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 18:07:27 +09:00
wangxiaolong 843762b810 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 18:02:27 +08:00
wangxiaolong d21481514c 添加网络层log输出 2020-09-11 18:02:11 +08:00
wangzhenxing 70697ee6df 好友切磋回合结束按照总伤害值和治疗值判断输赢 2020-09-11 18:00:53 +09:00
wangzhenxing 3b83d4224e boss免疫斩杀技能或生命百分比技能 2020-09-11 17:44:39 +09:00
ZhangBiao 1707762433 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
2020-09-11 12:03:42 +08:00
ZhangBiao 846724a9a0 开服福利层级修改 2020-09-11 12:02:23 +08:00
jiaoyangna b0280552a1 chichafengyun icon 提交,开服福利添加动画 2020-09-11 11:47:55 +08:00
jiaoyangna c25de2c1aa 森罗幻境动画删除 2020-09-11 11:09:58 +08:00
jiaoyangna acb66b113d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 10:21:15 +08:00
jiaoyangna dc7fe39497 活动记录值修改 2020-09-11 10:21:01 +08:00
gaoxin c3fc01d249 回滚网络连接修改,废物操作 2020-09-10 19:35:58 +08:00
jiaoyangna 8b8e390a8a 邮件添加动画 2020-09-10 18:40:22 +08:00
ZhangBiao c1ce67f7c3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 18:25:46 +08:00
ZhangBiao 156e81ab7b 天宫秘宝到时间踢出去 2020-09-10 18:25:39 +08:00
gaoxin 41aa573c68 再次尝试修复同时连接两个socket的问题 2020-09-10 18:09:30 +08:00
zhangqiang 52c6a96dbb 天赋提示语 2020-09-10 17:41:25 +08:00
zhangqiang 1b3c626708 加音效 2020-09-10 17:08:09 +08:00
ZhangBiao dd4c91a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 16:53:23 +08:00
ZhangBiao ca65ebbe49 限时兑换添加到叱咤风云中 2020-09-10 16:53:06 +08:00
jiaoyangna 442daa6312 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 20:23:42 +08:00
jiaoyangna c2f7b1e7ce 破阵诛仙提交 2020-09-10 20:23:35 +08:00
jiaoyangna 3d99e2a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 18:08:26 +08:00
jiaoyangna 89f937e9ac 破阵诛仙提交 2020-09-10 18:08:21 +08:00
zhangqiang c27c237fac 音效 2020-09-10 16:30:52 +08:00
jiaoyangna fa33af7eea 限时提交 2020-09-10 16:18:54 +08:00
zhangqiang 5e92ce5f73 部分音效加入 2020-09-10 15:54:06 +08:00
jiaoyangna 6eed7b719d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 15:37:34 +08:00
jiaoyangna f2015e8c98 日常任务修改 2020-09-10 15:36:17 +08:00
jiaoyangna 2998453d49 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 15:28:24 +08:00
jiaoyangna e492dc6813 破阵诛仙提交 2020-09-10 15:28:19 +08:00
jiaoyangna 24365446a2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 14:44:56 +08:00
jiaoyangna a06e4abf56 乾坤宝盒修改提交 2020-09-10 14:44:51 +08:00