Commit Graph

6912 Commits (a568ec170705843bc28db69dd9d77e5ade499291)

Author SHA1 Message Date
ZhangBiao d0b2bdd412 【灵脉秘境】提交 2021-11-11 14:28:02 +08:00
gaoxin 436de6bf4f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 14:10:53 +08:00
gaoxin 3addb9905b 【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大 2021-11-11 14:10:48 +08:00
wangzhenxing f71bbbdf95 [战斗]===========第二期神魂被动提交 2021-11-11 14:01:32 +08:00
gaoxin c259e72874 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 13:49:23 +08:00
gaoxin 4ef85b5720 【【通关奖励】创建新号首次进入通关奖励,通关简单3-10的英雄碎片缺少数量显示,退出该界面在进入数量才显示出来】https://www.tapd.cn/33029060/bugtrace/bugs/view?bug_id=1133029060001019080 2021-11-11 13:49:10 +08:00
jiaoyangna 390d514bd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 13:41:59 +08:00
jiaoyangna 4455242293 【ID1019110】
【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框
2021-11-11 13:41:42 +08:00
gaoxin ecbee47ef8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 12:00:39 +08:00
gaoxin 5d266a04d9 【引导】添加剧情节点 2021-11-11 12:00:34 +08:00
ZhangBiao db15950d6a Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:56:10 +08:00
jiaoyangna d37ed44478 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:52:15 +08:00
jiaoyangna 56ba9ccba8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-11 10:49:14 +08:00
jiaoyangna d1cb61fc18 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-11 10:48:59 +08:00
ZhangBiao 3eca9bec47 Merge branch 'china/dev' into 0功能/灵脉秘境 2021-11-11 10:11:04 +08:00
gaoxin f4ff8d4d77 【登录】非sdk登录时,不重新输入账号不可以再进入游戏 2021-11-11 10:07:14 +08:00
ZhangBiao c104bd65a7 【灵脉秘境】提交 2021-11-11 10:06:49 +08:00
jiaoyangna bdb08206df Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 18:35:53 +08:00
jiaoyangna ceb7ee3602 【ID1010636】
【优化】灵兽宝阁活动调整
2021-11-10 18:35:38 +08:00
gaoxin f46aac739e 【三界降魔】修复没有坐骑时报错得问题 2021-11-10 17:31:38 +08:00
gaoxin a78b4996dd 【抽卡】尝试修复报错黑屏 2021-11-10 16:57:44 +08:00
ZhangBiao 6d483802fa 【修行】特效穿透修改
(cherry picked from commit ee7b2b9919)
2021-11-10 15:22:43 +08:00
ZhangBiao ee7b2b9919 【修行】特效穿透修改 2021-11-10 15:20:18 +08:00
ZhangBiao cc316086e9 【新·物品】界面提交 2021-11-10 15:03:18 +08:00
ZhangBiao 1adee43039 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 14:54:18 +08:00
ZhangBiao f74ce2f895 【新·物品】界面提交 2021-11-10 14:53:35 +08:00
jiaoyangna 908e068f23 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-10 13:24:05 +08:00
jiaoyangna 1b95b2a04a 公会查看成员编队神将属性错误修改 2021-11-10 13:23:42 +08:00
gaoxin b661b04ad1 【新假战斗】修复正常战斗报错,修复加战斗中主角性别错误 2021-11-10 13:22:32 +08:00
gaoxin 6d377cdf69 【新假战斗】修改假战斗的战斗类型 2021-11-10 11:42:20 +08:00
gaoxin 880c77888a 【新假战斗】加入主角技能 2021-11-10 11:03:18 +08:00
gaoxin c9e2ddcaf8 【新假战斗】 2021-11-10 09:48:42 +08:00
ZhangBiao 7efdfd5029 【新·装备】增加战力对比图标 2021-11-09 18:24:38 +08:00
ZhangBiao c627c5cd28 【新·魂灵宝】增加战力对比图片 2021-11-09 17:35:27 +08:00
ZhangBiao aa9cc34792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 17:06:59 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
gaoxin f23a455797 【魂印】详情界面优化 2021-11-09 15:48:56 +08:00
ZhangBiao 76c3c5c0bf 【新·魂灵宝】提交 2021-11-09 14:39:27 +08:00
ZhangBiao fdffaf846e 【新·魂灵宝】界面提交 2021-11-09 11:42:19 +08:00
gaoxin 3131ffca2f 【资源和谐】后台控制完成 2021-11-09 10:49:37 +08:00
ZhangBiao ed02f4a86f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-09 10:22:33 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
jiaoyangna 922c55e7e7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 17:23:07 +08:00
jiaoyangna 173221dd1a 【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
2021-11-08 17:22:51 +08:00
gaoxin 0595ecbb46 【七界试炼】添加战斗结果校验 2021-11-08 17:04:22 +08:00
jiaoyangna a68330c17f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 16:31:48 +08:00
jiaoyangna 419a9cedc9 森罗幻境神将修改 2021-11-08 16:31:34 +08:00
ZhangBiao 363839c48a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 16:00:06 +08:00
ZhangBiao 76b7b5caca 【log】提交 2021-11-08 15:59:56 +08:00
wangzhenxing d30fc43d9f 【战斗】============被动285修改 2021-11-08 15:28:04 +08:00
jiaoyangna 8bbdf8eed5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:18:45 +08:00
jiaoyangna 265aaca235 神将界面特效修改提交 2021-11-08 15:18:28 +08:00
gaoxin fe99284efe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:12:59 +08:00
gaoxin 5f0dc622a5 【皮肤】背包内解锁孙悟空皮肤,弹出是否前往穿戴,点击前往,跳转到神将传说界面 2021-11-08 15:12:48 +08:00
jiaoyangna dc5f09cc02 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 15:05:27 +08:00
jiaoyangna e457260b42 神将排序界面修改提交 2021-11-08 15:04:53 +08:00
gaoxin fc38e204ce 【森罗幻境】森罗幻境神魂特效穿透 2021-11-08 15:04:36 +08:00
gaoxin 3dffd71924 【跨服战】优化打开跨服战界面,请求过多导致界面不可点击的问题 2021-11-08 14:49:26 +08:00
gaoxin bbb89af48e 【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错 2021-11-08 14:10:26 +08:00
wangzhenxing e99f8c285f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 14:02:57 +08:00
wangzhenxing 95b7fceb34 [神魂]======神魂升级后技能描述修改 2021-11-08 14:02:33 +08:00
gaoxin 67f3ca9f52 【适配】1080*2550,进阶白骨精法宝,文字描述遮挡 2021-11-08 13:39:29 +08:00
ZhangBiao a577d80d76 【神魂】增加特效 2021-11-08 13:02:00 +08:00
jiaoyangna c490e9c01c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:24:36 +08:00
jiaoyangna 1329112387 神魂未激活图片修改提交 2021-11-08 11:24:10 +08:00
gaoxin 82dd1b6512 【我要变强】切换页签报错 2021-11-08 11:20:30 +08:00
ZhangBiao 0fc2ec5b08 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 11:07:35 +08:00
ZhangBiao 2621f0f9f8 【升星有礼】白骨精进阶10星,获得的展示界面没有天赋详情 2021-11-08 11:07:11 +08:00
jiaoyangna 67c6e7d92d 玉虚论道编队修改 2021-11-08 11:06:57 +08:00
jiaoyangna 024b684999 排行榜神魂放大镜显示错误修改 2021-11-08 10:51:51 +08:00
jiaoyangna e8433d1026 玉虚论道记录神魂修改提交,神将界面修改提交 2021-11-08 10:30:12 +08:00
jiaoyangna cb41ba3991 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 10:20:34 +08:00
jiaoyangna 9fe5c809b8 灵兽界面技能描述白片修改提交 2021-11-08 10:20:19 +08:00
wangzhenxing 8bc936aff8 【神魂】=====伤害统计界面神魂显示修改 2021-11-05 18:24:05 +08:00
ZhangBiao 637defb9e2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:14:57 +08:00
ZhangBiao a953a78018 【升星有礼】觉醒后没有红点修改 2021-11-05 18:14:44 +08:00
gaoxin d4582cf244 【神魂】修复战斗中神魂特效不显示的问题 2021-11-05 18:13:32 +08:00
ZhangBiao 3418bac21d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 18:09:46 +08:00
ZhangBiao 104f5cbda8 【降妖夺宝】修改提交 2021-11-05 18:09:14 +08:00
jiaoyangna 5cb5137fde Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:38:24 +08:00
jiaoyangna afcfc1b393 神魂星星修改提交 2021-11-05 17:38:10 +08:00
wangzhenxing 99452354bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:21:30 +08:00
wangzhenxing a92a76e3ab 【神魂】=====技能描述修改 2021-11-05 17:21:18 +08:00
jiaoyangna 2aea503619 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 17:14:08 +08:00
jiaoyangna bd8cd97bf3 神魂星星修改提交 2021-11-05 17:13:49 +08:00
gaoxin 89957b0787 【坐骑、称号属性】需要在背包激活时就加属性,而不是必须要佩戴一次 2021-11-05 17:12:35 +08:00
gaoxin 0408157db2 【坐骑】狐狸坐骑在三界除魔榜上位置不居中 2021-11-05 17:00:28 +08:00
ZhangBiao 142956ca6a 【活动】活动修改提交 2021-11-05 16:43:09 +08:00
jiaoyangna ad3b903209 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 16:20:01 +08:00
jiaoyangna 2179a76560 森罗幻境,公会星星修改提交 2021-11-05 16:19:47 +08:00
ZhangBiao 60391c16b4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 15:51:05 +08:00
ZhangBiao ea4661b254 【无尽副本】修改 2021-11-05 15:50:49 +08:00
jiaoyangna 1c2758f26c 送神祠星级修改 2021-11-05 15:48:22 +08:00
jiaoyangna f8b43c4c30 修行星星修改提交 2021-11-05 15:23:21 +08:00
jiaoyangna 420356da83 添加特效 2021-11-05 14:33:09 +08:00
jiaoyangna e35ded2b5d 巅峰赛星级修改提交 2021-11-05 14:08:35 +08:00
jiaoyangna 42bb1c7443 四灵试炼修改提交 2021-11-05 13:59:19 +08:00
jiaoyangna 9d1e517743 四灵试炼层级报错修改 2021-11-05 13:53:56 +08:00
jiaoyangna 2985079325 编队星星修改提交 2021-11-05 13:37:29 +08:00
jiaoyangna cdd6baeb5f 巅峰赛星星修改提交 2021-11-05 13:35:14 +08:00
jiaoyangna 29e279755e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 13:21:39 +08:00
jiaoyangna d0d93e02ea 代码星星层级设置修改 2021-11-05 13:18:55 +08:00
wangzhenxing 6ace7b50ab [战斗]======被动154 200 360 修改 2021-11-05 13:17:17 +08:00
ZhangBiao 56530dbc93 【无尽副本】提交 2021-11-05 11:40:48 +08:00
gaoxin 2f65f4d391 【心魔试炼】界面报错修复 2021-11-05 11:06:10 +08:00
jiaoyangna b78131766d 鸿蒙阵报错修改提交 2021-11-05 10:56:42 +08:00
jiaoyangna 2774ca08b1 玉虚论道编队报错修改提交 2021-11-05 10:42:37 +08:00
ZhangBiao 43a8da3f2f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:25:08 +08:00
ZhangBiao 7f258a4aa2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:24:44 +08:00
jiaoyangna 8fd4b5e367 神魂提交 2021-11-05 10:24:41 +08:00
ZhangBiao 005ac1e5df 【光效穿透】编队界面上阵觉醒神将,长按神将打开神将情报,觉醒光效穿透 2021-11-05 10:24:32 +08:00
jiaoyangna 5ac1f04718 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:18:28 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
wangzhenxing c04ee81117 【玉虚论道】======战斗信息界面报错修改提交 2021-11-05 10:17:45 +08:00
ZhangBiao cf6837cbba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-05 10:04:43 +08:00
ZhangBiao cd8f61cbed 【无尽副本】行动力不减修复 2021-11-05 10:04:32 +08:00
gaoxin c232f35436 【轩辕宝镜 】修复还是可能会上阵重复神将的问题 2021-11-05 10:01:46 +08:00
wangzhenxing 51dfdede03 [战斗]===========被动371 368修改 2021-11-05 09:50:28 +08:00
gaoxin e39bbe2dc1 【轩辕宝镜】修复如果玩家有两个相同的战力较高的神将,会导致少上阵一个位置的问题 2021-11-04 18:53:11 +08:00
wangzhenxing 661ea27421 [战斗]======被动357修改 御甲buff修改 2021-11-04 16:57:06 +08:00
gaoxin 96c77fd033 【周卡】数量过长用万字省略 2021-11-04 16:48:34 +08:00
gaoxin 7f3d044ec3 【周卡】数据不存在时不再显示周卡页签 2021-11-04 16:10:40 +08:00
gaoxin ee463b3103 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 15:50:53 +08:00
gaoxin 2d669fd354 【周卡】修改礼包ID字段获取方式 2021-11-04 15:50:47 +08:00
ZhangBiao f3e9bed33f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 15:45:13 +08:00
ZhangBiao 1321b32caf 【装备界面】增加特效 2021-11-04 15:44:59 +08:00
ZhangBiao bccd6751eb 【无尽密保】文字显示错误修改 2021-11-04 15:44:13 +08:00
wangzhenxing b6ec2b0f89 【战斗】======被动360修改 2021-11-04 15:40:14 +08:00
wangzhenxing 113e1ebefa 【战斗】=====被动356 修改 2021-11-04 14:13:28 +08:00
wangzhenxing 41044877f1 [战斗]=============被动357修改 2021-11-04 13:43:05 +08:00
gaoxin 761cdeffcf 【周卡】策划反馈优化 2021-11-15 00:03:12 +08:00
jiaoyangna f9f92262a8 巅峰赛神魂图标提交 2021-11-04 11:35:15 +08:00
jiaoyangna 3a1139c0a0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-04 10:46:39 +08:00
jiaoyangna 154aa77cd3 神魂特效修改提交 2021-11-04 10:46:25 +08:00
wangzhenxing 878b12f574 【战斗】===============被动364-371 提交 307 360修改 2021-11-04 10:27:02 +08:00
jiaoyangna 596c8477d3 Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-11-04 09:29:56 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00
jiaoyangna 4941110a7b 神魂提交 2021-11-03 18:38:13 +08:00
jiaoyangna b11e859557 神魂提交 2021-11-03 18:16:26 +08:00
jiaoyangna 6f0d51ddb2 神魂提交 2021-11-03 18:11:08 +08:00
gaoxin 29df41d399 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-03 17:44:08 +08:00
gaoxin 5b3073f0eb 【周卡】修复0点刷新不及时问题 2021-11-03 17:44:02 +08:00
ZhangBiao fc6d13a4d7 【鸿蒙碑】升级鸿蒙碑不弹出战斗力变化提示,且升级后总战斗力数值错误,重新登录后战斗力会提升 2021-11-03 17:06:45 +08:00
gaoxin 24c550cee5 Merge branch '0活动开发聚集地/周卡' into china/dev
# Conflicts:
#	Assets/ManagedResources/Spine/zq_niu/zq_niu.png.meta
2021-11-03 16:09:31 +08:00
gaoxin 820b45cfa0 【宝物】修复神树和四灵变化后,没有重新计算宝物评分的问题 2021-11-03 15:16:48 +08:00
jiaoyangna 604b1d6819 神魂提交 2021-11-03 11:18:37 +08:00
jiaoyangna 0468c865db 神魂提交 2021-11-03 10:32:55 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
wangzhenxing 6092ce28c0 【战斗】=========处理战斗伤害记录不显示敌方主角 2021-11-02 20:19:36 +08:00
ZhangBiao 68f92b5bd0 【山河社稷图】提交 2021-11-02 18:56:45 +08:00
wangzhenxing 46fe5a1b8d 【战斗】======战斗结果显示主角伤害治疗修改 2021-11-02 18:00:31 +08:00
ZhangBiao 251a91b7fc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 17:45:28 +08:00
ZhangBiao 8a7ce09aa9 【山河社稷图】提交 2021-11-02 17:45:18 +08:00
gaoxin 15f2a8e424 【ID1010610】【魂印合成优化】选中材料后,切换合成目标不清除材料 2021-11-02 17:36:05 +08:00
ZhangBiao 8f2398c932 【山河社稷图优化】优化选关界面操作 2021-11-02 17:22:42 +08:00
ZhangBiao 2fd25aced5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 16:59:15 +08:00
ZhangBiao 81dadae61f 【界面优化】提交 2021-11-02 16:58:48 +08:00
gaoxin d43b8282ec 【ID1010611】【装备合成优化】合成装备后,下方的装备列表不再重置回默认位置 2021-11-02 16:57:19 +08:00
gaoxin 44415cfded 【坐骑】获取新坐骑,点击前往,展示新坐骑 2021-11-02 16:42:36 +08:00
ZhangBiao 99fd74ec10 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 16:24:19 +08:00
ZhangBiao f12a83ec53 【山河社稷图优化】关卡编队界面显示三星条件(主关卡)和特殊要求(副关卡) 2021-11-02 16:24:01 +08:00
gaoxin eef70d053d 【坐骑】解锁的放前面 2021-11-02 15:53:42 +08:00
ZhangBiao 672fcaf974 【界面优化】魂印图鉴界面 2021-11-02 15:14:19 +08:00
wangzhenxing bc37810f8b 【玉虚论道】=====修改对战完 点击确定主城列表不刷新问题 2021-11-02 14:43:47 +08:00
ZhangBiao 9303bfc856 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 14:31:30 +08:00
ZhangBiao b634ce0d87 【界面优化】提交 2021-11-02 14:31:18 +08:00
jiaoyangna 9e422d1772 玲珑宝镜修改提交
(cherry picked from commit eef7fbacdf)
2021-11-02 14:21:32 +08:00
jiaoyangna eef7fbacdf 玲珑宝镜修改提交 2021-11-02 14:20:27 +08:00
ZhangBiao 0e5e559220 【界面优化】法宝归元 2021-11-02 13:52:48 +08:00
ZhangBiao f97de03d43 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 13:41:39 +08:00
ZhangBiao 1e203c822c 【界面优化】好感度,天枢密卷 2021-11-02 13:41:27 +08:00
wangzhenxing 673892008d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 13:33:47 +08:00
wangzhenxing 7331cdb7d0 【战斗】======灵兽技能检测方法初始化时清空, 战斗治疗数据记录修改 2021-11-02 13:33:35 +08:00
gaoxin 89162f6294 【GM】优化快速战斗结果显示 2021-11-02 13:31:13 +08:00
ZhangBiao 624e6ffe05 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 11:06:26 +08:00
ZhangBiao 68525db92e 【界面优化】提交 2021-11-02 11:06:13 +08:00
gaoxin 5c8186b8cd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-02 10:55:58 +08:00
gaoxin 2b9457139b 【GM】添加快速战斗GM 2021-11-02 10:55:50 +08:00
wangzhenxing 9fd4d332bd [玉虚论道]==============点击刷新敌方列表 偶先提示赛季结束修改 2021-11-02 10:52:48 +08:00
gaoxin 351e51eb0b 【灵兽】修复巨鲲获取界面文字遮挡 2021-11-02 10:26:26 +08:00
jiaoyangna a41765d10b 神魂提交 2021-11-02 10:20:17 +08:00
ZhangBiao 8a9d52656f 【界面优化】山河社稷图、仙缘汇聚箱 2021-11-02 09:29:07 +08:00
wangzhenxing a55388942b 【战斗】=========追加的技能显示皮肤的特效 2021-11-01 19:22:48 +08:00
jiaoyangna e049612d3a Merge branch '0功能/神魂' of http://60.1.1.230/gaoxin/JL_Client into 0功能/神魂 2021-11-01 19:12:18 +08:00
jiaoyangna 681f8d5a57 神魂提交 2021-11-01 19:11:59 +08:00
gaoxin 0c1044ab67 Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
This reverts commit d2c8daffce.
2021-11-01 18:59:21 +08:00
gaoxin 5044a79789 Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489.
2021-11-01 18:59:11 +08:00
zhangshanxue 2901a60489 Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392.
2021-11-01 18:53:54 +08:00
zhangshanxue d2c8daffce Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
This reverts commit 87210b9d73.
2021-11-01 18:53:39 +08:00
gaoxin de87e6bb56 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-01 17:47:47 +08:00
gaoxin e1381636e1 【坐骑】修复展示界面不居中 2021-11-01 17:47:35 +08:00
ZhangBiao 87210b9d73 【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法 2021-11-01 17:21:59 +08:00
ZhangBiao cdc5b5854b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-01 16:20:40 +08:00
ZhangBiao 75827dc392 【界面优化】心魔试炼、战斗统计、法宝进阶 2021-11-01 15:36:40 +08:00
wangzhenxing e1e2f1f663 [玉虚论道]=======结算期战斗添加屏蔽 2021-11-01 10:53:11 +08:00
DESKTOP-98AVA47\Administrator 689522120c [战斗]============山河社稷图 星级检测条件修改 之前放逐的不会判断进人数 2021-11-02 06:42:19 +08:00
gaoxin 0c81ddfefe 【周卡】停留在周卡界面跨天时刷新界面显示 2021-10-29 18:27:23 +08:00
gaoxin 487a2c0a6f 【周卡】修复掉落参数错误 2021-10-29 18:12:32 +08:00
gaoxin d23318b53d 【周卡】红点添加,协议修改,推送逻辑添加 2021-10-29 16:43:53 +08:00
wangzhenxing 3815dc0ff3 [战斗]=======灵兽技能触发机制修改 2021-10-29 15:50:17 +08:00