Commit Graph

11812 Commits (8d82a962a6ae92326df779a0992b6b37fc0222fd)
 

Author SHA1 Message Date
ZhangBiao 8d82a962a6 【家园】特效提交 2022-01-11 18:18:41 +08:00
ZhangBiao 68a2995780 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 11:29:54 +08:00
gaoxin c984a101ac Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-14 09:47:24 +08:00
gaoxin 1d3f9ad425 【四灵编队】开始战斗报错 2022-01-14 09:47:18 +08:00
gaoxin d67f8cd2fa 【云梦豪礼】添加198裆位 2022-01-13 17:34:51 +08:00
ZhangBiao f94e79b6e2 【百宝商会】新增跳转 2022-01-11 11:29:43 +08:00
ZhangBiao c40be4411d 【家园】特权时间显示跳帧 2022-01-10 18:22:20 +08:00
ZhangBiao 893a8dd10b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 17:38:20 +08:00
ZhangBiao 567f5c1aa0 【家园】升级倒计时显示错误修改 2022-01-10 17:38:02 +08:00
ZhangBiao fa5d4001a2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 17:24:50 +08:00
ZhangBiao cc3791e0d5 【家园】修改到达上线提示文字、红点修改 2022-01-10 17:24:39 +08:00
jiaoyangna 2ef2c0d82e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 16:59:42 +08:00
jiaoyangna 62d30279c3 资源提交 2022-01-10 16:59:19 +08:00
ZhangBiao 5b796d8246 【命格】红点显示不正确 2022-01-10 15:48:38 +08:00
ZhangBiao 6b2860c5f4 【命格】获得命石后,有可穿戴入口没红点 2022-01-10 15:38:20 +08:00
ZhangBiao 2455410a0c 【命格】镶嵌按钮显示穿戴 2022-01-10 15:29:37 +08:00
ZhangBiao 0a947e37a2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 15:23:12 +08:00
ZhangBiao 7e96ae056f 【连购礼包】顺序错误修改 2022-01-10 15:23:02 +08:00
gaoxin 4f321a8b4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 15:06:33 +08:00
gaoxin 6ddd4c543f 【修为】修为点击问号,弹出鬼畜动画,当前是元婴期 2022-01-10 15:06:16 +08:00
ZhangBiao 3e11f70576 【云游商人】选择升级的装备,显示可以选择全部 2022-01-10 14:56:50 +08:00
gaoxin c795995bf6 【心魔试炼】奖励按钮显示错误 2022-01-10 14:33:20 +08:00
jiaoyangna 018b4f9eeb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-10 13:36:11 +08:00
jiaoyangna 17615c95b8 法宝聚灵文字修改 2022-01-10 13:35:40 +08:00
ZhangBiao bb343cdcc5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 17:49:14 +08:00
ZhangBiao 244c8050e0 【装备】装备界面套装属性显示不正确修改 2022-01-08 17:49:04 +08:00
jiaoyangna 0281564bb3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 17:47:38 +08:00
jiaoyangna a0baa2e1c0 法宝聚灵增加星级加成 2022-01-08 17:47:18 +08:00
gaoxin 0a4c24520c 【编队筛选】红叉资源替换 2022-01-08 15:03:06 +08:00
gaoxin e12ddf56c6 【编队筛选】修复呼吸闪烁 2022-01-08 14:50:34 +08:00
gaoxin 2a630a8c25 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-08 14:23:59 +08:00
gaoxin a4bd6fb441 【日常】修复动画导致成就显示异常 2022-01-08 14:23:44 +08:00
ZhangBiao 129250110f 【建木神树】满级取消箭头 2022-01-08 14:22:30 +08:00
ZhangBiao 9098900dc7 【建木神树】提交 2022-01-08 11:54:31 +08:00
ZhangBiao c157985e24 【建木神树】调整 2022-01-08 11:36:31 +08:00
ZhangBiao e4a5f213e8 【建木神树】显示调整 2022-01-08 11:17:26 +08:00
ZhangBiao 94cf5e4aec 【建木神树】提交 2022-01-08 10:33:31 +08:00
ZhangBiao 314cc59bbc 【建木神树】提交 2022-01-07 19:39:58 +08:00
ZhangBiao 3d7b866229 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 19:34:22 +08:00
ZhangBiao 334ba9bd19 【建木神树优化】界面中可预览当前神应属性和下级增加属性 2022-01-07 19:34:07 +08:00
gaoxin 720d42f129 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 18:28:10 +08:00
gaoxin 2ad247d4f9 【神将筛选】职业图标更新 2022-01-07 18:27:57 +08:00
ZhangBiao 35aa32fe32 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 18:22:38 +08:00
ZhangBiao f3e9d3b2a5 【云游商人】顺序修改 2022-01-07 18:22:23 +08:00
gaoxin 963591b530 【动画】修复动画导致部分列表显示错误 2022-01-07 18:21:10 +08:00
jiaoyangna 9e8ff1942f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-07 16:46:46 +08:00
jiaoyangna f45ec94ea5 血条位置修改提交 2022-01-07 16:46:25 +08:00
gaoxin 34e90db4fd 【编队删选】添加职业筛选效果,高亮效果颜色修改 2022-01-07 16:40:31 +08:00
wangzhenxing ac0718f8b8 [战斗]======御甲叠加逻辑修改 2022-01-07 14:19:24 +08:00
jiaoyangna 62f7222e1b 法宝聚灵界面修改提交 2022-01-07 14:03:55 +08:00