Commit Graph

6519 Commits (f6ac2a88bd39adc43f7d3ca17cc885b421c0c949)
 

Author SHA1 Message Date
xuexinpeng f6ac2a88bd 探索时间戳进位 2021-12-31 17:33:31 +08:00
xuexinpeng 3b14b27161 探索 2021-12-31 14:03:07 +08:00
xuexinpeng 64df199aee 探索 2021-12-31 13:49:24 +08:00
xuexinpeng 16fc0ffbbb 离线探索 2021-12-30 13:34:34 +08:00
xuexinpeng bb1bea214f 探索 2021-12-30 10:26:22 +08:00
xuexinpeng f4f027c40c 探索 2021-12-29 18:24:24 +08:00
xuexinpeng 35c2547c89 探索 2021-12-29 17:44:51 +08:00
xuexinpeng b816997e38 探索 2021-12-29 19:16:02 +08:00
xuexinpeng dae028d07f 探索 2021-12-29 19:05:13 +08:00
xuexinpeng 28e984d9e9 探索 2021-12-29 19:01:26 +08:00
xuexinpeng 4ea6f544cb 探索 2021-12-29 17:26:42 +08:00
xuexinpeng 5e811fb9aa 探索血量更新 2021-12-28 18:25:41 +08:00
xuexinpeng eab1eb0b89 探索 2021-12-28 18:02:46 +08:00
xuexinpeng 705e81c629 探索 2021-12-28 16:32:49 +08:00
xuexinpeng 3c5f29e2e5 探索 测试 不扣消耗 2021-12-28 14:33:23 +08:00
xuexinpeng 6b07593757 探索 2021-12-27 18:36:31 +08:00
xuexinpeng 87bcc6d5d7 探索 2021-12-27 16:33:32 +08:00
xuexinpeng 8f0010b1be Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2021-12-27 10:04:54 +08:00
xuexinpeng 6a6cbaca50 探索 2021-12-27 10:02:59 +08:00
jiahuiwen c6d13b6685 Merge branch 'master_test_gn' into master_prb_gn 2021-12-24 17:52:59 +08:00
jiahuiwen 4132cd1f80 删除无用代码 2021-12-24 17:52:09 +08:00
jiahuiwen 8f47418546 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-24 13:55:10 +08:00
jiahuiwen 0602b9f003 逐胜商店刷新错误 2021-12-24 13:55:03 +08:00
xuexinpeng b9cc3dec5f 探索 2021-12-24 11:29:51 +08:00
yuanshuai 93596965dd 超值返利网页支付重复购买礼包问题修改 2021-12-24 09:49:28 +08:00
yuanshuai 540e61d512 超值返利网页支付bug修改 2021-12-23 16:05:15 +08:00
yuanshuai 5cedfa6e4e 命石快速合成bug修改 2021-12-23 15:14:43 +08:00
yuanshuai 9b545e5eea Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
2021-12-23 09:53:52 +08:00
xuexinpeng 503ef57f57 探索 2021-12-22 18:04:05 +08:00
jiahuiwen 7ae3da6636 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-22 10:55:57 +08:00
jiahuiwen a9df7aa7e0 返还道具bug 2021-12-22 10:54:44 +08:00
jiahuiwen a800bb8249 觉醒将返还道具bug 2021-12-22 10:44:46 +08:00
xuexinpeng 49811877fa 战斗星级 2021-12-21 19:07:26 +08:00
xuexinpeng e683d993d5 探索 战斗 2021-12-21 19:04:56 +08:00
jiahuiwen 90e98f6355 int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度 2021-12-21 17:48:01 +08:00
xuexinpeng 9253e775f0 探索 2021-12-21 16:46:24 +08:00
xuexinpeng db7dbb84c2 探索 2021-12-23 17:19:54 +08:00
jiahuiwen d3b35d55d0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-21 10:50:52 +08:00
DESKTOP-98AVA47\Administrator 8aba14dbe2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-23 19:13:48 +08:00
DESKTOP-98AVA47\Administrator 5421882672 补充 2021-12-23 19:13:39 +08:00
DESKTOP-98AVA47\Administrator 9b6f5a8e0c 获取活动开启时间 2021-12-23 19:01:57 +08:00
jiahuiwen bd15f69616 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2021-12-21 10:50:43 +08:00
jiahuiwen cf91ff167b Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-21 09:55:23 +08:00
jiahuiwen a97bca5c9b 升星配方调整补偿 2021-12-21 09:55:12 +08:00
yuanshuai b473c1a6ca 旧版积天豪礼bug修改 2021-12-20 18:52:08 +08:00
xuexinpeng 048c240cb4 礼包刷新 2021-12-23 17:21:26 +08:00
jiahuiwen fb5036ea29 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-20 11:51:23 +08:00
xuexinpeng a7ff90e6a7 规范代码 2021-12-29 00:03:50 +08:00
jiahuiwen 2596eb08b9 2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务 2021-12-20 11:51:13 +08:00
xuexinpeng d9e9f378ef Merge branch 'master_test_gn' into master_test_gn_xxp 2021-12-20 11:31:19 +08:00