Commit Graph

5752 Commits (79fb3ef29fee2dc2c8b11f4708d43de5bfac7cc7)
 

Author SHA1 Message Date
ZhangBiao dc03b46855 【踏碎凌霄】活动界面提交 2021-04-27 22:26:36 +08:00
jiaoyangna 88f9e83e1c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 22:25:16 +08:00
jiaoyangna 58e6a0a554 剧情提交
(cherry picked from commit f43cd38a73)
2021-04-27 22:21:46 +08:00
jiaoyangna f43cd38a73 剧情提交 2021-04-27 22:21:14 +08:00
wangzhenxing d2a7fdcee1 天尊降世活动资源提交 2021-04-27 22:16:42 +08:00
ZhangBiao dfb0a68f2c 【踏碎凌霄】资源提交 2021-04-27 21:45:04 +08:00
ZhangBiao 5401776a8d 【踏碎凌霄】界面显示调整 2021-04-27 21:28:48 +08:00
ZhangBiao 4e0b5a9033 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 21:17:51 +08:00
ZhangBiao 8e72485e7b 【累计充值】资源替换 2021-04-27 21:17:42 +08:00
zhangqiang 85136a4cc9 【逍遥游】奖励预览,跳转出去,再返回,奖池不显示道具 2021-04-27 21:17:35 +08:00
zhangqiang 8db10cf7eb 【神衣天降】购买次数显示修改 2021-04-27 21:09:29 +08:00
gaoxin 2be2ba92dd 【七天狂欢】偶现报错 2021-04-27 20:56:09 +08:00
gaoxin 9b4ce2d96a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:53:42 +08:00
gaoxin 3616fba4fb 【副本banner】还原 2021-04-27 20:53:32 +08:00
zhangqiang a46c7f3413 【恭喜获得修改】 2021-04-27 20:48:45 +08:00
jiaoyangna b52e90c96a Merge branch 'china/dev' into china/dev-c 2021-04-27 20:46:12 +08:00
jiaoyangna dd90a200c3 剧情提交 2021-04-27 20:45:03 +08:00
gaoxin 3640a17c22 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:44:56 +08:00
gaoxin 6d38527065 【云游商人】排序错误 2021-04-27 20:44:45 +08:00
ZhangBiao 407750afd5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:35:37 +08:00
ZhangBiao 833473f334 【踏碎凌霄】恭喜获得无奖励提示 2021-04-27 20:35:27 +08:00
gaoxin 923034957e Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:26:15 +08:00
gaoxin 1e7142008c 【云游商人】选中武器点确定,再选中护甲点取消,最后合成的是护甲 2021-04-27 20:26:10 +08:00
jiaoyangna fd9084da86 关掉挂机打怪的声音 2021-04-27 20:18:26 +08:00
ZhangBiao b695224100 【商店刷新】商店刷新时间错误 2021-04-27 20:18:18 +08:00
ZhangBiao a69e92bc75 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 20:03:48 +08:00
ZhangBiao c24e7504cb 【恭喜获得】点击面板也可关闭 2021-04-27 20:03:37 +08:00
jiaoyangna ccaab65e25 剧情提交 2021-04-27 19:51:40 +08:00
gaoxin a5b8dc1de9 【Log】删除一个停不下来的Log 2021-04-27 18:16:46 +08:00
gaoxin 8be0dd71f0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 18:02:56 +08:00
gaoxin 68626e287e 【踏碎凌霄】奖励排序 2021-04-27 18:02:51 +08:00
zhangqiang f20c58dc96 【公会援助】 每次点击援助,列表都会重新置顶显示----3 2021-04-27 17:56:55 +08:00
zhangqiang 4cbb65c73b 【超值基金】买两次 尝试修复 2021-04-27 17:53:15 +08:00
ZhangBiao 90fd541e99 【限时活动】删除timer 2021-04-27 17:50:26 +08:00
ZhangBiao 39f2f06563 【限时活动】调整 2021-04-27 17:05:53 +08:00
wangzhenxing 5937fc3493 等级推送礼包预设修改 2021-04-27 16:51:58 +08:00
ZhangBiao c88bda25c7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:46:50 +08:00
ZhangBiao 6f17dbd874 【恭喜获得】报错 2021-04-27 16:46:39 +08:00
gaoxin b9f742fcf2 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:46:13 +08:00
gaoxin 3775b6ae86 【网络】消息id打印位置修改 2021-04-27 16:46:02 +08:00
ZhangBiao 6b26846677 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:37:17 +08:00
ZhangBiao 87b94c283a 【恭喜获得】奖励叠加 2021-04-27 16:37:03 +08:00
wangzhenxing 2d87367728 副本入口图片位置修改提交 2021-04-27 16:31:32 +08:00
gaoxin 2a107e99cb 【红点】关闭一些重复注册的红点 2021-04-27 16:30:08 +08:00
gaoxin dc12373d06 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:25:19 +08:00
gaoxin 67ddcedfa2 【网络】socket 报错 2021-04-27 16:25:09 +08:00
zhangqiang 9f69ba9d7c 【新的协议】 2021-04-27 16:23:25 +08:00
jiaoyangna f658dcaf66 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-27 16:19:31 +08:00
jiaoyangna 5b9b72fea5 资源提交
(cherry picked from commit 059c9940cc)
2021-04-27 16:19:20 +08:00
gaoxin ef856fd534 【网络】当后端推送未注册的indication时,进行错误提示 2021-04-27 16:17:58 +08:00