Commit Graph

6673 Commits (fd8d35fabba613ca0cd26a3baf893a6c203b7643)
 

Author SHA1 Message Date
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
gaoxin 0ca658e6a4 【资源】新增法宝,物品资源 2021-05-27 17:16:30 +08:00
gaoxin 8bdf3b73bd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:53:10 +08:00
gaoxin 0ac40f3ce5 【战斗】精英副本战斗数据nodeId位置错误 2021-05-27 16:52:47 +08:00
zhangqiang fd964d842b 【提交】 2021-05-27 16:51:29 +08:00
gaoxin b25a6c01ff Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:51:20 +08:00
gaoxin 9b1a412eb8 【log】无用log删除 2021-05-27 16:50:49 +08:00
ZhangBiao 5d92af4aea Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:44:16 +08:00
ZhangBiao 905e66c471 【公会援助】名字颜色提交 2021-05-27 16:43:59 +08:00
gaoxin 33505d1758 【资源】排行榜再优化 2021-05-27 16:42:28 +08:00
gaoxin c8a8683be0 【山河社稷图】条件:5回合内打出8万伤害,如果我在第三回合打出7万伤害,第四回合直接秒杀怪物,面板总计造成12万伤害但是不给星星 2021-05-27 16:38:31 +08:00
gaoxin a1ba397b9c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 16:16:39 +08:00
gaoxin eaa3d5de88 【日常副本】跳过还原 2021-05-27 16:16:21 +08:00
zhangqiang ff837e338e 【山河社稷图小点】预设修改提交 2021-05-27 15:38:44 +08:00
jiaoyangna 5dc0ea68ab 无尽副本提交 2021-05-27 15:35:10 +08:00
zhangqiang 56463b82bb 【漏提】 2021-05-27 15:20:21 +08:00
jiaoyangna a9b52e6834 无尽副本修改提交 2021-05-27 15:16:46 +08:00
ZhangBiao 613a0744de 【资源】提交 2021-05-27 15:16:07 +08:00
ZhangBiao 25598e10d3 【音效】提交 2021-05-27 15:11:00 +08:00
jiaoyangna 7779c1dbb1 无尽副本修改提交 2021-05-27 15:04:21 +08:00
gaoxin 417a46815f 【日常副本】资源替换 2021-05-27 14:56:18 +08:00
ZhangBiao a6512d2778 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:44:59 +08:00
ZhangBiao f832ecfc33 【修行】玩家信息界面显示的神印图标,在一行和两行的玩家之间切换,有遮挡 2021-05-27 14:44:49 +08:00
zhangqiang 397d24ee32 【山河社稷图】胜利条件显示增加 2021-05-27 14:40:34 +08:00
gaoxin d552721b88 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:38:14 +08:00
gaoxin af1ec6472a 【资源】技能字优化 2021-05-27 14:38:09 +08:00
ZhangBiao 0c78275a6e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 14:09:51 +08:00
ZhangBiao e615af9011 【福星高照】bug修改 2021-05-27 14:09:39 +08:00
zhangqiang 0bcd6ade1f 【山河社稷图】bug + 资源 前端得刷资源 2021-05-27 14:06:20 +08:00
jiaoyangna 7d5ff8c3f1 设置按钮修改 2021-05-27 14:05:05 +08:00
gaoxin 19adbf944e 【每日礼包】资源修改 2021-05-27 14:02:53 +08:00
gaoxin 4a44d87c27 【测试】打包速度测试接口 2021-05-27 13:32:44 +08:00
gaoxin 3870a1cec6 【竞技场】在线跨0点,免费次数不刷 2021-05-27 11:43:27 +08:00
gaoxin f9b93995f7 【资源】侵权替换 2021-05-27 11:32:12 +08:00
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00
gaoxin 249dd957de Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 11:16:30 +08:00
gaoxin 97e771bb65 技能文字导入 2021-05-27 11:16:16 +08:00
zhangqiang ac0feb82be 【bug】 2021-05-27 11:07:32 +08:00
gaoxin bccaf6557c 【巅峰赛】巅峰赛赛程界面报错 2021-05-27 11:04:44 +08:00
gaoxin 20d671c61c 【打包工具】修复在pc平台报错的问题 2021-05-27 10:59:34 +08:00
gaoxin 538c8d984e 【主界面】优化提示框层级问题 2021-05-27 10:47:04 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
gaoxin 7a972628c3 Merge branch 'china/dev' into china/dev-c 2021-05-27 10:19:53 +08:00
gaoxin e68213828a 【混淆】关闭 2021-05-27 10:12:43 +08:00
gaoxin 49bef51ca0 【打包工具】 2021-05-27 10:12:22 +08:00
ZhangBiao e0a5d6d134 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 10:04:08 +08:00
ZhangBiao 7ddf0dd07f 【福星高照】按钮提交 2021-05-27 10:03:57 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
jiaoyangna b197244667 无尽副本修改提交 2021-05-27 09:46:56 +08:00
ZhangBiao 6677cac6d4 【主城】小人重复生成修复 2021-05-27 09:43:41 +08:00