Commit Graph

6587 Commits (5031f7d9e8cbbae74a535d40f1f0afa917d53edf)
 

Author SHA1 Message Date
xuexinpeng 82dde4cdb8 森罗幻境自动挂机奖励展示 2021-12-31 10:36:32 +08:00
xuexinpeng 188ea389e6 森罗幻境自动挂机奖励展示 2021-12-30 18:19:24 +08:00
yuanshuai c3553579e2 新增被动技能注释 2021-12-30 17:40:47 +08:00
duhui 6cbd8104e7 云游商人,装备升级逻辑修改 2021-12-30 17:09:45 +08:00
yuanshuai 8ac39917af 牛魔王4火不生效bug修改(添加了一个被动技能) 2021-12-30 16:23:13 +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
jiahuiwen 973c2b9ce8 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-12-28 15:24:45 +08:00
jiahuiwen bf85dfec3c 超值返利删除容错代码 2021-12-28 15:24:37 +08:00
DESKTOP-98AVA47\Administrator 97bd55af89 跨服战斗,身外化身技能 2021-12-28 15:21:14 +08:00
xuexinpeng 3c5f29e2e5 探索 测试 不扣消耗 2021-12-28 14:33:23 +08:00
xuexinpeng 6b07593757 探索 2021-12-27 18:36:31 +08:00
jiahuiwen 71eb51d017 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 17:18:57 +08:00
jiahuiwen 89f4eae73e 删除多余代码 2021-12-27 17:18:31 +08:00
jiahuiwen 313053ed5d 神将回退突破等级归 0 2021-12-27 17:17:56 +08:00
jiahuiwen 811d67c536 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 17:00:18 +08:00
jiahuiwen 7ebd8878de 神将回退卸下魂印bug 2021-12-27 16:55:11 +08:00
xuexinpeng 87bcc6d5d7 探索 2021-12-27 16:33:32 +08:00
yuanshuai 6faac1d034 超值返利网页支付bug修改 2021-12-27 16:24:46 +08:00
jiahuiwen 5820b43cae Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 16:13:47 +08:00
jiahuiwen ac30e70c2e 神将回退bug 2021-12-27 16:11:51 +08:00
jiahuiwen 5f04e68e3d 神将回退bug 2021-12-27 16:09:56 +08:00
jiahuiwen 9c998b86e6 Merge branch 'master_test_gn_zf' into master_test_gn 2021-12-27 16:01:30 +08:00
jiahuiwen 4ee0f7b5f2 神将回退bug 2021-12-27 15:57:09 +08:00
jiahuiwen ecd017281d 神将回退增加上报 2021-12-27 14:25:21 +08:00
jiahuiwen b88a69ef3a 减少玩家数据在内存时间 2021-12-27 10:25:35 +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