Commit Graph

9256 Commits (1e203c822cfeb0157ac786bc20d5ca6f04bca74b)

Author SHA1 Message Date
ZhangBiao 9b520a24bd Revert "【界面优化】白金装备显示框"
This reverts commit c442268050.
2021-10-29 16:22:32 +08:00
ZhangBiao 927afe7cc9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 16:14:16 +08:00
ZhangBiao c442268050 【界面优化】白金装备显示框 2021-10-29 16:14:06 +08:00
wangzhenxing ade77f6b44 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 15:50:45 +08:00
wangzhenxing 3815dc0ff3 [战斗]=======灵兽技能触发机制修改 2021-10-29 15:50:17 +08:00
ZhangBiao 55f2561db3 【英雄归元】英雄归元后属性值没有重置 2021-10-29 15:11:48 +08:00
ZhangBiao 3b02c6296c 【宝器属性】穿戴宝器后,游戏退出重进宝器属性没有加上,导致战力值下降 2021-10-29 14:20:21 +08:00
ZhangBiao 32985c8912 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-29 13:28:20 +08:00
ZhangBiao 5d15c33605 【优化】跨服战红点跨天后不显示,完成所有操作后红点不消失,需要重新进入 2021-10-29 13:28:04 +08:00
gaoxin b181f4bd55 【GM】添加一些GM命令 2021-10-29 12:08:40 +08:00
ZhangBiao c1f3658da4 【界面优化】提交 2021-10-29 11:13:29 +08:00
jiaoyangna 1b13146915 【ID1018877】
【好感度逍遥游入口】云游值消耗还剩5点不足以继续操作,但是红点没有消失
2021-10-28 19:01:36 +08:00
jiaoyangna 4d4d2bfd99 删除log 2021-10-28 18:56:59 +08:00
jiaoyangna 6f8fa46ccd 添加log 2021-10-28 18:43:11 +08:00
jiaoyangna 02b161e84c 添加log 2021-10-28 18:42:02 +08:00
jiaoyangna d05fe62424 添加log 2021-10-28 18:39:10 +08:00
jiaoyangna 30b3adbee6 【ID1018746】
【连点】车迟斗法,十绝阵一类的玩法,快速点击进入战斗,会直接扣两个次数
2021-10-28 18:32:21 +08:00
jiaoyangna 9926717bb9 【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
2021-10-28 18:20:18 +08:00
jiaoyangna 5abf6060d2 魂印商店刷新修改 2021-10-28 18:06:26 +08:00
jiaoyangna feb859b9a6 魂印商店刷新修改 2021-10-28 18:01:48 +08:00
jiaoyangna 42ed8a1617 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 18:00:15 +08:00
jiaoyangna acf33d10a3 【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
2021-10-28 17:59:56 +08:00
ZhangBiao 4d1496580a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:30:56 +08:00
ZhangBiao dc689f3c25 【三界降魔】提交 2021-10-28 17:30:46 +08:00
jiaoyangna e95f7f9e26 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:28:44 +08:00
jiaoyangna 413d98fe82 【ID1010609】
【商店优化】魂印商店出现红色魂印时,点击刷新增加二次确认
2021-10-28 17:28:12 +08:00
ZhangBiao a590e57c89 【三界降魔】坐骑显示调整 2021-10-28 17:28:10 +08:00
ZhangBiao 2a4422aabb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:24:06 +08:00
ZhangBiao 9c9beb78da 【三界降魔】 2021-10-28 17:23:56 +08:00
jiaoyangna 467a05b683 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 17:20:57 +08:00
wangzhenxing c43667aa67 【玉虚论道】=======主界面按钮位置修改提交 2021-10-28 16:53:49 +08:00
ZhangBiao 0903782f0e 【界面优化】法宝界面错位调整 2021-10-28 16:51:00 +08:00
ZhangBiao ab2b32a35f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 16:41:06 +08:00
ZhangBiao 871b2ad23b 【界面优化】大闹天宫调整 2021-10-28 16:40:54 +08:00
jiaoyangna eaa1828752 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 16:38:50 +08:00
jiaoyangna b41e5ed0b6 【ID1018877】
【好感度逍遥游入口】云游值消耗还剩5点不足以继续操作,但是红点没有消失
2021-10-28 16:38:35 +08:00
wangzhenxing 345230b0cc 【玉虚论道】======预设修改提交 2021-10-28 16:25:35 +08:00
ZhangBiao 5e0e41f7bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 16:03:33 +08:00
ZhangBiao 79f7339a3a 【三界降魔】提交 2021-10-28 16:03:23 +08:00
wangzhenxing 9f377eb364 [玉虚论道]==========功能按钮大小修改提交 2021-10-28 15:42:13 +08:00
jiaoyangna 04fff0d79b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 15:04:07 +08:00
jiaoyangna d3bfde8830 三界降魔站立问题修改 2021-10-28 15:03:40 +08:00
ZhangBiao 134bb86342 【界面优化】 2021-10-28 14:57:50 +08:00
ZhangBiao 91efb9a43c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-28 14:43:35 +08:00
ZhangBiao 79043d7c24 【界面优化】大闹天宫 2021-10-28 14:43:23 +08:00
wangzhenxing e738e8eda8 【战斗】===========被动180 修改提交 2021-10-28 14:41:01 +08:00
ZhangBiao 8364c654b7 【界面优化】大闹天宫 2021-10-28 14:19:00 +08:00
ZhangBiao 87a95f0612 【界面优化】还原”特性“、大闹天宫 2021-10-28 14:14:30 +08:00
ZhangBiao 751e396cf6 Merge branch 'china/dev' into 0优化/界面优化 2021-10-28 09:53:51 +08:00
wangzhenxing 74dea991bc [战斗]======被动355-363 提交 2021-10-28 09:48:01 +08:00
ZhangBiao ef79b1d170 【界面优化】送神、归元、法宝 2021-10-28 09:47:24 +08:00
ZhangBiao 9ac870db81 Merge branch 'china/dev' into 0优化/界面优化 2021-10-28 09:34:12 +08:00
ZhangBiao 429366fa93 【三界降魔】调改 2021-10-27 18:26:51 +08:00
gaoxin 30ecb20689 【隐私协议】方法报错优化 2021-10-27 18:21:46 +08:00
ZhangBiao 55090ed8cc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-27 18:08:28 +08:00
ZhangBiao 3b42cd525e 【三界降魔】新活动完成 2021-10-27 18:08:16 +08:00
gaoxin f9417e0746 【隐私协议】文字内容由代码控制 2021-10-27 17:03:47 +08:00
gaoxin aabf86ba56 【山河社稷图】红点父节点错误 2021-10-27 16:36:56 +08:00
gaoxin 2b74430e61 【隐私协议】修改隐私协议的配置方式,查看协议的连接由GM协议配置的母包配置 2021-10-27 16:22:24 +08:00
gaoxin a1449fd504 【七界试炼】修复跨天红点不刷新的维妮塔 2021-10-27 15:14:47 +08:00
ZhangBiao 19a67875f8 【界面优化】大闹天宫部分 2021-10-27 13:45:05 +08:00
ZhangBiao 36f26dc0cb 【界面优化】抽到灵兽 2021-10-27 10:45:59 +08:00
ZhangBiao ac23ef4dbd 【界面优化】竞技场主界面、轩辕宝镜、抽到灵兽界面 2021-10-27 10:37:29 +08:00
ZhangBiao f8a0a76d75 【界面优化】灵兽技能、英雄传说 2021-10-27 09:54:42 +08:00
gaoxin 266d3088e7 【战斗】修复假战斗报错 2021-10-26 21:43:00 +08:00
ZhangBiao 2f8ad786f5 【界面优化】HelpPopup 2021-10-26 18:30:32 +08:00
ZhangBiao 490f566b4d 【界面优化】技能 2021-10-26 18:23:32 +08:00
ZhangBiao 779cb4d99e 【界面优化】技能 2021-10-26 18:18:36 +08:00
wangzhenxing a38fe30800 [主角技能]=====注重主角立绘等级显示修改 2021-10-26 18:03:02 +08:00
ZhangBiao d5cf1c5395 【界面优化】归元、技能 2021-10-26 17:55:49 +08:00
ZhangBiao 353a9774c5 【界面优化】定位、恭送 2021-10-26 17:36:08 +08:00
ZhangBiao e29dd36c26 【界面优化】法宝界面 2021-10-26 16:33:20 +08:00
jiaoyangna bdff69b0e2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 15:29:04 +08:00
jiaoyangna 41966a1487 逍遥游报错修改提交 2021-10-26 15:28:44 +08:00
wangzhenxing c48a16bb6c [主角技能]=====技能升级界面预设修改提交 2021-10-26 15:17:17 +08:00
gaoxin e7da10a595 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:45:34 +08:00
gaoxin a692f8d9d4 【本场最佳】主角名颜色根据修行等级改变 2021-10-26 14:45:28 +08:00
jiaoyangna b6475fb1b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 14:17:56 +08:00
jiaoyangna 3d832f81cf 【ID1010556】
【优化】好感度解锁等级优化
2021-10-26 14:17:07 +08:00
gaoxin 9a2e2581f9 【资源】名称重复修改 2021-11-10 05:30:59 +08:00
gaoxin bef3a23392 【资源】名称重复修改 2021-11-10 05:28:10 +08:00
ZhangBiao 26b5a670f9 【界面优化】背包装备优化 2021-10-26 14:04:02 +08:00
wangzhenxing 4c292035cf [主角技能]======心魔试炼快速战斗不显示主角伤害记录修改 2021-10-26 14:00:23 +08:00
ZhangBiao ccd2b2ffd7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-26 10:13:41 +08:00
ZhangBiao cce7591927 【山河社稷图】小关卡单独上阵报错修改 2021-10-26 10:13:28 +08:00
gaoxin 7ac3b1bc14 【飘渺之旅】修复完成全部任务,无法领取的问题 2021-10-25 19:22:57 +08:00
ZhangBiao f51c80b277 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 18:40:33 +08:00
ZhangBiao 7332c761b8 【御剑行】错别字 2021-10-25 18:40:22 +08:00
gaoxin 8fdb8942e1 【飘渺之旅】修复第一天显示了重复的任务的问题 2021-10-25 18:15:48 +08:00
liujiaqi 59c1629b18 【资源】四不像icon 2021-11-07 17:32:11 +08:00
wangzhenxing fbf66138ca [玉虚论道]======玉虚段位奖励界面特效层级修改提交 2021-10-25 17:19:01 +08:00
ZhangBiao 9c76f42161 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 16:47:15 +08:00
ZhangBiao e8f0a9b4a1 【御剑行】界面黑屏倒计时结束后弹出排行榜 2021-10-25 16:46:51 +08:00
wangzhenxing 7b406e1c4b 【战斗】===========主角技能使用 队伍战斗力 接口修改 2021-10-25 16:37:41 +08:00
gaoxin 04a1196586 【战斗力】一旦战斗力改变就让后端重新计算战斗力 2021-10-25 16:13:48 +08:00
wangzhenxing 237767eb29 【战斗】=============灵兽技能 8 回合cd判断修改 2021-10-25 15:54:38 +08:00
gaoxin 102c24cd8e 【至尊降世】文字遮挡优化 2021-10-25 14:53:32 +08:00
gaoxin ab20dc943c 【用户隐私协议】内容完善 2021-10-25 13:53:44 +08:00
wangzhenxing 09755c8d12 [战斗]==============测试战斗添加主角技能检测,攻击就是队伍战斗力 2021-10-25 13:48:48 +08:00
ZhangBiao 0cef23209c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-10-25 11:54:13 +08:00