Commit Graph

4618 Commits (6d4d1fc49b00fa69446fb906820a5db3b97a10b1)

Author SHA1 Message Date
jiaoyangna 529067bb2f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 17:44:20 +08:00
jiaoyangna e087d4c57c ID1016424】
【无尽副本】反复从无尽地图返回主城报错
2021-06-10 17:43:52 +08:00
zhangqiang 4915842ee2 【山河社稷图】奖励排序 2021-06-10 17:05:51 +08:00
jiaoyangna ddd0ece70b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:38:43 +08:00
jiaoyangna 819278dd3d 【ID1016436】
【无尽副本】战斗结算界面有经验
2021-06-10 16:38:19 +08:00
zhangqiang 3506d2bb2c 【页签图标替换】局部 + 修行提示文字修改 2021-06-10 16:33:43 +08:00
jiaoyangna 8115705d1a 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:30:49 +08:00
gaoxin 4382e822e0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 16:10:18 +08:00
gaoxin aa4f3df8b0 【拍脸】优化短时间触发拍脸有可能导致报错的问题 2021-06-10 16:10:12 +08:00
jiaoyangna f5a9a1368d 【ID1016422】
【无尽副本】自动恢复行动力倒计时结束后,行动力不增加
2021-06-10 16:08:26 +08:00
gaoxin 3f47beac93 【支付】透传参数添加cc值 2021-06-10 15:20:31 +08:00
gaoxin ad2c3b84df Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-10 15:17:46 +08:00
gaoxin 0915c18368 【ID1009452】 增加森罗幻境老虎机音效 2021-06-10 15:16:17 +08:00
zhangqiang b3578a5ba4 【音效】跳转不同界面再返回,音效没有跟着切换 2021-06-10 14:50:28 +08:00
zhangqiang 18950a2326 【山河社稷图】章节图标修改 2021-06-10 14:43:45 +08:00
zhangqiang 0598fe8bdf 【修行特效】 2021-06-10 13:45:23 +08:00
gaoxin 1a12b261d5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 20:20:38 +08:00
gaoxin 07a35aec13 【幸运探宝】按钮位置修改 2021-06-09 20:20:16 +08:00
zhangqiang d21ebe57bb 【心魔试炼】2 2021-06-09 20:12:11 +08:00
jiaoyangna 7c1d58b3eb 青龙秘宝修改 提交 2021-06-09 18:48:24 +08:00
jiaoyangna cf47376987 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:24:56 +08:00
jiaoyangna fdc4d2f203 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 18:24:27 +08:00
zhangqiang 05b55bce02 【山河社稷图读取关卡界面音乐】 2021-06-09 18:17:22 +08:00
jiaoyangna ebfd313e12 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:14:43 +08:00
jiaoyangna 70cc891df2 【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
2021-06-09 18:14:26 +08:00
gaoxin 3dd0e302b2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 18:11:12 +08:00
gaoxin c895ce0faf 【战斗】优化指定目标特效显示错误的问题 2021-06-09 18:11:07 +08:00
jiaoyangna c40c6640c9 【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
2021-06-09 18:02:05 +08:00
jiaoyangna 20d50b84f2 ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取
2021-06-09 17:51:54 +08:00
jiaoyangna 37d36a511f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 17:45:29 +08:00
jiaoyangna 970a96b4f4 【ID1016342】
【解锁秘宝优化】激活可直接领取奖励预览中,没有显示专属奖励
2021-06-09 17:45:13 +08:00
gaoxin 930a16b2e7 【sdk】登录参数空值处理 2021-06-09 17:13:37 +08:00
gaoxin 8bdda8e1a8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 17:09:52 +08:00
gaoxin 86985803ba 【战斗】修复受击特效显示位置错误 2021-06-09 17:09:39 +08:00
jiaoyangna f0b9e1d8e6 Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78.
2021-06-09 17:09:14 +08:00
jiaoyangna 719bfe5a1a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 17:08:05 +08:00
jiaoyangna 8c0a90ef78 玲珑宝镜提交 2021-06-09 17:07:48 +08:00
jiaoyangna ae9d3ea396 无尽任务特效改提交 2021-06-09 17:02:04 +08:00
zhangqiang 768ae7dea0 【部分美术效果无法展示】2 2021-06-09 16:21:38 +08:00
gaoxin 844e265453 【特效】修复部分技能特效显示异常的问题 2021-06-09 16:05:19 +08:00
gaoxin b256e13889 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 16:04:43 +08:00
gaoxin 06d6e90b49 【添加CC值】用于判断渠道 2021-06-09 16:04:38 +08:00
zhangqiang 9a1f0078df 【部分美术效果无法展示】1 2021-06-09 15:58:04 +08:00
jiaoyangna ef37292ac2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 14:58:29 +08:00
jiaoyangna 67bed99433 【ID1009324】
剧情动画中去掉背景挂机时的音效(战斗,走路脚步声)
2021-06-09 14:58:11 +08:00
zhangqiang 04fba6a182 【页签优化】游戏内分页签高度距离统一化 2021-06-09 12:32:30 +08:00
gaoxin e1a87a10e4 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 12:18:19 +08:00
gaoxin cf878427ef 【礼包】获取结束时间时添加判空操作 2021-06-09 12:18:14 +08:00
jiaoyangna cd46af8ab0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 12:04:40 +08:00
jiaoyangna 9a61e6b709 【无尽副本】只有第一次完成任务会有光效,后续完成不会有 2021-06-09 12:04:22 +08:00
gaoxin 40768a423d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 11:49:16 +08:00
gaoxin cdfb7277f9 【礼包】礼包不存在添加判空操作,不再卡死 2021-06-09 11:49:11 +08:00
jiaoyangna c16b1124f8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-09 11:25:24 +08:00
jiaoyangna a54e1088e6 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-09 11:25:05 +08:00
wangzhenxing 0f8ce2017f [bug]=========【ID1016289】
【称号】唯我独尊这类称号位置需要调整
2021-06-09 11:24:58 +08:00
zhangqiang 53c42a56f7 【线上】【特权】属性加成位置缺少黑色半透图层 2021-06-09 11:20:05 +08:00
jiaoyangna bf5c4197ce 【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
2021-06-09 11:03:18 +08:00
wangzhenxing 9914b6ef76 [公会福利红包]========红包红点优化 2021-06-09 10:35:11 +08:00
jiaoyangna d1bd1a9cb7 【ID1009397】
四元阵增加置换玉获取提示
2021-06-09 10:12:00 +08:00
jiaoyangna 3d38a63266 【ID1009231】
【公会红包】拥有福利红包时,退出公会加提示
2021-06-08 21:08:16 +08:00
jiaoyangna d91a94d309 【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
2021-06-08 20:47:03 +08:00
jiaoyangna b85ddde17f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 20:27:19 +08:00
jiaoyangna 4d9d970907 【ID1009372】
点将台10连跳过保留橙将动画
2021-06-08 20:27:00 +08:00
gaoxin fad04ec385 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 19:29:35 +08:00
gaoxin c1ebbaa0b2 【sdk】修复sdk无法登录的问题,修改支付时的透传参数 2021-06-08 19:29:21 +08:00
jiaoyangna 4dfe018e82 【ID1009397】
四元阵增加置换玉获取提示
2021-06-08 18:19:14 +08:00
jiaoyangna 470e7c4430 【ID1009379】
【无尽副本】任务完成后右侧按钮添加光效,与关卡界面相同
2021-06-08 18:07:22 +08:00
jiaoyangna 86f79bee97 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-08 17:58:43 +08:00
jiaoyangna 2ed4480d92 【ID1009398】
【青龙秘宝】解锁秘宝界面显示奖励 ,无尽秘宝同理
2021-06-08 17:57:59 +08:00
gaoxin c2961f8f2d 【sdk登录】新增两个参数extData 和 p_appId 草花渠道使用 2021-06-08 17:27:24 +08:00
jiaoyangna 9681a00816 【ID1009395】
点将台增加剩余保底次数显示
2021-06-08 15:15:13 +08:00
jiaoyangna 0d5c47f347 【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
2021-06-08 11:40:40 +08:00
jiaoyangna 24e2646bb8 心愿抽卡十连 报错修改 2021-06-07 18:06:23 +08:00
ZhangBiao 21ba0c629d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-07 13:32:09 +08:00
ZhangBiao 6c31fa860d 【右上角活动】红点修改 2021-06-07 13:32:01 +08:00
jiaoyangna 605073d7ec 无尽商店返回无尽副本关闭修改提交 2021-06-07 12:00:05 +08:00
ZhangBiao a96a61ec77 【逐胜之巅】入口调整至左侧 2021-06-07 11:18:37 +08:00
jiaoyangna c82afde747 删除log 2021-06-05 11:43:01 +08:00
jiaoyangna cbfe1db769 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-05 11:18:45 +08:00
jiaoyangna 46b4e3cd84 删除log 2021-06-05 11:18:13 +08:00
ZhangBiao f4e645df07 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-05 11:15:07 +08:00
ZhangBiao d744c010bf 【主城】红点 2021-06-05 11:14:36 +08:00
jiaoyangna 1912473cbe Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-05 11:04:46 +08:00
jiaoyangna b5dda1e81c 剧情跳过修改提交 2021-06-05 11:04:28 +08:00
gaoxin 0e85d88c21 【剧情】修复连续跳过导致卡死的问题 2021-06-05 03:10:19 +08:00
gaoxin fe517d91ed 【红点】还原清空所有红点的操作 2021-06-04 23:56:09 +08:00
gaoxin 206fcf9d92 【红点】修复部分红点被错误清除的问题 2021-06-04 23:54:59 +08:00
gaoxin 97cb753d4e 【引导】没有引导的功能解锁时会导致报错 2021-06-04 23:31:39 +08:00
ZhangBiao 39180183a9 【任务头像】红点问题修改 2021-06-04 18:41:32 +08:00
ZhangBiao f0cd4b3bc0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-04 16:10:28 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
gaoxin b30359d2f5 【战斗】心魔试炼背景图修改 2021-06-04 15:17:43 +08:00
gaoxin 746e92f23d 【战斗】日常副本,无尽副本,山河社稷图战斗背景修改 2021-06-04 15:01:48 +08:00
gaoxin c067b888d3 【登录视频】如果登录视频加载失败不再播放,战斗还原boss关卡不能跳过的功能 2021-06-04 14:53:37 +08:00
wangzhenxing 6158f0916a [福利红包]=====红包红点修改 2021-06-04 14:19:16 +08:00
gaoxin bc65257ac7 【战斗】跳过提示修改为25级 2021-06-04 11:18:46 +08:00
gaoxin eda07761fc 【登录】尝试修复在登录界面无法使用sdk切换账号的问题 2021-06-04 10:47:07 +08:00
gaoxin f708fb6671 【登录视频】优化静态背景切换到视频的效果 2021-06-04 10:08:57 +08:00
gaoxin 3eb84202f2 【登录】修改特效依然再喜扑的包里显示的问题 2021-06-03 23:03:09 +08:00
gaoxin 079afb4e8d Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e.
2021-06-03 22:37:30 +08:00
ZhangBiao 2f6fc30733 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 20:33:18 +08:00
ZhangBiao cc03866a03 【日常任务】红点问题修改 2021-06-03 20:33:08 +08:00
gaoxin 682d1a6b39 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 19:50:07 +08:00
gaoxin d20e47535e 【Debug】红点不消失问题debug日志添加 2021-06-03 19:50:02 +08:00
ZhangBiao f0dfe05e7b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 19:44:48 +08:00
ZhangBiao 326b790bcf 【抽卡】界面报错修改 2021-06-03 19:44:39 +08:00
zhangqiang 1933ffa809 【神将升级】满级还显示升级按钮 2021-06-03 19:38:22 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
jiaoyangna b758c30f09 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:47:14 +08:00
jiaoyangna b27430089a 【神将图鉴】猪八戒首次打开界面显示错误,报错(非必现) 2021-06-03 18:46:49 +08:00
gaoxin 327efb10d0 【战斗】卡牌人物立绘释放技能时位置计算方式调整 2021-06-03 18:40:26 +08:00
ZhangBiao 46bdf8c271 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:19:23 +08:00
ZhangBiao 07a877bd4c 【牛气冲天】红点修改 2021-06-03 18:19:12 +08:00
jiaoyangna 361a9b67ae Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 18:00:49 +08:00
jiaoyangna 6777d87a72 图鉴隐藏皮肤 2021-06-03 18:00:28 +08:00
ZhangBiao 1d697c5370 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 17:59:27 +08:00
ZhangBiao d19325ce7b 【公会红点】报错修改 2021-06-03 17:59:14 +08:00
zhangqiang 7a80a23435 【化虚坛】红点加功能开启判断 2021-06-03 17:56:58 +08:00
jiaoyangna 2a6fba6073 【无尽副本】地图跳转到商店。副本重置期间,还可以返回地图 2021-06-03 17:24:17 +08:00
jiaoyangna ab694c89f7 关闭解锁章节挂机界面 2021-06-03 17:09:30 +08:00
jiaoyangna fd6e00c757 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 16:51:55 +08:00
jiaoyangna dd0518b9a0 引导顺序修改 2021-06-03 16:51:36 +08:00
gaoxin 280ec50e34 【登录】报错 2021-06-03 16:07:38 +08:00
wangzhenxing 4644de33a5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 15:52:33 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
gaoxin adeeccdc84 【登录界面】特效只在特殊背景下显示 2021-06-03 15:44:28 +08:00
jiaoyangna d92b951c3c 无尽任务进度修改 2021-06-03 15:01:48 +08:00
jiaoyangna fba66fae7e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 14:31:30 +08:00
jiaoyangna 66954a3f65 礼包特效 2021-06-03 14:31:10 +08:00
gaoxin 6268827039 【战斗】首领关卡跳过功能打开 2021-06-03 14:19:45 +08:00
gaoxin 39fd13b7dc 【称号】主城他人称号特效不显示的问题 2021-06-03 14:01:39 +08:00
gaoxin 9bd23a74cf 【登录视频】优化加载过程 2021-06-03 13:52:55 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
jiaoyangna 7c0a3dc57b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 11:41:28 +08:00
jiaoyangna 461f481bd8 配音提交 2021-06-03 11:41:08 +08:00
wangzhenxing 200e48ed73 [称号]=====称号高度设置 2021-06-03 11:23:05 +08:00
jiaoyangna 9b13236cfc 添加限制皮肤显示 2021-06-03 10:59:54 +08:00
jiaoyangna eea172a5f6 特效层级修改 2021-06-03 10:38:37 +08:00
jiaoyangna d4cea59040 剧情跳过修改提交 2021-06-02 21:32:23 +08:00
jiaoyangna 138ab211e6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:16:58 +08:00
jiaoyangna ac3513e05a 无尽红点修改提交 2021-06-02 21:15:56 +08:00
wangzhenxing 21492a76af Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 21:08:07 +08:00
wangzhenxing 5cf037f6da [称号]=======聊天界面新称号显示修改 2021-06-02 21:07:02 +08:00
jiaoyangna b82347e7eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:59:26 +08:00
jiaoyangna 2f9b8de4db 无尽编队修改提交 2021-06-02 20:59:02 +08:00
gaoxin d65a7fd11a 【称号】修复地图称号不显示 2021-06-02 20:53:49 +08:00
zhangqiang 935bae0f1c 【无尽副本】添加帮助和商店入口 2021-06-02 20:33:30 +08:00
ZhangBiao a846715e1a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:25:30 +08:00
ZhangBiao ff79cf980c 【首充】报错修改 2021-06-02 20:25:20 +08:00
jiaoyangna 26cd24eba1 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 20:21:33 +08:00