Commit Graph

6430 Commits (93993d8150717f6939a52ad48cafb2b2ce280497)
 

Author SHA1 Message Date
jiahuiwen 9d90b6b6bf 获取服务器id错误 2021-11-17 10:32:17 +08:00
jiahuiwen d117d99b8a Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-11-17 09:37:56 +08:00
jiahuiwen ecbed9777d Merge branch 'master_prb_gn' into master_test_gn_zf 2021-11-17 09:37:14 +08:00
duhui 457649facd Merge branch 'master_test_gn_zf' into master_prb_gn 2021-11-17 09:37:01 +08:00
jiahuiwen dbfd1588c4 增加null判断 2021-11-17 09:34:39 +08:00
duhui e6bafcd98b Merge branch 'master_test_gn' into master_prb_gn 2021-11-30 15:47:05 +08:00
duhui c5de1c8ce5 Receive类型礼包购买条件类型修改 2021-11-30 15:46:46 +08:00
duhui 849f0d4d52 报错 2021-11-17 08:59:12 +08:00
duhui a52e39292d 魂宝灵宝二改 2021-11-17 08:52:43 +08:00
duhui fbb977b360 魂宝灵宝强转问题 2021-11-17 08:31:25 +08:00
jiahuiwen c9f0841176 Merge branch 'master_prb_gn' into master_test_gn_zf
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java
2021-11-16 13:07:12 +08:00
duhui 1e166894d2 跨服旧数据兼容 2021-11-15 10:20:30 +08:00
DESKTOP-98AVA47\Administrator e341f52da6 车迟斗法挑战记录bug修改 2021-11-14 15:21:49 +08:00
xuexinpeng 9d4bfa19a5 跨服灵脉秘境 2021-11-23 19:06:17 +08:00
xuexinpeng d7c548f248 跨服灵脉秘境积分计算 2021-11-23 18:46:46 +08:00
xuexinpeng 0fd3f53795 跨服灵妙秘境 2021-11-22 17:59:49 +08:00
xuexinpeng 9e8a57674c 跨服灵脉秘境 2021-11-22 17:50:17 +08:00
xuexinpeng 1a60f70002 跨服灵脉秘境 2021-11-25 09:22:00 +08:00
jiahuiwen 33d8fd7746 优化日志 2021-11-22 14:40:11 +08:00
jiahuiwen 1c28ff4797 道具数量改long 2021-11-22 14:23:18 +08:00
jiahuiwen ad0654545b 7天未登录玩家,竞技场,不发奖励 2021-11-22 10:17:26 +08:00
duhui 7cda83d0f0 公会技能升级修改,道具数量改long 2021-11-22 09:52:24 +08:00
yuanshuai 7c536a5c08 添加法宝碎片道具类型 2021-11-19 18:15:08 +08:00
xuexinpeng 8615af222f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-18 18:00:22 +08:00
yuanshuai 889720d392 法宝聚灵技能修改 2021-11-19 16:42:33 +08:00
xuexinpeng 79b1ac3759 Merge branch 'master_test_gn' into master_test_gn_xxp 2021-11-18 17:58:34 +08:00
xuexinpeng 4785536487 跨服灵脉秘境挑战记录新加 2021-11-18 17:57:22 +08:00
yuanshuai fbf48a1903 Merge branch 'master_test_gn' into master_test_gn_fabao 2021-11-18 17:49:27 +08:00
yuanshuai 3614aa978a 法宝聚灵技能修改 2021-11-18 17:49:18 +08:00
xuexinpeng 55c463569c 跨服灵脉秘境1.先后手问题2.记录删除问题3.排行榜自己排名问题 2021-11-18 16:33:36 +08:00
yuanshuai dfa218d8ba 添加战中属性 2021-11-18 15:09:45 +08:00
xuexinpeng 01f4d79966 跨服灵脉秘境 2021-11-18 14:50:29 +08:00
xuexinpeng 96123a6d22 跨服灵脉秘境 2021-11-18 14:45:43 +08:00
xuexinpeng f0edb6f5b0 跨服灵脉秘境 2021-11-19 11:28:35 +08:00
xuexinpeng dc98b314ae 跨服灵脉秘境 2021-11-18 21:55:20 +08:00
xuexinpeng d4daed3d65 跨服灵脉秘境 2021-11-18 21:08:32 +08:00
xuexinpeng 1acf753951 跨服灵脉秘境 2021-11-18 18:27:33 +08:00
jiahuiwen dc30ecffb7 Merge branch 'master_prb_gn' into master_test_gn 2021-11-17 17:29:32 +08:00
xuexinpeng e7e12c7228 跨服灵妙秘境 2021-11-17 16:35:43 +08:00
jiahuiwen 0da78da3da 每秒执行线程,增加延迟启动 2021-11-17 16:08:20 +08:00
yuanshuai 782d39ab2d 法宝之魂共鸣技能相关代码修改 2021-11-17 14:48:00 +08:00
yuanshuai 661594c422 添加注释 2021-11-17 13:55:25 +08:00
jiahuiwen 8a5712fdb2 Merge branch 'master_prb_gn' into master_test_gn 2021-11-17 13:24:03 +08:00
yuanshuai f8aa4e339b 法宝聚灵功能提交 2021-11-17 13:18:27 +08:00
jiahuiwen 010f1b97ff Merge branch 'master_test_gn_zf' into master_test_gn 2021-11-17 10:37:02 +08:00
jiahuiwen 30dae1d80e 宝物穿戴bug 2021-11-16 16:56:40 +08:00
xuexinpeng f0fa655dc8 森罗幻境 2021-11-13 22:18:09 +08:00
jiahuiwen f8dbd74b31 Merge branch 'master_test_gn' into master_prb_gn 2021-11-12 18:58:21 +08:00
xuexinpeng 39b276f03d 森罗幻境特殊处理还原 2021-11-12 18:28:22 +08:00
xuexinpeng 3b36c250ba 森罗幻境特殊处理 2021-11-12 17:32:20 +08:00