Commit Graph

12057 Commits (a797e80b39ee25ea31d038df3605042a8e6eaacc)
 

Author SHA1 Message Date
jiaoyangna fe4c807633 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 16:41:45 +08:00
jiaoyangna 1515c59bac 法宝聚灵添加白金 2022-01-13 16:41:23 +08:00
gaoxin 70d753cce5 极速探索按钮颜色调整 2022-01-13 16:41:12 +08:00
ZhangBiao f043b3e62f Merge branch 'china/dev' into 0优化/玩家信息界面拓展 2022-01-13 16:04:36 +08:00
ZhangBiao 898f88a0b9 【寻仙招募】修改奖励显示内容 2022-01-13 16:03:20 +08:00
ZhangBiao 2599afd6de 【寻仙招募】心愿选飞升石,查看奖励报错 2022-01-13 15:28:09 +08:00
ZhangBiao 36b475ee15 【玩家信息】增加额外属性 2022-01-13 15:23:59 +08:00
lihaiyang 228efd4109 4个法宝图标 2022-01-13 15:17:17 +08:00
jiaoyangna a4848406b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 14:00:28 +08:00
jiaoyangna 0e8e6e1874 探索修改提交 2022-01-13 13:59:15 +08:00
gaoxin 8351aba49c 【战斗】我方buff显示位置修改 2022-01-13 13:56:08 +08:00
lihaiyang be545631ad Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 13:36:50 +08:00
lihaiyang 8aef1e33ed 被动图标 2022-01-13 13:27:30 +08:00
gaoxin 455cdcd19c 【日常副本】列表动画添加 2022-01-13 12:04:22 +08:00
gaoxin 4ffae70799 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 11:39:15 +08:00
gaoxin 1c5736bbad 【动画】部分界面动画优化 2022-01-13 11:39:02 +08:00
gaoxin db279baaf7 【跨服战】尝试修复打开跨服战报错 2022-01-15 07:36:48 +08:00
gaoxin a30aa0df10 【家园】修复等级为0时查看神将信息报错 2022-01-15 07:22:52 +08:00
jiaoyangna 07534deff9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-13 11:18:28 +08:00
jiaoyangna 8b4533aac9 一键探索调整编队后探索地图修改提交 2022-01-13 11:17:18 +08:00
wangzhenxing a16b592892 [飞升]=========飞升优化修改 2022-01-13 10:01:22 +08:00
ZhangBiao 48901f3817 【寻仙招募】心愿单中添加飞升石道具 2022-01-12 18:27:16 +08:00
wangzhenxing cd1b81c03e [飞升]======飞升修改提交 2022-01-12 17:29:52 +08:00
wangzhenxing ff7b7ba5ed [飞升]=====bug修改提交 2022-01-12 16:41:51 +08:00
ZhangBiao 1e8cceea57 【家园】特效层级修改 2022-01-12 15:55:24 +08:00
ZhangBiao a74799caea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 15:38:45 +08:00
ZhangBiao f131da8558 【方寸寻宝】点击自选箱显示详细信息 2022-01-12 15:38:31 +08:00
jiaoyangna 05e078dadc 探索引导修改提交 2022-01-12 15:27:35 +08:00
jiaoyangna 1e1e697ba4 预设漏提 2022-01-12 14:40:28 +08:00
jiaoyangna 6cc1b55503 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 14:36:43 +08:00
jiaoyangna 0b4cfe3a74 点击技能切换修改 2022-01-12 14:35:27 +08:00
ZhangBiao 6d29d5dce2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 14:28:26 +08:00
ZhangBiao 373ae35652 【家园】详情位置修改 2022-01-12 14:28:14 +08:00
jiaoyangna bde65d0ecf 森罗幻境累计奖励修改提交 2022-01-12 13:49:16 +08:00
jiaoyangna 82421e45bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-12 13:38:59 +08:00
jiaoyangna 93fda69ff5 升级突破状态显示错误修改 2022-01-12 13:37:39 +08:00
ZhangBiao d0fb035a19 【家园】提交弹框背景 2022-01-11 18:23:08 +08:00
ZhangBiao 60c31c1d5b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 18:20:19 +08:00
ZhangBiao 617a557071 【家园】修改按钮 2022-01-11 18:20:12 +08:00
ZhangBiao 9826244e7e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 18:19:02 +08:00
ZhangBiao 8d82a962a6 【家园】特效提交 2022-01-11 18:18:41 +08:00
wangzhenxing 039f9a3deb [图鉴]======图鉴修改提交 2022-01-11 18:11:13 +08:00
ZhangBiao 9f8ee231ac 【装备界面】排行榜数据错误修改 2022-01-11 17:51:56 +08:00
zhangshanxue 18c1ef2de1 【物品】浮生门物品资源路径需修改 2022-01-14 17:23:40 +08:00
ZhangBiao 41dc638b32 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 16:44:52 +08:00
ZhangBiao e9d69353e0 【家园】建筑点击无效修改 2022-01-11 16:44:37 +08:00
lihaiyang 066d55fcc1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-11 16:38:11 +08:00
lihaiyang 2a47ffda3f 替换两个图标 2022-01-11 16:33:50 +08:00
jiaoyangna f943824ae9 共鸣中修改提交 2022-01-11 15:40:22 +08:00
jiaoyangna a01485ebab 资源提交 2022-01-11 15:36:17 +08:00