Commit Graph

1896 Commits (a20217223a9d95105d6118a57bf49d577be820df)

Author SHA1 Message Date
zhangqiang c939bab156 提交 2020-10-13 19:14:34 +08:00
ZhangBiao 2e57796328 礼包拍脸时机修复
(cherry picked from commit 3a74abd86633bba9e837e660b94eb56aa49db8bf)
2020-10-13 19:12:24 +08:00
ZhangBiao e063c2c23d 推送礼包。。。。 2020-10-13 18:39:55 +08:00
ZhangBiao b359ae2df9 推送礼包 完事儿 2020-10-13 17:21:27 +08:00
jiaoyangna 89c7961154 推送礼包修改 2020-10-22 03:24:22 +08:00
jiaoyangna 598eac1d3a 推送礼包修改 2020-10-22 02:57:40 +08:00
zhangqiang f28501a893 提交 2020-10-13 16:32:50 +08:00
zhangqiang bf2804f080 提交 2020-10-13 13:56:41 +08:00
ZhangBiao 45c9c20dd6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 13:52:41 +08:00
ZhangBiao 63a1588f66 关卡 和 心魔的推送礼包 后端还未剔除已购礼包信息,前端文字未修改 2020-10-13 13:51:11 +08:00
gaoxin 91173e3f91 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 12:44:20 +08:00
jiaoyangna 9a980bf88b 主题活动修改 2020-10-21 23:20:41 +08:00
gaoxin a107de4ebe 删除新增的打点事件 2020-10-13 12:44:15 +08:00
zhangqiang 49d2f4e347 添加界面 和表 2020-10-13 11:47:35 +08:00
gaoxin c3e94843c6 打点事件新增 2020-10-13 11:35:32 +08:00
gaoxin 557216c617 参数分割符修改 2020-10-13 10:02:14 +08:00
gaoxin c862bc6623 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-13 09:59:59 +08:00
JieLing 5db40d2743 监听事件未移除正确 2020-10-12 20:48:15 +08:00
jiaoyangna 1defb2559f 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 17:12:34 +08:00
gaoxin 8978b6c906 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-12 17:10:39 +08:00
gaoxin e4ceea35af ios包名修改 2020-10-12 17:10:28 +08:00
jiaoyangna 3bb6821083 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:57:22 +08:00
jiaoyangna 7bd92923da 【主题活动】打开主题活动界面,没有自动选择有红点的页签,显示第一个页签的界面,页签不显示选中状态 2020-10-12 16:57:15 +08:00
wangzhenxing 965906baf2 修改bug:【ID1010120】
【魂印】5000054 描述传递的伤害是直接伤害,击杀没有触发追击
2020-10-12 16:36:59 +09:00
ZhangBiao 252fec5bbd 回春散手动使用次数不刷新修复 2020-10-12 16:10:04 +08:00
zhangqiang bf37ff8cea 打点修改 dev 分支漏提 2020-10-12 16:00:12 +08:00
zhangqiang f16636b76a 线上问题 宝器分解bug 2020-10-12 15:54:05 +08:00
ZhangBiao f087c0258b 2020-10-12 15:39:23 +08:00
zhangqiang 01d537118b 线上问题 bug 规避修改位置 2020-10-12 15:18:16 +08:00
gaoxin faa065f7b1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-12 15:16:14 +08:00
gaoxin 3ea925661b 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 15:15:46 +08:00
ZhangBiao 62f185c859 森罗回春散使用bug修改 2020-10-12 15:13:37 +08:00
ZhangBiao 69fee1514f 森罗回春散使用 问题修复 2020-10-12 14:43:44 +08:00
gaoxin 2f4bc32d63 修复背包会出现宝器的错误数据的导致背包界面卡死的问题,这里临时处理让玩家进去,需要后端处理错误数据。 2020-10-12 14:34:38 +08:00
zhangqiang 2c9d7c7224 线上活动 森罗幻境 引发问题 限时抢购 报错 itemview 报空 5 4 是在别处提交的 限时活动报错 2020-10-12 14:02:17 +08:00
wangzhenxing e50b03ea89 修改bug:【ID1010307】
【技能】红孩儿6星天赋,追加普攻必定暴击无效
2020-10-12 13:56:58 +09:00
zhangqiang 99636ac662 线上问题 vip 战力计算打开 只是表的 pvp 评分配成0 2020-10-12 13:53:59 +08:00
zhangqiang 756db024dc 修复三界降魔头像框点击无反应
(cherry picked from commit 42f0f9b5fe)
2020-10-12 12:13:03 +08:00
gaoxin 285a41ae05 修改bug 限时活动itemView报错 2020-10-12 11:28:20 +08:00
jiaoyangna 1184cd3f76 【跳转】碧海卷使用按钮跳转位置不正确 2020-10-12 11:01:17 +08:00
jiaoyangna 25d4148059 【丹心碧血】限时兑换活动界面黑屏 2020-10-12 11:00:31 +08:00
jiaoyangna 864535ca9b Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
2020-10-11 11:11:49 +08:00
yuanshuai 8487c445a3 逍遥游资源预设脚本提交 2020-10-15 10:53:00 +08:00
jiaoyangna db5dbbf700 boss 提交 2020-10-11 11:10:07 +08:00
jiaoyangna b3fac6731e boss ,转盘协议修改提交 2020-10-11 09:45:18 +08:00
jiaoyangna 5bf0f64989 boss 和 转盘数据 提交 2020-10-11 09:40:22 +08:00
zhangqiang cfb6870a31 线上活动 森罗幻境达人前端修改 倒计时结束 升级好礼报错修改 3 2020-10-10 19:37:50 +08:00
jiaoyangna ba75aab424 仙缘事件界面提交 2020-10-10 19:18:27 +08:00
yuanshuai 57c7fd0890 逍遥游脚本资源预设提交 2020-10-14 16:57:35 +08:00
yuanshuai e441f50992 Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-14 15:13:36 +08:00
yuanshuai 4fb85f49e1 协议提交 2020-10-14 15:09:43 +08:00
yuanshuai 5925ca9e14 协议提交 2020-10-13 16:19:33 +08:00
jiaoyangna 2e0acab378 主题活动修改 提交 2020-10-10 18:00:16 +08:00
wangzhenxing 81c39c7422 回合数变化以后,添加延时操作,用于一些监听回合变化消息的被动首先执行 2020-10-14 16:44:04 +09:00
wangzhenxing 87be1121e1 治疗数值修改受暴击系数和伤害加成影响 2020-10-10 18:54:31 +09:00
zhangqiang 07a0f73f31 车迟斗法 抢夺积分选择目标时,最下方应该显示当前玩家名称,而非当前公会名称 2020-10-10 18:33:05 +08:00
zhangqiang af6186a43d 线上活动 森罗幻境达人前端修改2 2020-10-10 18:32:18 +08:00
wangzhenxing 22e9ad1100 添加 245-256 被动技能 将一些根据击杀人头数触发的被动改为技能期间只触发一次 2020-10-10 17:01:20 +09:00
zhangqiang d341a16601 线上问题 神将10星后,进阶页签显示红点 2020-10-10 15:13:48 +08:00
jiaoyangna a2cd90016f Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-10 15:07:52 +08:00
zhangqiang d07a74e490 线上问题 公会排行 首个没有显示公会名称 2020-10-10 14:52:31 +08:00
zhangqiang d2f9ffd2db 线上活动 森罗幻境达人前端显示 2020-10-10 14:51:50 +08:00
jiaoyangna 85dbe2d053 主题活动修改 2020-10-10 14:37:04 +08:00
jiaoyangna 398e7f070b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-16 12:00:21 +08:00
jiaoyangna 19aee3b717 轩辕宝镜黑屏问题解决 2020-10-16 12:00:09 +08:00
ZhangBiao 0ea4b713cb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-10 14:23:53 +08:00
ZhangBiao 314dee578a 大闹天宫节点商店名称与内容不符修复 2020-10-10 14:23:34 +08:00
zhangqiang c2677fe193 限时升级活动打开后 退出一段时间再返回报错 2020-10-10 14:13:30 +08:00
jiaoyangna 2021b40a70 【丹心碧血】限时召唤,up卡显示不正确 2020-10-10 13:38:49 +08:00
ZhangBiao b95d3c2f7d 社稷大典增加点击跳转到珍奇宝阁 2020-10-10 13:35:39 +08:00
ZhangBiao a40150c3cd 通用排名奖励界面创建 2020-10-10 11:54:13 +08:00
gaoxin 1b107fa5be 如果宝物被分解了,重复穿戴检测会报错 2020-10-10 10:34:56 +08:00
gaoxin 51c02c929c 再次修复登录时区服显示错误的问题 2020-10-10 09:55:15 +08:00
gaoxin 38b6d5f239 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-09 21:44:19 +08:00
gaoxin f965c26194 添加重复穿戴的宝器的处理,重复穿戴的自动卸下,并自动穿戴在战斗力最大的人身上 2020-10-09 21:44:14 +08:00
ZhangBiao 46edb1a00c 中心部分点击领取奖励 2020-10-09 19:38:15 +08:00
ZhangBiao c55aad07df 捐献长按逻辑处理 2020-10-09 18:59:37 +08:00
ZhangBiao 533dc2a8fd 修改了图片下方显示,下一步增加长按 2020-10-09 17:11:02 +08:00
gaoxin 1d4d113fe6 音效空判断添加 2020-10-09 16:12:20 +08:00
zhangqiang 21550b047f 线上问题 无尽副本轮换前5分钟无法进入 2020-10-09 15:18:39 +08:00
zhangqiang d86658068f 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-09 15:15:26 +08:00
jiaoyangna 33209fa0c9 青龙秘宝修改 2020-10-15 14:00:21 +08:00
jiaoyangna 290b0858da 丹心碧血主界面icon 修改提交 2020-10-15 11:39:53 +08:00
jiaoyangna ecdb54f005 一键宝物重复穿戴宝物bug 修改 2020-10-15 11:23:38 +08:00
jiaoyangna ccd0ac635a 丹心碧血提交 2020-10-15 11:06:45 +08:00
wangzhenxing 43eef31eae Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-09 16:12:51 +09:00
wangzhenxing 888ad9a084 魂印历战之躯被动 199 及 魂印 义结金兰被动 188 执行顺序修改 2020-10-09 16:12:13 +09:00
ZhangBiao 927cc43b0d 社稷大典代码完善提交v1 2020-10-09 14:59:14 +08:00
ZhangBiao 1112953786 社稷大典 2020-10-09 09:30:02 +08:00
zhangqiang eefc951468 提交 2020-09-30 11:45:49 +08:00
JieLing 0064670621 遴选提交 2020-09-30 11:44:00 +08:00
jiaoyangna 01b300fb30 主题活动修改 2020-10-15 16:19:59 +08:00
yuanshuai f4879ab650 逍遥游地图相关预设脚本修改 2020-09-29 18:19:15 +08:00
ZhangBiao 71cd037aa4 Merge branch 'master_develop' into 0活动开发聚集地/社稷大典 2020-09-29 15:52:38 +08:00
wangzhenxing 307f8b484f 义结金兰魂印bug修改提交 2020-09-29 16:36:51 +09:00
jiaoyangna 8690da53d0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-29 15:35:27 +08:00
jiaoyangna 574c7d093d 丹心碧血图片提交 2020-09-29 15:35:08 +08:00
wangzhenxing ed1d0e6150 灵兽修改提交 2020-09-29 16:13:06 +09:00
gaoxin 9f38a8e436 注释无用代码,修复vip奖励领取保错 2020-09-28 20:11:57 +08:00
gaoxin 8c17716e1c 默认头像修改 2020-09-28 17:34:39 +08:00
yuanshuai 42d8a70a24 逍遥游地图界面提交 2020-09-28 16:30:52 +08:00
gaoxin 029d7d7097 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-28 16:26:26 +08:00
gaoxin 04cc2529fa 战斗log日志优化 2020-09-28 16:26:20 +08:00
ZhangBiao 5320fb5211 女人物大小修改 2020-09-28 16:05:34 +08:00
wangzhenxing b7ecba8fab 合并冲突提交 2020-09-28 14:57:46 +09:00
wangzhenxing 663a54c9ed language表提交 2020-09-28 14:54:15 +09:00
zhangqiang cccab99a11 灵兽提交 2020-09-28 11:22:47 +08:00
ZhangBiao acd0730f5d 2020-09-28 11:14:17 +08:00
jiaoyangna a8b6fdcec3 轩辕修改提交 2020-09-27 20:20:04 +08:00
gaoxin 91cd6c7174 头像默认显示复原 2020-09-27 19:04:17 +08:00
jiaoyangna 349316e2d7 时间销毁 2020-09-28 05:01:06 +08:00
ZhangBiao 22832d895e 社稷大典 2020-09-27 16:00:15 +08:00
zhangqiang 0a3f59befa 灵兽提交 2020-09-27 11:46:09 +08:00
ZhangBiao 3f00df0ee7 Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.

