Commit Graph

4082 Commits (5d92af4aea1ad8b2469b641e6ec36214ed98f1f2)

Author SHA1 Message Date
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 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 56463b82bb 【漏提】 2021-05-27 15:20: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
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
gaoxin 3870a1cec6 【竞技场】在线跨0点,免费次数不刷 2021-05-27 11:43:27 +08:00
zhangqiang ac0feb82be 【bug】 2021-05-27 11:07:32 +08:00
gaoxin bccaf6557c 【巅峰赛】巅峰赛赛程界面报错 2021-05-27 11:04:44 +08:00
gaoxin 538c8d984e 【主界面】优化提示框层级问题 2021-05-27 10:47:04 +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
ZhangBiao 6677cac6d4 【主城】小人重复生成修复 2021-05-27 09:43:41 +08:00
ZhangBiao 5ce0867bd2 【修行】修行玩法里提升战力,排行榜战力刷新不及时 2021-05-27 09:28:10 +08:00
ZhangBiao 9d4ec4495d 【云游商人】无可替换装备时,去除二次弹窗,改为系统提示 2021-05-27 09:23:45 +08:00
ZhangBiao 913bc640cd 【修行】大入口有红点,里面没有可操作的东西 2021-05-26 21:09:07 +08:00
ZhangBiao 35acdf34ef Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 21:05:16 +08:00
ZhangBiao bc2c2eb916 【主城】主城小人,看不见自己, 2021-05-26 21:05:06 +08:00
zhangqiang 66c024eeae 【山河社稷图】bug 2021-05-26 20:47:41 +08:00
ZhangBiao e169ed3e9b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 20:31:18 +08:00
ZhangBiao 9ce432d885 【修行】神印未解锁不可查看 2021-05-26 20:31:01 +08:00
zhangqiang dbee1bef07 【山河社稷图】bug 2021-05-26 20:21:55 +08:00
zhangqiang aca4aa47ac 【音效修改】 2021-05-26 19:40:03 +08:00
ZhangBiao f7e8bd99b6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 18:32:14 +08:00
ZhangBiao 53703a8f2e 【修行】属性顺序 2021-05-26 18:32:03 +08:00
zhangqiang cf8fb5f147 【山河社稷图】bug 2021-05-26 17:24:58 +08:00
ZhangBiao d799a102dc 【灵兽推送礼包】主城没入口 2021-05-26 17:10:55 +08:00
ZhangBiao c9748421e9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 17:04:03 +08:00
ZhangBiao e242e08b01 【名字颜色修改】 2021-05-26 17:03:42 +08:00
wangzhenxing b7eaf9a65a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 16:03:40 +08:00
wangzhenxing d821836909 福利红包修改提交 2021-05-26 16:03:28 +08:00
zhangqiang 945ee5a968 【bug提交】 2021-05-26 15:47:29 +08:00
zhangqiang 9322a8489a 【提交】 2021-05-26 14:59:25 +08:00
ZhangBiao bc3c24c6b8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 14:44:49 +08:00
ZhangBiao f186f29646 提交 2021-05-26 14:44:22 +08:00
gaoxin c5c3672a65 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 14:16:58 +08:00
ZhangBiao 1e495ac6db Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 13:48:42 +08:00
ZhangBiao b526f58bc3 【主界面】右上角调整 2021-05-26 13:48:33 +08:00
gaoxin 739ded2b11 【sdk】删除多余的字段 2021-05-26 13:44:39 +08:00
gaoxin 0583113fb8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 13:40:30 +08:00
gaoxin 4d934cc63c 【GM】位置移动 2021-05-26 13:40:08 +08:00
ZhangBiao 51576888a2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 11:53:54 +08:00