Commit Graph

6039 Commits (faa21bb46f71c1586c17f7173a111d24ca1ef02c)
 

Author SHA1 Message Date
jiahuiwen faa21bb46f 白金装备增加过滤掉脱装备获得 2021-10-30 01:43:45 +08:00
jiahuiwen ff57fe280e 修复商店 2021-10-29 16:19:26 +08:00
jiahuiwen 59c91e3233 修复指定活动 2021-10-29 16:10:22 +08:00
jiahuiwen 40ae6b6a1b 添加日志 2021-10-29 16:02:35 +08:00
jiahuiwen de7c59dff1 Merge branch 'master_test_gn_zf' into master_prb_gn 2021-10-29 15:50:00 +08:00
jiahuiwen 97e23512f2 热更修复bug 2021-10-29 15:49:40 +08:00
xuexinpeng d62ad1c030 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/mission/TakeMissionRewardHandler.java
2021-10-28 11:22:58 +08:00
xuexinpeng 61a71d847c 去掉注释 2021-10-27 20:24:44 +08:00
xuexinpeng 18201b0de6 日志 2021-10-27 19:47:27 +08:00
xuexinpeng 6021025dc6 判空操作 2021-10-27 19:39:37 +08:00
xuexinpeng f72b071efd 判空返回 2021-10-27 19:17:58 +08:00
xuexinpeng b66139651f 注释6962 6963礼包 2021-10-27 19:01:09 +08:00
xuexinpeng 7d96a9e494 6962 6963礼包废弃 2021-10-27 18:30:51 +08:00
xuexinpeng bd08edc34e 7201活动弃用 2021-10-27 17:35:11 +08:00
xuexinpeng 56bd49949d 7201活动弃用 2021-10-27 17:27:59 +08:00
xuexinpeng 33ea08343d Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-10-27 16:54:06 +08:00
xuexinpeng 62a1d3e61c 一键领取 2021-10-27 16:52:08 +08:00
duhui c974df9d8e 超级月卡 2021-10-27 16:51:44 +08:00
duhui 3179849ffb 超级月卡 2021-10-27 13:49:08 +08:00
xuexinpeng b0deaa8250 Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-10-27 07:47:28 +08:00
xuexinpeng ec3ea76864 一键领取代码回滚 2021-10-27 07:44:08 +08:00
xuexinpeng 6735a2dbb8 Merge branch 'master_test_gn' into master_prb_gn 2021-11-06 01:25:05 +08:00
xuexinpeng e6ea0e5451 原帅跨服 2021-11-06 01:17:31 +08:00
yuanshuai 4e34e8963b Merge branch 'master_test_gn' into master_prb_gn 2021-10-26 18:24:02 +08:00
yuanshuai 004ce5a027 主角技能添加用户等级 2021-10-26 17:57:10 +08:00
yuanshuai 379e85704d 跨服相关主角技能性别字段修改 2021-10-26 17:18:19 +08:00
yuanshuai c366955468 主角技能添加性别字段 2021-10-26 17:06:13 +08:00
yuanshuai 1ed3adec43 车迟斗法抢夺战斗类型修改 2021-10-26 15:11:58 +08:00
jiahuiwen 543afca66e Merge branch 'master_test_gn' into master_prb_gn 2021-10-26 15:05:04 +08:00
jiahuiwen 872dee96f7 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-26 15:00:55 +08:00
jiahuiwen d8f053335e 获取最大战力兼容机器人 2021-10-26 15:00:47 +08:00
xuexinpeng 155dfbd651 飘渺之旅新增绝对日期前后开服两种活动 2021-10-26 11:11:53 +08:00
yuanshuai 15ee221141 Merge branch 'master_test_gn' into master_prb_gn 2021-10-26 10:52:28 +08:00
yuanshuai ee66dc9c25 跨服切磋主角技能bug修改 2021-10-26 10:29:50 +08:00
jiahuiwen 143dac343e 提交lua战斗脚本 2021-10-26 10:25:51 +08:00
xuexinpeng ae732cb0fa 跨服参数判空 2021-10-26 10:23:17 +08:00
yuanshuai 08d19e5edd Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-10-25 17:26:39 +08:00
yuanshuai 6fc96e7f71 添加战斗力字段 2021-10-25 17:26:26 +08:00
xuexinpeng 4a1108ae00 yx挑战列表战力为0 2021-10-25 17:15:40 +08:00
yuanshuai 5a11a55629 大闹天宫和七剑试炼开战协议添加战斗力数据字段 2021-10-25 15:32:45 +08:00
jiahuiwen d478225c1d 减少聊天记录缓存数量 2021-10-25 13:48:24 +08:00
jiahuiwen 01771b2fde 注释内存中的战斗缓存 2021-10-25 13:17:32 +08:00
xuexinpeng fe14a4230f yx修改 一键领取注掉 2021-10-22 17:46:20 +08:00
yuanshuai 5bee28c52f 后端不做活动兼容了 2021-10-22 17:25:12 +08:00
yuanshuai ea6545ec83 注释至尊降世活动数据兼容(前端做特殊处理了) 2021-10-22 17:21:12 +08:00
yuanshuai 8638f546bd 至尊降世活动任务兼容脚本提交 2021-10-22 17:09:16 +08:00
yuanshuai 5d963ca404 后端战斗相关lua文件提交 2021-10-22 16:59:08 +08:00
duhui 6066375355 御剑行,活动切换修改 2021-10-22 16:24:03 +08:00
jiahuiwen c183c40c81 敏感字服兼容 2021-10-22 16:22:55 +08:00
jiahuiwen 8bdd217c8a Merge branch 'master_test_gn' into master_test_mingan 2021-10-22 16:08:16 +08:00