(cherry picked from commit 11b0361f15)
2020-09-27 11:17:46 +08:00
ZhangBiao d527c81d11 2020-09-27 10:15:05 +08:00
ZhangBiao 28bd8d4e73 社稷大典 占坑
(cherry picked from commit a97d8c4348)
2020-09-27 10:10:51 +08:00
jiaoyangna a6fd0d2aa6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-25 23:10:47 +08:00
gaoxin 36ebddb517 物品框添加头像框的特效 2020-09-27 15:04:12 +08:00
gaoxin 96ac81c098 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-27 13:33:39 +08:00
gaoxin 525e229273 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
ZhangBiao 11b0361f15 Revert "社稷大典 占坑"
This reverts commit 28bd8d4e73.
2020-09-27 11:16:27 +08:00
ZhangBiao b606b87bb2 Revert ""
This reverts commit d527c81d11.
2020-09-27 11:16:21 +08:00
ZhangBiao 62300c0bff 2020-09-27 10:15:40 +08:00
ZhangBiao a97d8c4348 社稷大典 占坑 2020-09-27 10:10:16 +08:00
jiaoyangna 278d9f8943 碎片属性图片修改提交 2020-09-25 23:09:48 +08:00
zhangqiang 637d910b5c 灵 受 2020-09-25 18:41:07 +08:00
ZhangBiao 90cab5221d 三界降魔 2020-10-02 00:18:17 +08:00
yuanshuai 9a5846943a 逍遥游入口界面预设脚本提交 2020-09-25 17:02:38 +08:00
ZhangBiao 9b9c094f3b Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2020-09-25 15:28:37 +08:00
ZhangBiao bec9ecf6d3 三界降魔 2020-09-25 15:24:59 +08:00
jiaoyangna afc1d269c2 限时折扣提交 2020-09-25 15:03:12 +08:00
jiaoyangna 9937a05d97 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-25 14:59:27 +08:00
jiaoyangna cae421024a 积天豪礼添加动画 2020-09-25 14:59:05 +08:00
zhangqiang f960264667 线上 : 战力计算 注释 VIP属性加成 2020-09-25 14:49:58 +08:00
zhangqiang f40b2050ad 灵兽培养部分初始脚本 2020-09-25 14:48:10 +08:00
gaoxin ac15a97977 战斗专属log添加,删除部分无用打印,添加死亡技能检测队列保证死亡技能的优先级最高。 2020-09-25 12:22:12 +08:00
jiaoyangna 49d55c763e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-25 23:15:11 +08:00
jiaoyangna fd4491e5db 挂机时间显示 2020-09-25 23:15:06 +08:00
wangzhenxing e92fb73587 灵兽逻辑提交 2020-09-25 11:45:43 +09:00
zhangqiang 89a7256077 线上活动 : 四周活动 天宫达人 问题 2020-09-25 09:49:44 +08:00
ZhangBiao e98973ff5a 三界降魔 2020-09-24 20:47:16 +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
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
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
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 35a4c61b42 修复魂印图鉴界面销毁后再次打开报错的问题 2020-09-22 16:59:23 +08:00
jiaoyangna cfd1f8d51b 添加动画 2020-09-18 13:43:52 +08:00
gaoxin 2eeb4af779 修复切磋战斗结果只会显示失败的问题 2020-09-17 16:23:26 +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
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
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
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
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
zhangqiang ff7c4311b4 竞技场结算界面修改代码 2020-09-15 15:22:00 +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
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 aacf1d029d 【十绝阵】敌人编队卡牌应使用无血条版本的边框 2020-09-15 14:47:15 +08:00
jiaoyangna f0f744602e 【累计充值】达成页签没红点 2020-09-15 11:21:55 +08:00
jiaoyangna 4d2c5e15ba 【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框 2020-09-15 10:28:34 +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
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
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 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 1651407fa4 漏提 2020-09-14 05:08:53 +08:00
jiaoyangna 5f5f6cb50a 【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失 2020-09-14 05:01:10 +08:00
jiaoyangna 9771ac2838 漏提 2020-09-22 14:43:22 +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
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
gaoxin 2bf4247d59 修复sdk无法登录 2020-09-10 14:25:30 +08:00
gaoxin 70a575cbb3 部分界面不再常驻内存 2020-09-10 14:25:02 +08:00
jiaoyangna 3e5e41b8ff 破阵诛仙提交 2020-09-10 13:40:07 +08:00
wangzhenxing 49f0c19cea 争霸赛胜负规则修改 2020-09-10 11:50:12 +09:00
gaoxin bf9cdac6b7 修改注册打点事件,将部分静态数据放在注册之前 2020-09-09 20:17:40 +08:00
gaoxin a8e9974854 修改充值接口报错 2020-09-09 19:45:40 +08:00
gaoxin bdacc0c703 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 18:47:23 +08:00
gaoxin 64f382c54d 充值接口修改,sdk和本地走同一套接口 2020-09-09 18:47:17 +08:00
ZhangBiao ac87815d64 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 17:25:33 +08:00
ZhangBiao 4af6f84f03 2020-09-09 17:25:27 +08:00
ZhangBiao f927da56e1 十绝阵排名bug修复 2020-09-09 15:20:56 +08:00
gaoxin b9481babee 部分界面音效添加 2020-09-09 13:59:22 +08:00
zhangqiang 4bcb51e164 添加寻宝排行榜 和 巅峰赛赛季更新修改 2020-09-09 11:20:29 +08:00
jiaoyangna c68cec489a 修改破阵诛仙子活动开启的条件判断 2020-09-10 11:03:47 +08:00
jiaoyangna 18ec0b7b20 限时召唤提交 2020-09-10 10:55:29 +08:00
ZhangBiao b209b5ae28 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:52:58 +08:00
ZhangBiao 462ad7b96b 主题活动界面适配调整 2020-09-09 10:52:50 +08:00
jiaoyangna d84b25c7a6 限时召唤提交 2020-09-10 09:33:27 +08:00
zhangqiang c87812cec5 打印 2020-09-09 10:41:42 +08:00
zhangqiang 6e04bd3404 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:37:02 +08:00
zhangqiang bf541ed4b0 寻宝达人替换资源 2020-09-09 10:36:55 +08:00
gaoxin 0393da682c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:36:52 +08:00
gaoxin b395ea2804 竞技场跳过30级后解锁 2020-09-08 20:16:14 +08:00
gaoxin 63f7759c7a 引导人物修改 2020-09-08 18:03:38 +08:00
jiaoyangna 70df47683a 限时召唤提交 2020-09-08 17:56:49 +08:00
ZhangBiao d36bd93b2d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 17:33:56 +08:00
ZhangBiao f56be71560 主题活动修改 2020-09-08 17:16:08 +08:00
jiaoyangna fb9b646553 限时召唤提交 2020-09-08 16:57:19 +08:00
gaoxin 37316136f1 剧情添加转场效果 2020-09-08 15:31:38 +08:00
zhangqiang f6abc4a22e 公会副本倒计时结束 加成buff 重置 2020-09-08 12:01:05 +08:00
gaoxin b65581fe71 引导战斗添加 2020-09-08 11:58:34 +08:00
ZhangBiao f451ac76f5 2020-09-08 10:56:23 +08:00
ZhangBiao 7a375b767c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 10:32:58 +08:00
ZhangBiao c67d731374 天宫秘宝增加购买校验 2020-09-08 10:32:49 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
jiaoyangna 6ac2b5a5f9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 09:32:45 +08:00
gaoxin 32b8705ab1 引导战斗流程添加 2020-09-07 18:25:31 +08:00
gaoxin 0c95879fb9 修改新手引导剧情开始节点 2020-09-07 17:06:45 +08:00
gaoxin 4edb1c7925 修复可能在引导日常之前就可以领取日常奖励的问题 2020-09-07 15:38:12 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
jiaoyangna a15206e938 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 10:01:13 +08:00
jiaoyangna 5e3e27c056 预设添加动画代码提交 2020-09-07 10:01:08 +08:00
gaoxin b62fe63c84 关闭战斗log 2020-09-05 20:40:33 +08:00
gaoxin 06afe99236 宽屏边缘用图片代替黑边 2020-09-05 19:02:20 +08:00
gaoxin 4ca09780a0 引导添加检测类型 2020-09-05 17:24:46 +08:00
gaoxin 7afe25a5d2 界面适配修改,引导添加网络延时检测 2020-09-05 17:21:09 +08:00
zhangqiang f36b3c7879 shi pei 2020-09-05 16:16:10 +08:00
gaoxin d05b5d43f1 android p 以上机型屏幕适配添加 2020-09-05 15:21:41 +08:00
gaoxin fb6a6c9da5 添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备 2020-09-05 12:30:00 +08:00
gaoxin 92a8b93b50 修改屏幕的适配方式,修改计算屏幕位置的方法 2020-09-05 12:15:58 +08:00
zhangqiang 9937727ede Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 18:35:40 +08:00
zhangqiang 6b55198f12 周月礼包替图 2020-09-04 18:35:30 +08:00
ZhangBiao f6fde7a2c8 试炼副本增加动效 2020-09-04 18:04:54 +08:00
ZhangBiao 4b50f8408b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-04 17:46:35 +08:00
ZhangBiao 63cde2092d 无尽副本界面动效增加 2020-09-04 17:46:27 +08:00
zhangqiang f6a3178926 xiugai 2020-09-04 17:34:59 +08:00