Commit Graph

5077 Commits (a720fca31c0cc97a54851075a208775a7ec9795e)

Author SHA1 Message Date
duhui a720fca31c 四灵 2021-08-31 11:09:18 +08:00
duhui 19c3a04559 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into dev_dh_fourSpirit2 2021-09-02 15:17:00 +08:00
duhui fed17b2767 获取好友信息报错,兼容 2021-09-02 11:55:59 +08:00
duhui 92defedfc4 Merge branch 'dh_dev_webpay' into master_test_gn 2021-08-27 16:11:51 +08:00
duhui 605b2e9952 公会推荐分页 2021-08-27 16:00:31 +08:00
duhui 170796f61d 添加功能开启条件验证 2021-08-27 15:59:33 +08:00
duhui a4d388f092 功能开关,条件判断 2021-08-27 15:47:11 +08:00
duhui f5688ef3a5 无用代码 2021-08-27 15:17:46 +08:00
duhui d4fbda936b 网页支付,青龙秘宝 2021-08-27 14:44:44 +08:00
duhui 839e2a6fac 网页支付,缥缈之旅 2021-08-27 11:58:04 +08:00
duhui 2d12976dc4 四灵编队 2021-08-27 11:47:26 +08:00
xuexinpeng 3c15f4b049 bug:云游商人次数 挑战山河社稷宝箱不算挑战 2021-08-27 11:36:02 +08:00
duhui d3098bfa67 网页支付,青龙战令特殊处理 2021-08-27 11:33:17 +08:00
duhui 645352464e 网页支付,豪华基金问题处理 2021-08-26 18:25:56 +08:00
duhui 161d7ff900 罗浮争锋,排行榜头像问题处理 2021-08-26 17:55:27 +08:00
duhui 7f5a0d7432 Merge branch 'dh_dev_webpay' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-08-26 17:54:51 +08:00
duhui abd7351a15 网页支付,不开的活动删除购买礼包 2021-08-26 17:45:50 +08:00
duhui 275f8976b3 去除功能报错日志 2021-08-26 14:19:44 +08:00
duhui d5fb23c220 网页支付 2021-08-26 11:11:30 +08:00
duhui e777765c9e 四灵试炼,老玩家开活动 2021-08-26 10:04:23 +08:00
duhui 12e8e10fd6 代码优化 2021-08-27 16:43:51 +08:00
duhui bd442dce22 网页支付,公会红包 2021-08-25 18:17:39 +08:00
duhui a298850c48 网页支付 2021-08-25 17:32:14 +08:00
duhui c7e2243818 网页支付,礼包优化 2021-08-27 16:51:48 +08:00
xuexinpeng 5c9c7282e7 工会临时改成推荐20个 下个版本改成分页 2021-08-24 19:26:25 +08:00
duhui 48c0b940fe 十绝阵,不显示跨服 2021-08-27 16:58:36 +08:00
xuexinpeng f718f99b77 Merge branch 'master_test_gn' into master_prb_gn 2021-08-24 14:52:15 +08:00
duhui 5e561f5fcd 四灵试炼,代码合并 2021-08-24 13:40:29 +08:00
duhui 6e601e035a 规范 2021-08-31 11:56:57 +08:00
duhui 3b843d949b 四灵代码合并 2021-08-31 11:56:33 +08:00
xuexinpeng 936170391e 十绝阵每日刷新次数不重置 2021-08-24 11:05:21 +08:00
duhui e62e7a4ed9 日志更新 2021-08-20 21:31:46 +08:00
duhui c3f634740d 日志更新 2021-08-20 21:27:19 +08:00
duhui 5619ab66a1 日志 2021-08-20 21:19:29 +08:00
duhui d02218c3b0 在线奖励bug修改 2021-08-20 20:27:43 +08:00
xuexinpeng 299a608590 Merge branch 'master_test_gn_zf' into master_test_gn 2021-08-19 20:05:55 +08:00
xuexinpeng 77ba8534e3 删除无用代码 2021-08-19 20:04:34 +08:00
xuexinpeng 03ef898d14 首发邮件 2021-08-19 19:51:29 +08:00
xuexinpeng a128c5ea74 首发邮件更改 2021-08-19 17:00:48 +08:00
xuexinpeng 821d1425f6 注释:功能开关和礼包开关 后续优化 2021-08-19 15:46:16 +08:00
xuexinpeng 03672cd509 加个判空操作 2021-08-19 11:45:19 +08:00
duhui 08c8b779bc 网页支付 2021-08-18 17:34:11 +08:00
jiahuiwen f9ab39d529 修改参数 2021-08-17 18:31:58 +08:00
jiahuiwen 3efe09db22 检查代码 2021-08-17 18:00:45 +08:00
jiahuiwen 461de0b494 参数调整 2021-08-17 17:56:44 +08:00
xuexinpeng bec145d577 注释掉寻宝迷踪 2021-08-16 18:35:43 +08:00
xuexinpeng 35c0be054c log测试 2021-08-16 18:11:08 +08:00
xuexinpeng d517f05b82 Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-08-16 14:40:38 +08:00
duhui b30ca90cec 关闭跨服十绝阵 2021-08-16 14:12:15 +08:00
duhui be862b5e17 mongo配置修改 2021-08-16 11:28:35 +08:00