Commit Graph

2035 Commits (bd99b9c1ec26fce826ded72adf9498366ee6ed21)

Author SHA1 Message Date
ZhangBiao e98973ff5a 三界降魔 2020-09-24 20:47:16 +08:00
gaoxin dee65cf7e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
2020-09-24 20:26:20 +08:00
gaoxin 69563a13c7 每日一键购买礼包金额显示添加 2020-09-24 20:25:27 +08:00
jiaoyangna 2e21ef95ef Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 20:15:50 +08:00
jiaoyangna aa4e005be9 【青龙秘宝显示优化】修改进入青龙秘宝时自动滑动的位置 2020-09-24 20:15:25 +08:00
gaoxin e4c274d15c 每日一键购买礼包金额显示添加 2020-09-24 20:02:27 +08:00
gaoxin 142d8ccf0e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 19:16:43 +08:00
gaoxin 293a4baaa5 优化挂机时长特权显示,涉及表:PrivilegeTypeConfig 2020-09-24 19:16:38 +08:00
zhangqiang 31d460114b 测试 2020-09-24 18:34:31 +08:00
jiaoyangna 1252d11135 漏提 2020-09-24 18:10:10 +08:00
jiaoyangna d600c57b0f 【挂机宝箱优化】挂机宝箱上显示当前挂机时长,精确到分 2020-09-24 17:55:36 +08:00
jiaoyangna c9c943da32 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 17:53:53 +08:00
jiaoyangna bfc32b4541 百宝商会时间修改 2020-09-24 17:53:48 +08:00
ZhangBiao 442ac463c0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 17:45:26 +08:00
ZhangBiao 27568910c4 在线奖励 一键领取按钮 在线不刷新修复 2020-09-24 17:44:50 +08:00
gaoxin 02f50abafd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 17:26:34 +08:00
gaoxin bda6ace7c9 添加公告显示控制字段,获取公告接口添加一些参数用于区分提审,测试和正式服 2020-09-24 17:26:27 +08:00
zhangqiang 65e5b41dee 竞技场排序 车迟抢夺排序 试炼节点缩小 2020-09-24 17:15:57 +08:00
ZhangBiao 665a5483eb 三界降魔 2020-09-24 17:07:12 +08:00
gaoxin 3462835c8f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 16:29:55 +08:00
gaoxin 7958c3cf44 取消重复下单的判断,收不到支付回调时会导致该礼包无法再次购买,正式服已修复 2020-09-24 16:29:51 +08:00
gaoxin e0caaf8ade 开服狂欢登录奖励内容及按钮显示逻辑修改,涉及表格:TreasureTaskConfig 2020-09-24 16:26:33 +08:00
gaoxin ae25bcb07e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 15:33:58 +08:00
gaoxin 58158755e3 修复抽卡界面特效穿透的问题 2020-09-24 15:33:39 +08:00
jiaoyangna 43a49dee67 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 15:33:03 +08:00
jiaoyangna 11cb6221f5 时间修改 2020-09-24 15:32:44 +08:00
gaoxin 504b525001 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 14:49:02 +08:00
gongjiawei 80b18f847a 音频更新 2020-09-24 14:45:52 +08:00
zhangqiang fc2fd03f44 线上问题 : 工会宣言两处遮挡问题 2020-09-24 14:29:41 +08:00
jiaoyangna d2c7754349 【破阵诛仙】每日任务刷新,剩余时间小于1小时显示分钟 幸运探宝刷新时间显示 2020-09-24 14:09:32 +08:00
gaoxin d7aabf6a70 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 13:39:05 +08:00
gaoxin f677614c90 修复轩辕宝镜界面第第二次打开没有货币栏的问题 2020-09-24 13:38:59 +08:00
zhangqiang 1e9443b288 线上问题 : 提示挑战关卡升级被聊天遮挡 2020-09-24 12:53:39 +08:00
zhangqiang 7a77b968ad 线上问题 : 线上问题 招募英雄法宝数据有可能报错 2020-09-24 12:52:57 +08:00
gongjiawei 95769cad10 音频更新 2020-09-24 11:00:52 +08:00
gongjiawei 85ed1ccf3f 音频更新 2020-09-24 10:53:52 +08:00
jiaoyangna 34cc05a87d 青龙秘宝周任务修改, 2020-10-02 22:09:01 +08:00
jiaoyangna a26839253f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-02 18:42:27 +08:00
jiaoyangna 5c9fcf1c44 跳转限时兑换修改 2020-10-02 18:41:55 +08:00
ZhangBiao 551dcaa01d 三界降魔 2020-09-23 20:27:29 +08:00
gaoxin 97b80070ff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 17:07:00 +08:00
gaoxin f3df717172 优化邮件列表中邮件标题的显示 2020-09-23 16:58:56 +08:00
jiaoyangna 4389beca87 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 16:56:53 +08:00
jiaoyangna 2269c50897 【活动需求】百宝商会,免费礼包红点 2020-09-23 16:56:06 +08:00
zhangqiang 121901c06e 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-23 15:49:48 +08:00
ZhangBiao 05fee33df9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 15:05:29 +08:00
ZhangBiao 999ade9823 三界除魔 占个坑 2020-09-23 15:04:41 +08:00
ZhangBiao 772ae238ed Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-25 17:32:41 +08:00
ZhangBiao 7e099596d3 限时商市 其珍宝阁 多期机制增加 2020-09-25 16:42:25 +08:00
zhangqiang 5f8b1027ee 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-23 14:51:33 +08:00
jiaoyangna 543540cd26 【查看神将】切换查看的神将时,魂印图标显示不正确 2020-09-23 11:39:54 +08:00
jiaoyangna e3a34ea941 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 18:38:42 +08:00
jiaoyangna a9389ec427 免费礼包修改 2020-09-22 18:38:22 +08:00
gaoxin 29d509d54a 回滚LayoutWrap文件 2020-09-22 17:05:41 +08:00
gaoxin 35a4c61b42 修复魂印图鉴界面销毁后再次打开报错的问题 2020-09-22 16:59:23 +08:00
jiaoyangna 1651407fa4 漏提 2020-09-14 05:08:53 +08:00
jiaoyangna db469f314c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 05:01:30 +08:00
zhangqiang e7918aa3dc 排行榜适配 2020-09-22 14:51:27 +08:00
jiaoyangna 64a4ab7818 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 14:43:27 +08:00
jiaoyangna 9771ac2838 漏提 2020-09-22 14:43:22 +08:00
zhangqiang 078906049f 巅峰战适配 2020-09-22 13:59:11 +08:00
jiaoyangna e5f3cd8e23 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-22 11:58:54 +08:00
jiaoyangna 2e1515daa4 青龙秘宝入口修改 2020-09-22 11:58:49 +08:00
jiaoyangna 1d64b76c5a 【破阵诛仙】点金达人任务,跳转点金,不计数 2020-09-22 11:57:00 +08:00
zhangqiang 7f0d2d4926 线上问题: 大闹天宫节点例会重叠 2020-09-22 11:39:05 +08:00
zhangqiang fd5358120e 线上问题: 试炼节点显示立绘与招募得到的不一致 前端修改 2020-09-21 18:44:20 +08:00
zhangqiang fdd3398704 线上问题 : 一键编队上阵了归元后战力低的英雄 2020-09-21 18:03:44 +08:00
gaoxin 406426a6e0 修改tapdb设置服务器数据的调用位置 2020-09-21 12:11:26 +08:00
wangzhenxing d6f220623f 【ID1009487】
【圣物】ID10 战斗开始回血,没有表现
2020-09-21 10:07:30 +09:00
gongjiawei faa7671beb 音频更新 2020-09-18 14:00:29 +08:00
jiaoyangna cfd1f8d51b 添加动画 2020-09-18 13:43:52 +08:00
gongjiawei cfa0849704 音频更新 2020-09-18 11:49:36 +08:00
gongjiawei 96601c6f92 音频更新 2020-09-17 18:02:08 +08:00
gaoxin 2eeb4af779 修复切磋战斗结果只会显示失败的问题 2020-09-17 16:23:26 +08:00
gongjiawei 4e5c64264f 音频更新 2020-09-17 14:49:50 +08:00
zhangqiang d700e0da1c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-17 14:16:04 +08:00
ZhangBiao 4041b229cc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 12:22:19 +08:00
ZhangBiao e13026857d 限时兑换onhide function增加 2020-09-17 09:49:43 +08:00
zhangqiang cbdac88541 xuanyuan commit 2020-09-16 19:24:32 +08:00
zhangqiang b00d112660 xuanyaun commit 2020-09-16 18:54:48 +08:00
zhangqiang d423f61e4b 轩辕commit 2020-09-16 18:48:21 +08:00
zhangqiang 97b10ca124 打印 2020-09-16 18:36:41 +08:00
ZhangBiao e6b1832121 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 18:18:36 +08:00
ZhangBiao 6be45b4e89 幸运探宝增加动效 2020-09-16 18:18:07 +08:00
zhangqiang 99d05cb571 报错 编译c#代码提交 2020-09-16 18:08:40 +08:00
liujiaqi 04520e4a27 新宝物图标 2020-09-16 15:39:38 +08:00
wangxiaolong 293ac2b2f2 Merge branches 'master_develop' and 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 14:45:28 +08:00
wangxiaolong 209ba84534 添加冗余代码调用 + 修改私有方法名称 2020-09-16 14:45:10 +08:00
wangxiaolong 9dbfd0b9d7 重新生成Generate 2020-09-16 14:44:38 +08:00
wangxiaolong 46d5904af0 添加冗余代码 2020-09-16 14:43:52 +08:00
ZhangBiao 60a335684d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 14:09:41 +08:00
ZhangBiao 5cd8e621dc 限时活动,限时兑换、礼包抢购增加动效 2020-09-16 14:09:31 +08:00
jiaoyangna 568d7c8ee2 万象境入口修改 2020-09-16 11:26:06 +08:00
ZhangBiao 60172f3089 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 10:52:16 +08:00
ZhangBiao 13fff17277 在线奖励一键领取 2020-09-16 10:52:09 +08:00
zhangqiang 7332783723 音效修改 2020-09-16 10:26:34 +08:00
zhangqiang e5c91eff67 音效 2020-09-16 10:14:43 +08:00
jiaoyangna b202a02455 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-18 18:34:14 +08:00
jiaoyangna 35c5de3561 适配修改提交 2020-09-18 18:34:02 +08:00
jiaoyangna 52d4ff90c5 修改标题 2020-09-18 18:17:35 +08:00
altair 835a72257c 修改错误活动图片 2020-09-15 18:30:51 +08:00
zhangqiang eab93ec002 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 18:16:09 +08:00
zhangqiang 6f107f78fa 音效 2020-09-15 18:16:01 +08:00
gongjiawei d73435e7dc 音频更新 2020-09-15 18:13:09 +08:00
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