Commit Graph

4682 Commits (c6286f1834fca952525ab6bdb7f47e31ac6d68d3)
 

Author SHA1 Message Date
zhangshanxue f0bda1ef52 死循环 2020-10-02 02:22:11 +08:00
zhangshanxue 72256d2370 死循环 2020-10-02 01:00:48 +08:00
lvxinran 838db384fd 迷宫达人修改 2020-10-17 23:21:38 +08:00
lvxinran 166b93b3f7 邮件本地化提交 2020-10-01 00:55:09 +08:00
lvxinran 2f45a0710a 车迟斗法 记录修改 2020-12-07 15:37:41 +08:00
lvxinran 9016e7a36d 本地化消息修改 2020-12-07 02:10:34 +08:00
lvxinran 07dcdbb7c3 本地化系统消息 2020-12-07 01:56:43 +08:00
lvxinran e79d844eec 系统公告本地化修改 2020-12-06 08:57:25 +08:00
DESKTOP-98AVA47\Administrator c9e04ee252 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-10-01 00:23:35 +08:00
lvxinran b5b616016a 技能修改再次提交 2020-11-25 11:03:16 +08:00
lvxinran 4419d44283 上报数据 报空修改 2020-11-24 14:05:32 +08:00
lvxinran 4dd8ad89d9 灵兽宝阁打点 2020-11-24 13:49:03 +08:00
lvxinran 452b929053 宝物合成打点修改 2020-11-23 21:34:24 +08:00
lvxinran 8ee35244fb 暂时改回上个版本 2020-11-23 21:30:25 +08:00
lvxinran b3222d42b3 删除无用代码 2020-11-23 21:27:47 +08:00
DESKTOP-98AVA47\Administrator 5b660609f4 社稷大典提交 2020-10-01 00:23:25 +08:00
zhangshanxue adb2c8d9c9 成长基金报错 2020-09-30 14:12:02 +08:00
zhangshanxue 10d97f1de4 成长基金报错 2020-09-30 13:25:38 +08:00
lvxinran 0e8b31c1a7 森罗环境修复 2020-09-27 20:54:41 +08:00
lvxinran dee3658f2f 下一层校验 2020-09-27 20:05:11 +08:00
lvxinran dc59c1f768 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-26 18:36:20 +08:00
zhangshanxue 935131223e Merge branch 'master_online_hw' into master_test_hw 2020-09-27 18:19:02 +08:00
zhangshanxue 9186cfc5dc Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-09-27 18:03:51 +08:00
zhangshanxue c7e179ba55 网页支付过滤条件 2020-09-27 18:03:38 +08:00
lvxinran 1384cca3ee 云梦祈福修改 2020-09-26 18:36:08 +08:00
lvxinran 6fda647587 活动特权修复 2020-09-26 17:59:40 +08:00
lvxinran 742dfb5cbb 免费礼包修改 2020-09-26 15:00:05 +08:00
lvxinran 7c88b404c9 金额校验 2020-09-27 11:58:44 +08:00
lvxinran dc9665c93a 特权时间修改 2020-09-27 10:01:52 +08:00
lvxinran 45d15fec1f 宝物bug修改 2020-09-27 10:01:35 +08:00
lvxinran 64ba0f5ac7 积天好礼发邮件修改 2020-09-25 16:19:53 +08:00
lvxinran 805ac98057 Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
2020-09-25 14:31:42 +08:00
lvxinran 5ec7abded1 森罗环境小怪重置刷新 2020-09-25 14:02:20 +08:00
lvxinran 647a31a16b 三界除魔提交,达人活动发奖异步 2020-09-25 13:57:09 +08:00
zhangshanxue 9ad1f39f5b Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-09-25 11:37:14 +08:00
lvxinran 716d2160de 天宫秘宝bug修改 2020-10-02 05:01:11 +08:00
zhangshanxue 02f957f54e 网页支付礼包限制 2020-09-25 11:37:04 +08:00
lvxinran b958742c74 三界活动 修改 2020-09-24 18:28:04 +08:00
zhangshanxue f24b25419a 热更表日志 2020-09-23 19:20:27 +08:00
zhangshanxue fc6c95fc22 Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-09-23 16:58:11 +08:00
lvxinran e73992d1d3 满级校验 2020-10-10 13:30:27 +08:00
zhangshanxue fe44a27b41 大闹天宫节点刷新bug 2020-09-23 16:58:00 +08:00
lvxinran 5ea0547673 三界提交 2020-09-23 01:34:58 +08:00
lvxinran 749f0aa253 青龙秘宝修改 2020-09-28 05:06:42 +08:00
lvxinran 16c9e3deac 达人活动添加 2020-09-23 16:08:00 +08:00
lvxinran 0dc8d8c5b8 天宫达人 2020-09-23 14:17:39 +08:00
lvxinran 175b75a796 免费礼包、达人活动提交 2020-09-25 11:44:36 +08:00
zhangshanxue c264817928 Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-09-22 18:17:15 +08:00
zhangshanxue 8788dba24e 公会bug 2020-09-22 18:16:40 +08:00
zhangshanxue 65602bd986 Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-09-21 21:00:46 +08:00