Commit Graph

1876 Commits (35a4c61b42a4741d9946b970ea93d787f876ffa1)

Author SHA1 Message Date
gaoxin a0d4042475 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 18:07:43 +08:00
gaoxin c03a03481b 修复接口报错导致卡死的问题 2020-09-15 18:07:25 +08:00
zhangqiang 39777d0361 音效 2020-09-15 17:53:43 +08:00
jiaoyangna 3d5ebd7f61 送神祠修改提交 2020-09-15 17:42:32 +08:00
zhangqiang 48cae7ec43 二次弹窗关闭音效 2020-09-15 16:52:12 +08:00
gongjiawei 838eac24ba 音频更新 2020-09-15 15:57:25 +08:00
zhangqiang ff7c4311b4 竞技场结算界面修改代码 2020-09-15 15:22:00 +08:00
gongjiawei 902d1bb2ec 音频更新 2020-09-15 15:15:33 +08:00
liujiaqi 95e270382d 链接符图标 2020-09-15 15:09:42 +08:00
gongjiawei a522e43572 音频更新 2020-09-15 15:02:00 +08:00
ZhangBiao 8fab058727 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 14:55:46 +08:00
ZhangBiao a217f483d2 成长基金"已达成"按钮消失 问题修改 2020-09-15 14:55:40 +08:00
ZhangBiao de0498cba8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 11:50:54 +08:00
ZhangBiao 7adae7f006 森罗召唤boss后使用炸弹报错问题修复 2020-09-17 11:50:44 +08:00
jiaoyangna 16fb68cd6b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 14:47:34 +08:00
jiaoyangna aacf1d029d 【十绝阵】敌人编队卡牌应使用无血条版本的边框 2020-09-15 14:47:15 +08:00
jiaoyangna f0f744602e 【累计充值】达成页签没红点 2020-09-15 11:21:55 +08:00
jiaoyangna 050df9638f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 10:28:39 +08:00
jiaoyangna 4d2c5e15ba 【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框 2020-09-15 10:28:34 +08:00
ZhangBiao af96f69236 设置界面增加动效 2020-09-15 10:28:11 +08:00
gongjiawei fc5ed55959 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:37:33 +08:00
gongjiawei 5d7663cd16 音频更新 2020-09-14 18:37:19 +08:00
jiaoyangna ff3c5f147e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:31:33 +08:00
jiaoyangna 9745834de4 添加动画 2020-09-14 18:31:21 +08:00
gongjiawei 9858c4143d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:29:35 +08:00
ZhangBiao e7bc8b0aff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 00:09:17 +08:00
ZhangBiao 44f6f55d19 月卡增加动效 2020-09-17 00:09:06 +08:00
ZhangBiao 72601bff4f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 23:30:29 +08:00
ZhangBiao 6aebe6f49e 周月卡 点将台动效添加 2020-09-16 23:30:21 +08:00
gongjiawei 8f01fe40eb 音频更新 2020-09-14 18:29:22 +08:00
zhangqiang 444fac23e8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:19:34 +08:00
zhangqiang 29ee4bf51e 注释公会副本刷新 修改音效 2020-09-14 18:19:26 +08:00
wangzhenxing 72536420dc 竞技场类型胜利条件修改 2020-09-14 16:46:56 +09: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 4489d67d8e 积天豪礼修改显示数字 2020-09-14 15:29:04 +08:00
zhangqiang fafbaa3617 音效 2020-09-14 15:11:07 +08:00
wangzhenxing a85d909545 137 138被动效果修改 2020-09-14 16:03:54 +09: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
jiaoyangna 5f5f6cb50a 【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失 2020-09-14 05:01:10 +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
jiaoyangna 728042f1f9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 17:50:53 +08:00
jiaoyangna 68b1628c8c 破阵诛仙 2020-09-11 17:48:55 +08: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
gongjiawei 8f20874508 音频更新 2020-09-11 16:15:28 +08: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 8454ba4015 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 11:10:02 +08:00
jiaoyangna c25de2c1aa 森罗幻境动画删除 2020-09-11 11:09:58 +08:00
ZhangBiao ca7f382b7f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 11:04:12 +08:00
ZhangBiao 70c535e1d8 限时兑换 奖励错误修改 2020-09-11 11:04:04 +08:00
gaoxin 1a3970c1dc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 10:44:26 +08:00
gaoxin 7a62bd904a 修复资源路径导致ab包循环引用无法加载游戏的问题 2020-09-11 10:44:08 +08:00
wangxiaolong eceda23f4f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 10:23:15 +08:00
wangxiaolong f8527290ab 添加判空处理 2020-09-11 10:23:05 +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 52b7a2665e 通用资源位置移动 2020-09-10 21:30:48 +08:00
gaoxin 17f241564f ios添加获取底部高度的接口 2020-09-10 20:20:19 +08:00
gaoxin 857e255001 特效资源位置移动 2020-09-10 20:16:54 +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 85a8d95d19 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 17:41:33 +08:00
zhangqiang 52c6a96dbb 天赋提示语 2020-09-10 17:41:25 +08:00
gaoxin 50a78b54ca 1080 * 1920 分辨率不再对背景进行放大处理 2020-09-10 17:27:33 +08:00
gaoxin 521e317377 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 17:26:58 +08:00
gaoxin f532b9bfcd 修复热更界面进度数字显示错误的问题 2020-09-10 17:26:51 +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