Commit Graph

5300 Commits (82dd1bd33e38c9bd8422166ad696eb44704843ce)

Author SHA1 Message Date
lvxinran 9eb6920fe7 缓存删除修改 2021-07-10 00:27:46 +08:00
lvxinran 24cc1fbbf1 跨服修改 2021-07-05 01:27:01 +08:00
xuexinpeng 28b5ea5250 Revert "首冲3天 -> 7天 容错"
This reverts commit 482336919c.
2021-06-30 16:50:10 +08:00
xuexinpeng 482336919c 首冲3天 -> 7天 容错 2021-06-30 16:45:57 +08:00
duhui b9a1a2dee4 Merge branch 'dh_dev_wishDrawCard' into master_test_gn 2021-06-30 14:44:51 +08:00
duhui dc2c2ccd99 心愿bug处理 2021-06-30 14:22:43 +08:00
duhui fb6166b202 Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf 2021-06-30 13:39:19 +08:00
duhui 2b2ce7ea7f 线上日志热更 2021-06-30 13:39:07 +08:00
duhui 3f1ff48f3a 心愿抽卡完善 2021-06-30 11:40:37 +08:00
xuexinpeng c48bf9a268 Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java
2021-06-30 10:41:46 +08:00
lvxinran d72acbcea7 奖池修改 2021-07-02 20:19:33 +08:00
lvxinran 90f8cba220 抽卡获取同阵营修改 2021-07-02 18:22:35 +08:00
xuexinpeng abc3321c6b 山河试炼注释 暂时不上 2021-06-30 10:31:55 +08:00
duhui a18cdcf1e5 心愿抽卡功能提交 2021-06-30 09:47:49 +08:00
xuexinpeng d6cf251701 山河社稷埋点 2021-06-29 14:16:23 +08:00
xuexinpeng 937cc3d235 山河埋点数据 2021-06-29 11:36:25 +08:00
duhui 29df3cbddd 奇门遁甲2.0 2021-06-29 11:27:28 +08:00
duhui 3afb198cf9 奇门遁甲 协议优化 2021-06-28 16:24:05 +08:00
duhui 24c3c32bb6 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:50:43 +08:00
duhui b7d90178ee 战报功能优化 2021-06-28 11:50:12 +08:00
xuexinpeng 5df1ef37d6 站内信 2021-06-28 11:32:17 +08:00
duhui 7cdd1afd84 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-28 11:09:56 +08:00
duhui b3a35321d6 活动非空验证 2021-06-28 10:46:27 +08:00
duhui d9e4e29bb6 惊喜礼盒,bug处理 2021-06-27 22:59:52 +08:00
lvxinran e0568b2717 巅峰赛竞猜币换成邮件转换 2021-06-26 14:04:01 +08:00
lvxinran bbaf6a1556 排名修改 2021-06-26 13:54:03 +08:00
lvxinran 8b8d24f551 跨服名次修改 2021-07-04 01:00:59 +08:00
lvxinran 87111d6365 Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena 2021-07-03 22:00:17 +08:00
lvxinran 356f652cd1 暂时修改 2021-07-03 22:00:07 +08:00
lvxinran 39bc93bbca 跨服提交 2021-07-03 21:36:27 +08:00
duhui 084758fd99 灵兽对象修改,添加位置信息 2021-06-25 15:42:25 +08:00
duhui 29b68a8996 英雄属性添加 2021-06-25 15:29:26 +08:00
mengchengzhen 0711bfd752 天眼log 2021-06-24 11:49:52 +08:00
mengchengzhen 611dc9cdc8 天眼log 2021-06-24 11:24:03 +08:00
mengchengzhen 966351e03c 跨服 2021-06-23 18:54:37 +08:00
lvxinran a7ffcb435b Merge branch 'master_test_gn_arena' of http://60.1.1.230/backend/jieling_server into master_test_gn_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
2021-06-26 01:58:59 +08:00
lvxinran 040a412069 跨服第一版 2021-06-26 01:56:46 +08:00
mengchengzhen 2e94594960 跨服 2021-06-23 18:33:14 +08:00
mengchengzhen ff2bb3013b 福利红包会长新人红包 2021-06-23 16:17:47 +08:00
xuexinpeng 7331168ef5 onlineUserReport五分钟上报修改 2021-06-23 15:23:48 +08:00
mengchengzhen af83955bd5 跨服时间状态 2021-06-23 14:43:00 +08:00
xuexinpeng 33bcd9be80 appid暂时修改 2021-06-23 11:53:57 +08:00
duhui a660a1b5bf 扶持发奖 2021-06-22 17:39:47 +08:00
duhui 95be325af7 扶持发奖 2021-06-22 17:37:51 +08:00
lvxinran 0743dde166 Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-21 20:29:15 +08:00
mengchengzhen e281e93223 福利红包离开公会优化 2021-06-21 18:49:18 +08:00
mengchengzhen d32845a602 福利红包优化 2021-06-21 17:46:59 +08:00
mengchengzhen 1413a7ba82 热更福利红包工会2Jbug 2021-06-21 16:56:54 +08:00
mengchengzhen 66e33baa24 福利红包优化 2021-06-21 16:23:17 +08:00
lvxinran 6a08e5edd1 福利红包日志 2021-06-21 16:01:02 +08:00
mengchengzhen a98918bdf6 福利红包 2021-06-21 11:23:19 +08:00
xuexinpeng 186fc06156 hardstageBuff表改动相关注释 2021-06-19 16:17:41 +08:00
xuexinpeng b2ec86a39d 策划hardstageBuff 改表需求 2021-06-19 15:57:02 +08:00
mengchengzhen 22b776da9b 旧红包bug 2021-06-22 18:50:58 +08:00
mengchengzhen 4bed1f51f9 升星活动 2021-06-22 18:21:50 +08:00
mengchengzhen 04001f09b6 升星活动 2021-06-22 16:30:58 +08:00
lvxinran 9baf176021 巅峰赛ErrorCode添加,日志添加 2021-06-23 15:25:50 +08:00
duhui 93e86b5d88 测试代码删除 2021-06-18 17:10:29 +08:00
duhui 7720d73e62 Merge branch 'dh_dev_arena' into master_test_gn_arena 2021-06-18 17:00:36 +08:00
lvxinran 90af84ac12 发送分组邮件,删除无用代码 2021-06-23 16:31:11 +08:00
lvxinran e47eaeb8bd 跨服分组第一版 2021-06-23 14:29:54 +08:00
duhui 7f7223ee10 跨服,玩家信息和排行初版 2021-06-18 16:58:32 +08:00
duhui 62f880ce59 惊喜礼盒,开启天数 2021-06-18 13:55:35 +08:00
duhui bae043a10a 惊喜礼盒,bug修改 2021-06-18 11:01:16 +08:00
mengchengzhen 6cd02d8979 新活动 2021-06-22 10:41:33 +08:00
mengchengzhen 9193d8b6da Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-22 10:40:03 +08:00
mengchengzhen 0f6bc679c6 礼包代码优化 2021-06-22 10:35:06 +08:00
duhui 04f0303672 惊喜礼盒, 活动区服类型,获取时间 2021-06-18 10:32:45 +08:00
duhui 984c6514c7 Merge branch 'dh_dev_superbox' into master_test_gn 2021-06-18 09:51:02 +08:00
xuexinpeng 30ad58d7f0 山河试炼 2021-06-18 00:06:44 +08:00
duhui 870f5eea52 临时保存 2021-06-17 15:23:37 +08:00
xuexinpeng 84ce7b9a1b 山河社稷该表容错 2021-06-17 15:00:08 +08:00
lvxinran c4d6ee097b 跨服修改 2021-06-16 18:11:23 +08:00
mengchengzhen c610caaf41 新推送礼包 2021-06-16 16:09:20 +08:00
lvxinran 06fb70ed2a 修改无尽副本属性 2021-06-15 16:56:00 +08:00
lvxinran ed1d5a1dd0 战斗属性打印日志 2021-06-15 15:47:47 +08:00
lvxinran be62050c52 尝试修改公会援助 2021-06-17 02:45:46 +08:00
lvxinran 45b5757a1d Merge branch 'master_test_gn_zf' into master_test_gn 2021-06-17 02:44:58 +08:00
lvxinran 66a1236424 修复巅峰赛 2021-06-17 00:16:46 +08:00
duhui 16a9d3ae45 奇门遁甲协议补充 2021-06-15 11:22:06 +08:00
duhui 374cd9d58d 惊喜礼盒,逻辑修改 2021-06-12 18:07:13 +08:00
duhui 8811d07ace 惊喜盒子,状态优化 2021-06-17 14:21:20 +08:00
duhui 0b2df1665a Merge branch 'master_test_gn' into dh_dev_superbox 2021-06-17 11:16:33 +08:00
duhui eac97377b2 惊喜礼盒, 零点刷新推送 2021-06-17 11:01:57 +08:00
duhui 7923c95d11 惊喜礼盒 2021-06-17 10:53:11 +08:00
xuexinpeng 1224f67b7b 山河社稷图优化 2021-06-11 18:30:14 +08:00
lvxinran 880d92bed4 报空修改 2021-06-13 03:28:40 +08:00
mengchengzhen 003c644d6c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-11 16:32:57 +08:00
lvxinran 670e7f0f25 报空修改 2021-06-13 01:46:33 +08:00
lvxinran 645d0b00cc 工会援助日志 2021-06-13 00:11:14 +08:00
lvxinran b73f5bcefe 公会援助日志 2021-06-13 00:09:40 +08:00
lvxinran 503cae2f46 免费礼包 2021-06-12 15:37:14 +08:00
lvxinran ae78e720ff Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-12 03:33:24 +08:00
lvxinran 3628b63546 无尽小怪替换 2021-06-12 03:33:11 +08:00
mengchengzhen 4160bac4a5 福利红包 2021-06-11 16:26:37 +08:00
xuexinpeng d2bac109f6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-10 18:19:28 +08:00
xuexinpeng e150375e8c 本地礼包购买 2021-06-10 18:18:35 +08:00
mengchengzhen 5a88bd3ebb 福利红包 2021-06-10 18:05:56 +08:00
mengchengzhen cf5f93ec7d 福利红包优化 2021-06-10 17:38:56 +08:00
xuexinpeng 68a935cfb6 山河社稷图奖励排序还原 2021-06-10 17:14:59 +08:00
xuexinpeng 50d70c41f9 山河社稷图奖励数据排序 2021-06-10 16:39:08 +08:00
xuexinpeng 4d146a767b 发货金额校验 2021-06-10 14:48:53 +08:00
lvxinran 17925142bc Merge branch 'master_test_gn' into master_test_gn_getRandomCount 2021-06-10 13:49:48 +08:00
lvxinran 5ff20eccc5 Merge branch 'master_prb_gn' into master_test_gn 2021-06-10 13:48:57 +08:00
mengchengzhen 17c5c3905f 基金优化 2021-07-10 16:00:06 +08:00
mengchengzhen 1feb54097f 基金优化 2021-07-10 15:46:00 +08:00
duhui 2b491a250d Merge branch 'dh_dev_gm2' into master_test_gn 2021-06-10 10:08:35 +08:00
duhui 32c074745b 竞技场宝箱奖励报送 2021-06-09 18:45:44 +08:00
mengchengzhen a56e74e306 新增福利红包类型 2021-06-09 17:49:36 +08:00
mengchengzhen 689913e17c 基金优化 2021-07-10 16:13:16 +08:00
duhui 04f2fef345 ccid 2021-06-09 15:47:12 +08:00
duhui 3c48a55f4f 主线动态匹配表 2021-06-09 15:43:33 +08:00
duhui f640e1c690 英雄展示,鸿蒙阵突破id 2021-06-09 14:27:06 +08:00
duhui 84969ddd22 公会援助记录,修行名字颜色问题 2021-06-09 10:57:25 +08:00
duhui d6e2f5ffdd 事件监听 2021-06-08 17:52:23 +08:00
duhui 2ee83fef78 奇门遁甲初版未测试 2021-06-08 17:49:21 +08:00
duhui 4de7b94119 公会副本任务添加 2021-06-09 00:06:33 +08:00
lvxinran c126a79604 合并分支 2021-06-11 14:29:54 +08:00
lvxinran d8b4da6473 返利等级修改 2021-06-08 16:24:38 +08:00
lvxinran fb47673c1d Merge branch 'master_test_gn' into master_test_gn_returnRecharge 2021-06-08 16:16:22 +08:00
lvxinran 8e05075201 删除无用代码 2021-06-12 10:32:21 +08:00
lvxinran d6215bd42b 充值返利第二版 2021-06-11 18:37:40 +08:00
lvxinran 8a2c5bd499 返利代码第一次提交 2021-06-11 14:23:42 +08:00
lvxinran 0c06c17f5b 抽卡次数修改 2021-06-08 15:54:54 +08:00
mengchengzhen bda5f6a970 天眼封禁properties空判断 2021-06-08 14:18:08 +08:00
mengchengzhen 33cbd037da 天眼封禁参数 2021-06-08 10:42:31 +08:00
mengchengzhen 962f0641b7 天眼封禁优化 2021-06-08 10:41:51 +08:00
xuexinpeng 1b4da6512f 魔试炼任务挑战计数,但新加的扫荡功能不计数 2021-06-07 11:17:33 +08:00
lvxinran ad5b3166f7 无尽本士气值判断 2021-06-08 15:09:57 +08:00
lvxinran ad00a842af Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 14:20:04 +08:00
lvxinran 5feec114b7 无尽修改 2021-06-08 14:19:59 +08:00
lvxinran ad24318ef5 无尽本报空判断 2021-06-07 19:47:04 +08:00
lvxinran da2a2b68ae mongokey初始化 2021-06-07 15:13:51 +08:00
lvxinran 9b0c7b6548 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-07 14:32:32 +08:00
lvxinran 9c18b8825b mongokey初始化 2021-06-07 14:32:27 +08:00
duhui 91529a13d1 gm扶持不进行数据上报 2021-06-04 14:10:08 +08:00
duhui e1bcb8e739 卸载称号 2021-06-02 14:25:11 +08:00
duhui b879921365 排行榜英雄信息,走鸿蒙阵 2021-06-02 11:59:53 +08:00
duhui af1c2fb537 调试日志注销 2021-06-02 11:03:21 +08:00
lvxinran e78e0141a3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 06:26:43 +08:00
lvxinran 5e1abc8359 新任务类型添加 2021-06-08 06:26:36 +08:00
lvxinran 103819f770 清除修改无用日志 2021-06-08 03:08:27 +08:00
lvxinran 0a6bc7deb2 礼包和活动关联修改 2021-06-08 01:29:18 +08:00
lvxinran 59c22520f3 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-08 01:12:13 +08:00
lvxinran a0db1379a9 无尽生成小怪修改 2021-06-08 01:12:03 +08:00
lvxinran d21c4c9249 无用代码删除 2021-06-06 20:51:53 +08:00
lvxinran f53c48e0b0 踏碎凌霄阵容保存 2021-06-06 18:35:46 +08:00
lvxinran ea35f92275 踏碎凌霄保存阵容 2021-06-06 18:03:04 +08:00
mengchengzhen 1c6c979615 五星推送修改 2021-06-01 15:55:56 +08:00
duhui 638b4e1cbd 心愿抽奖,日志 2021-06-11 15:21:34 +08:00
duhui 19f5694fda Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-01 11:42:45 +08:00
duhui bea39c6fc7 Merge branch 'dev_dh_level' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
2021-06-01 11:42:31 +08:00
mengchengzhen 9d35d1b29d 网络不好导致充值失败的问题 2021-06-01 11:41:41 +08:00
mengchengzhen 13fb52cd3a 概率相等红包 2021-06-01 10:08:37 +08:00
mengchengzhen 3742a2aa74 新活动五星推送 2021-05-31 18:37:12 +08:00
mengchengzhen 0370572c7c 活动礼包刷新 2021-05-31 17:55:50 +08:00
duhui 20f6e75d12 修行,名字颜色 2021-05-31 16:21:26 +08:00
duhui d410438f8c 修行:名字颜色 2021-05-31 14:55:38 +08:00
mengchengzhen 2dd6b4c382 直购充值 2021-05-31 12:15:17 +08:00
lvxinran 93fca9a83b 报空修改 2021-06-03 06:34:13 +08:00
lvxinran 363262da61 天宫达人修改 2021-06-06 18:05:11 +08:00
mengchengzhen a0f97e13a6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-31 12:00:09 +08:00
mengchengzhen cfda3f3281 直充弹出 2021-05-31 11:59:56 +08:00
duhui ec6fe92d13 修行:名字颜色 2021-05-31 11:09:13 +08:00
duhui 8769f9334e 心愿抽奖,权重问题处理 2021-06-13 10:53:05 +08:00
xuexinpeng b1029ebb06 山河领奖报空处理 2021-05-29 17:01:07 +08:00
mengchengzhen 4292f3cca2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-29 16:16:30 +08:00
lvxinran 9c6a73551e 失败掉落 2021-06-06 15:59:42 +08:00
lvxinran b419bba13e Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-06 15:06:06 +08:00
lvxinran 67f8873482 踏碎凌霄排行 2021-06-06 15:05:55 +08:00
lvxinran b0da1ab24b 天宫达人修改 2021-06-05 17:36:45 +08:00
mengchengzhen e418082371 福利红包 2021-05-29 16:16:18 +08:00
mengchengzhen c29b7a25cd 福利红包 2021-05-28 18:50:18 +08:00
duhui f2e84cceac 心愿抽奖,消耗物品bug 2021-05-28 18:02:50 +08:00
mengchengzhen 74cc8d53b6 福利红包 2021-05-28 16:59:12 +08:00
duhui df2d2bb6e6 福星高照刷新问题, 心愿抽奖免费抽奖次数优化 2021-06-02 00:01:58 +08:00
xuexinpeng bf54d94986 山河社稷图一些优化 2021-05-28 14:41:28 +08:00
mengchengzhen 87463b9b15 自动封禁 2021-05-28 10:58:57 +08:00
lvxinran 7144d5fcd6 敏感词 2021-05-28 10:51:24 +08:00
duhui a8a013ec5c Merge branch 'dh_dev_activiyDraw' into master_test_gn 2021-05-28 10:10:59 +08:00
duhui ce512050b3 Merge branch 'master_test_gn' into dh_dev_activiyDraw 2021-05-28 10:10:39 +08:00
xuexinpeng c617212ba7 山河社稷 2021-05-27 23:08:20 +08:00
xuexinpeng 1f7ba67aa4 山河社稷 2021-05-31 02:17:18 +08:00
lvxinran 4e969510f5 Merge branch 'master_test_gn' into master_test_gn_endless
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
2021-07-03 01:25:41 +08:00
lvxinran 99cd3246f2 无尽副本最后修改 2021-07-03 00:05:36 +08:00
lvxinran de1432222f 无尽提交 2021-06-09 03:46:51 +08:00
lvxinran dfd2bdc968 无尽修改第三版 2021-06-01 00:06:40 +08:00
duhui ab885c392a 心愿抽奖,后端自测完成 2021-05-27 19:35:53 +08:00
xuexinpeng fecbddb920 山河社稷任务 2021-05-27 18:24:07 +08:00
mengchengzhen d01dcff730 灵兽礼包 2021-05-27 17:08:47 +08:00
duhui 8e37bd922c 牛气冲天, 活动结束发送未领取奖励 2021-05-27 16:10:19 +08:00
duhui 2a5d149ac6 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-27 16:07:17 +08:00
duhui 839eb2af4f 修行,名字颜色 2021-05-27 16:06:07 +08:00
mengchengzhen cd49002893 福利红包 2021-05-27 15:52:33 +08:00
xuexinpeng e1dbce80cf 山河社稷图排行榜 2021-05-27 14:48:39 +08:00
duhui 2bfb6228b0 牛气冲天活动结束,未发送未领取奖励问题处理 2021-05-27 11:48:59 +08:00
duhui 6214e3d8b8 修行bug处理: 附身神将分解 2021-05-27 10:31:11 +08:00
duhui 829bfccf16 修行: 系统消息添加玩家名字颜色 2021-05-26 18:31:33 +08:00
lvxinran 1d7e46ee36 玩家经验修改 2021-05-26 16:23:24 +08:00
xuexinpeng 62e5fac672 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-26 16:18:33 +08:00
xuexinpeng 945a238748 山河战斗记录修行等级 2021-05-26 16:14:49 +08:00
lvxinran a597b3545e 无尽副本第二版 2021-05-26 16:14:29 +08:00
duhui ee63e36511 修行bug处理, 编队展示错误和不入库问题处理 2021-05-26 16:09:10 +08:00
xuexinpeng 98ee42fb6c Merge branch 'master_test_mcz_hardstage' into master_test_gn
# Conflicts:
#	tablemanager/src/main/java/config/SSpecialConfig.java
2021-05-26 11:20:11 +08:00
xuexinpeng 202b170cd5 心魔试炼扫荡,一键扫荡 2021-05-26 11:09:58 +08:00
mengchengzhen 69462d976d 怪物战力计算 2021-05-26 10:38:31 +08:00
mengchengzhen 7da6f963ba 新礼包优化 2021-05-25 20:13:42 +08:00
mengchengzhen f1776030ef 新红包优化 2021-05-25 20:13:30 +08:00
duhui d1a2849a56 心愿抽奖初版,未联调 2021-05-25 18:05:56 +08:00
duhui 66d10040d3 Merge branch 'dh_dev_gm' into master_test_gn
(cherry picked from commit b404814382)
2021-05-25 14:07:59 +08:00
lvxinran 6d76941d51 Merge branch 'master_test_gn' into master_test_gn_endless 2021-05-25 13:37:39 +08:00
lvxinran 7978510f02 分支合并 2021-05-25 11:56:06 +08:00
xuexinpeng e74314c6c7 山河社稷成就任务 心魔试炼扫荡 2021-05-25 11:40:43 +08:00
duhui 3030bb501f 修行: 附身神印展示使用中全部 2021-05-25 11:09:25 +08:00
duhui b404814382 Merge branch 'dh_dev_gm' into master_test_gn 2021-05-25 10:25:12 +08:00
xuexinpeng e74a860a80 特权等级奖励 2021-05-24 18:49:46 +08:00
mengchengzhen 276f842d5c 福利红包 2021-05-24 18:28:24 +08:00
xuexinpeng 3811d59299 山河社稷gm 2021-05-24 15:33:48 +08:00
duhui 96a3844ccc gm公会,信息不入库处理 2021-05-24 15:18:04 +08:00
mengchengzhen afda78f8e0 灵兽礼包 2021-05-24 14:38:22 +08:00
mengchengzhen e5c6a1723a 福利红包 2021-05-24 12:01:34 +08:00
mengchengzhen 2010a1a9ce Merge branch 'master_test_mcz_redpacket' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2021-05-24 11:43:44 +08:00
xuexinpeng c3034285d4 Merge branch 'master_test_mcz_hardstage' into master_test_gn 2021-05-24 11:10:47 +08:00
xuexinpeng fe38e14a1c Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage 2021-05-24 11:06:17 +08:00
lvxinran 24e773aad9 无尽修改初版 2021-05-23 18:06:21 +08:00
mengchengzhen 4a2df26e2e 福利红包 2021-05-21 18:52:19 +08:00
xuexinpeng 30c1a61b62 社稷大典邮件内容修改 2021-05-21 18:25:03 +08:00
xuexinpeng 34cd899b6e 山河社稷等级限制数据初始化 2021-05-21 16:29:33 +08:00
duhui 9fced9ba25 gm.修改公会信息 2021-05-21 15:28:16 +08:00
duhui eebf572d7d 自定义礼包码 2021-05-20 18:02:50 +08:00
xuexinpeng 133afbab21 组队类型限制 2021-05-20 17:08:06 +08:00
xuexinpeng 61c2b2b460 战斗lua脚本同步 2021-05-20 16:49:36 +08:00
xuexinpeng 7c7c3e6bb6 特权等级奖励 2021-05-20 15:41:33 +08:00
xuexinpeng a0db7928bf 山河社稷图最小战力回放 2021-05-19 15:27:00 +08:00
mengchengzhen 97d32d93dd 福利红包 2021-05-19 11:18:46 +08:00
duhui 222c10252b 修行3.0
神印展示增加,替换神印逻辑完善
2021-05-19 09:35:00 +08:00
xuexinpeng bc94b6290d 山河社稷图状态显示 2021-05-18 16:51:50 +08:00
xuexinpeng 8423d711dd 山河社稷图 2021-05-18 15:56:26 +08:00
xuexinpeng 30ebef6856 山河社稷图优化 2021-05-18 13:57:07 +08:00
xuexinpeng 9cb30eb9da 山河社稷图 2021-05-18 10:13:37 +08:00
lvxinran 78cb70af3a 物品数量修改 2021-05-17 21:09:21 +08:00
xuexinpeng 30115154eb Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage 2021-05-17 18:55:52 +08:00
xuexinpeng bc9bb14dda 山河社稷技能buffer 2021-05-17 18:55:19 +08:00
duhui b74e3525a7 修行名字颜色 2021-05-17 17:57:58 +08:00
xuexinpeng c509ed8444 Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-05-17 11:19:30 +08:00
xuexinpeng 41ba1e238c 山河社稷图 2021-05-17 10:28:37 +08:00
duhui 23d1b68080 修行2.0 2021-05-17 09:37:16 +08:00
xuexinpeng e656ac4344 山河社稷 2021-05-15 17:04:02 +08:00
xuexinpeng 7e21e0df43 山河社稷 2021-05-15 15:05:11 +08:00
xuexinpeng a8e76d24db 山河社稷图 2021-05-14 15:36:50 +08:00
lvxinran d8e16aae9a 一键购买修改 2021-05-14 14:41:13 +08:00
lvxinran 89332f0d07 公会等级上限 2021-05-14 14:29:49 +08:00
lvxinran 442b550aa1 开服福利修改 2021-05-14 13:47:07 +08:00
duhui b51cd010a3 修行功能1.0 2021-05-14 11:12:47 +08:00
lvxinran c3749641b3 Merge branch 'master_prb_gn' into master_test_gn 2021-05-13 17:46:44 +08:00
lvxinran e113ab430c 限时抽卡修改 2021-05-13 17:46:34 +08:00
xuexinpeng 972b6dde78 山河社稷 2021-05-13 17:33:19 +08:00
lvxinran fc56f377a1 活动礼包刷新修改 2021-05-13 14:40:27 +08:00
xuexinpeng 885e0112ad 山河社稷 2021-05-13 14:39:44 +08:00
DESKTOP-98AVA47\Administrator e7ea5f645e 工会副本修改 2021-05-13 01:33:12 +07:00
lvxinran 17e2d80685 邮件领取奖励上限 2021-05-17 21:34:40 +08:00
lvxinran d3bcc1618f 限时抽卡的活动清除计数 2021-05-12 14:34:06 +08:00
mengchengzhen 8ab1fafc40 山河社稷图 2021-05-11 21:36:22 +08:00
mengchengzhen f561f686e9 山河社稷图 2021-05-11 21:31:07 +08:00
duhui 1d8fea9f96 修行,未完成提交 2021-05-11 17:59:49 +08:00
mengchengzhen ea4d1e03d6 山河社稷图 2021-05-11 16:25:00 +08:00
xuexinpeng 75e526697a 山河社稷更新星星事件 2021-05-11 15:48:59 +08:00
duhui 9457e48c5c 计算战力方法,部分注释旧逻辑删除,需要可回滚 2021-05-11 14:09:21 +08:00
xuexinpeng e8a6617225 Merge branch 'master_test_mcz_hardstage' of http://60.1.1.230/backend/jieling_server into master_test_mcz_hardstage 2021-05-11 11:38:55 +08:00
xuexinpeng b72978b56e 山河社稷图排行榜 2021-05-11 11:23:19 +08:00
mengchengzhen fbceab8579 新礼包五星推送 2021-05-11 11:04:53 +08:00
mengchengzhen 3de5a18eb7 山河社稷图 2021-05-11 10:59:59 +08:00
mengchengzhen 79ffc31fa8 山河社稷图 2021-05-11 10:59:39 +08:00
duhui 9faf6cb267 等级 2021-05-10 16:30:45 +08:00
duhui 77c25705f9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-10 16:12:50 +08:00
duhui 88f1036659 等级回滚 2021-05-10 16:12:38 +08:00
duhui 514b1205eb 等级 2021-05-10 16:11:36 +08:00
mengchengzhen 489529c827 取消灵兽礼包 2021-05-10 16:03:12 +08:00
duhui c66939c575 最高等级 2021-05-10 14:39:38 +08:00
mengchengzhen e0462df216 新礼包灵兽礼包 2021-05-10 09:42:51 +08:00
mengchengzhen a8c23221a0 新礼包超值基金记录领取时间 2021-05-08 17:37:35 +08:00
lvxinran 9f0900a5a2 Merge branch 'master_prb_gn' into master_test_gn 2021-05-08 17:12:59 +08:00
mengchengzhen 8cf73a88c7 新礼包存储 2021-05-08 16:36:18 +08:00
mengchengzhen 87e02201de 工会排行bug 2021-05-13 18:29:49 +08:00
mengchengzhen 6677d92b45 山河社稷图 2021-05-08 16:35:17 +08:00
mengchengzhen 34e86ceb8d Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 21:21:17 +08:00
mengchengzhen 2d1a115cf0 Merge branch 'master_test_gn' into master_prb_gn 2021-05-08 21:03:39 +08:00
mengchengzhen 8cd82e7325 首冲bug防止问题方法 2021-05-08 21:03:29 +08:00
mengchengzhen c32f1e8fb4 Merge branch 'master_test_gn' into master_prb_gn 2021-05-08 20:50:10 +08:00
mengchengzhen f88c84f2dd 新礼包首冲bug 2021-05-08 20:50:00 +08:00
mengchengzhen c9f3eaaaa6 新礼包首冲bug指定时间5月6日18点 2021-05-06 21:21:05 +08:00
mengchengzhen acf6913dbf Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 17:11:43 +08:00
mengchengzhen dd9bc02661 新礼包推送两次bug 2021-05-06 17:11:27 +08:00
mengchengzhen 4eff03208d Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 10:07:57 +08:00
mengchengzhen 36fc8911fc 新礼包indexbug修复 2021-05-06 10:06:12 +08:00
mengchengzhen 5363b52f2b 新礼包活动领取优化 2021-05-11 00:10:14 +08:00
lvxinran 575accafa7 累计充值钱数修改 2021-05-04 10:22:06 +08:00
lvxinran 0ac4200f7c 老玩家保存信息 2021-04-30 22:57:24 +08:00
mengchengzhen d2e6ae8048 Merge branch 'master_test_gn' into master_prb_gn 2021-04-30 13:38:39 +08:00
duhui 6c6767d9d6 Merge branch 'master_test_gn' into master_prb_gn 2021-04-29 20:20:51 +08:00
lvxinran 66b099bb58 Merge branch 'master_test_gn' into master_prb_gn 2021-05-01 04:31:46 +08:00
lvxinran 04bfe71ebf Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-01 04:31:18 +08:00
DESKTOP-98AVA47\Administrator d3bef43914 判空 2021-10-31 01:04:06 +07:00
mengchengzhen aa086627e4 新礼包 2021-05-31 02:58:35 +08:00
lvxinran 32aed0a1b2 报空修改 2021-05-01 04:31:13 +08:00
lvxinran 8c47a17aa6 Merge branch 'master_test_gn' into master_prb_gn 2021-05-01 00:55:45 +08:00
mengchengzhen 7d41aeec3a 新礼包 2021-04-30 01:44:11 +08:00
mengchengzhen e4f5617ddb 新礼包 2021-04-29 20:09:00 +08:00
mengchengzhen 21df5641ca 新礼包 2021-04-29 19:54:56 +08:00
mengchengzhen 19d8c11012 新礼包五星最后修改 2021-04-29 19:38:02 +08:00
mengchengzhen 76abb2383a 新礼包五星推送 2021-04-29 19:30:49 +08:00
mengchengzhen 1a1476fdf7 新礼包碎片合成推送 2021-04-29 18:51:37 +08:00
mengchengzhen 7085f15710 新礼包五星礼包优化 2021-04-29 18:09:36 +08:00
mengchengzhen cf1b1df861 新礼包 2021-04-30 00:32:48 +08:00
mengchengzhen 95a338f07f 新礼包每天刷新,推送时间 2021-04-29 17:16:39 +08:00
xuexinpeng e3c2f157f2 误操 作 2021-04-29 16:58:08 +08:00
xuexinpeng 6842cf869c Merge branch 'master_test_gn' into master_test_gn_arean 2021-04-29 16:33:46 +08:00
xuexinpeng a63900a3ec Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-29 16:31:29 +08:00
xuexinpeng 3b5fd18a3c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
新赛季重置积分后    挑战后从重置的分值累加
2021-04-29 16:24:21 +08:00
xuexinpeng 8264a1e0ad 踏碎凌霄战斗 2021-04-28 01:19:28 +08:00
mengchengzhen 697f129301 新礼包 2021-04-28 00:35:03 +08:00
mengchengzhen 48cf68f620 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-28 00:16:46 +08:00
lvxinran 6c8e14ba4d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-30 23:08:12 +08:00
lvxinran f0838b269d 0伤害判断 2021-04-30 23:08:06 +08:00
lvxinran d593a41660 月卡改回 2021-04-30 20:30:48 +08:00
lvxinran 3c3beed1cf 月卡开启时间0点修改 2021-04-30 19:48:18 +08:00
lvxinran 80882ce656 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-30 19:36:47 +08:00
lvxinran 8cd48d6adb 空奖励修改 2021-04-30 19:36:34 +08:00
mengchengzhen 3a5f1a07aa 新礼包推送 2021-04-28 00:16:35 +08:00
mengchengzhen 2cfe67afe4 新礼包推送弹出 2021-04-27 22:28:08 +08:00
mengchengzhen 32900d9aa9 新礼包 2021-04-27 21:37:34 +08:00
mengchengzhen e8edb1fe95 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 21:20:19 +08:00
mengchengzhen 98b068f243 新礼包豪华基金 2021-04-27 21:18:46 +08:00
mengchengzhen c9db588348 新礼包 2021-04-27 19:27:28 +08:00
mengchengzhen 9f00d7a855 新礼包豪华基金邮件 2021-05-01 16:43:12 +08:00
mengchengzhen 747fd9bdb0 豪华基金每天奖励 2021-05-01 16:26:13 +08:00
lvxinran d9e5327137 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 15:53:28 +08:00
lvxinran 43e10b0ea8 修改入库读库错误 2021-04-27 15:53:23 +08:00
mengchengzhen 9b6ec67346 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 14:01:33 +08:00
mengchengzhen b1f6fbb581 新礼包添加每日充值金额 2021-04-27 13:58:54 +08:00
mengchengzhen 3af3a725c3 新礼包 2021-04-28 00:27:43 +08:00
lvxinran 91db235c90 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 13:40:20 +08:00
lvxinran 21973c02d6 免费不发送邮件 2021-04-27 13:40:09 +08:00
mengchengzhen c9580f6ba4 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-26 20:50:41 +08:00
mengchengzhen fcff8428e9 新礼包 2021-04-26 20:50:32 +08:00
lvxinran b7b9753b6f 邮件标题错误修改 2021-04-26 19:42:16 +08:00
lvxinran 3eb625070f 购买妖精双倍添加 2021-04-26 19:40:57 +08:00
lvxinran 2de2762b5d 报错修改 2021-04-26 19:09:36 +08:00
mengchengzhen f0db839fab Merge branch 'master_test_gn_mcz' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
2021-04-26 19:04:40 +08:00
xuexinpeng d827c0057e 踏碎凌霄 2021-04-26 18:34:58 +08:00
mengchengzhen c0271abb3d 新礼包 2021-04-26 18:24:02 +08:00
mengchengzhen 2019129057 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz 2021-04-26 17:29:25 +08:00
mengchengzhen 27aa32bd23 新礼包 2021-04-26 17:27:54 +08:00
xuexinpeng 197616887a Merge branch 'master_test_gn_arean' into master_test_gn 2021-04-26 16:27:19 +08:00
xuexinpeng 7fb75df1b6 踏碎凌霄 2021-04-26 16:25:14 +08:00
lvxinran d1a54c7377 充值 发邮件 发奖修改 2021-04-26 15:40:51 +08:00
duhui e9d4c76dd6 内部gm,跳过公会boss 2021-04-26 14:09:04 +08:00
mengchengzhen 972806ba8f 新礼包 2021-04-26 13:45:30 +08:00
mengchengzhen 54a3149de6 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
2021-04-26 12:01:08 +08:00
lvxinran ae93532942 大闹天宫招募节点宝物添加 2021-04-23 15:19:47 +08:00
mengchengzhen fca38c08d0 Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-22 17:46:43 +08:00
mengchengzhen 82cc2a5feb Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-28 18:13:51 +08:00
mengchengzhen 2cac69ffcb 新礼包 2021-04-22 17:43:30 +08:00
mengchengzhen 7d91d069aa 新礼包测试 2021-04-22 13:55:20 +08:00
lvxinran 66a0486528 抽卡逻辑修改 2021-04-21 14:44:26 +08:00
lvxinran 3f0ecd8d6f 判断类型修改 2021-04-21 14:15:51 +08:00
lvxinran 96163db7b5 礼包优化 2021-04-21 14:03:40 +08:00
duhui c05d0ea2b6 首次挑战成功时改为不消耗次数 2021-04-21 11:30:04 +08:00
xuexinpeng 2c92ff12e6 Merge branch 'master_test_gn' into master_test_gn_arean 2021-05-04 00:25:29 +08:00
xuexinpeng 59b28c36e8 竞技场优化 赛季重置不清空积分,初始化为上赛季积分的百分比 2021-05-04 00:24:50 +08:00
mengchengzhen c48ad44e27 新礼包 2021-04-20 15:03:50 +08:00
mengchengzhen 30814f86a5 新礼包 2021-04-28 18:03:47 +08:00
duhui a41d8fff66 Merge branch 'dh_dev_cn_oblation' into master_test_gn
通用祭品
2021-04-20 14:44:01 +08:00
lvxinran 305f2879ed 社稷大典排行修改 2021-04-19 20:20:56 +08:00
duhui ed597fd903 大闹天宫,招募星级问题 2021-04-20 11:08:00 +08:00
lvxinran ffbd9ac401 公会祭祀 援助 打印日志 2021-04-20 10:45:53 +08:00
lvxinran 416a93b981 公会类型排行榜修改 2021-04-20 10:26:52 +08:00
duhui 174a0f799a 同系祭品 2021-04-19 17:53:44 +08:00
duhui 5aa5b1fecb Merge branch 'master_test' into master_test_gn 2021-04-19 16:50:36 +08:00
lvxinran eb11dd82d1 Merge branch 'master_test' into master_test_gn 2021-04-20 10:26:04 +08:00
lvxinran 59a2dfa11a 公会类型排行榜修改 2021-04-20 10:25:38 +08:00
duhui 5648d6392e 大闹天宫,招募星级问题 2021-04-19 16:48:00 +08:00
mengchengzhen ee6575e2a3 装备升星 2021-04-19 15:51:36 +08:00
duhui 4761478c74 通用祭品bug修改 2021-04-19 15:38:29 +08:00
mengchengzhen 0b59e617c8 新礼包 2021-04-19 15:37:34 +08:00
lvxinran 935740a46e 怪物传星级给前端 2021-04-19 15:28:05 +08:00
mengchengzhen bad33084ee 装备升星 2021-04-19 15:12:56 +08:00
mengchengzhen 2f03e2c24e 新礼包 2021-04-19 14:50:06 +08:00
mengchengzhen c5b4dcd3bd 新礼包 2021-04-19 11:27:48 +08:00
mengchengzhen 4ffb494609 礼包优化1 2021-05-14 17:05:27 +08:00
lvxinran 0f43fb3888 掉落组修改 2021-04-17 18:01:30 +08:00
lvxinran becc82c425 一件购买修改 2021-04-17 14:22:29 +08:00
mengchengzhen 7c331eef67 装备升星(云游商人) 2021-04-16 18:31:26 +08:00
mengchengzhen 8af7414ec3 Merge branch 'master_test_gn_mcz2' into master_test_gn 2021-04-16 17:36:19 +08:00
mengchengzhen 423bb145c5 排行榜皮肤 2021-04-16 17:35:53 +08:00
mengchengzhen d94c023327 装备升星 2021-04-16 17:19:10 +08:00
mengchengzhen 92d850c470 装备升星(云游商人) 2021-04-16 17:16:30 +08:00
lvxinran 4d08afb0c9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-16 15:59:21 +08:00
lvxinran 142673a2da 车迟斗法0伤害修改 2021-04-16 15:59:10 +08:00
duhui a3188a2f03 Merge branch 'master_test' into master_test_gn 2021-04-16 14:28:25 +08:00
duhui 6f27a41e03 合成道具消耗问题 2021-04-16 14:28:03 +08:00
duhui 509c9b57c8 添加道具类型:万能狗粮 2021-04-16 14:24:48 +08:00
mengchengzhen 29ae290630 Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-16 14:02:42 +08:00
mengchengzhen 2cafa21e1d 云游商人 2021-04-16 14:02:11 +08:00
mengchengzhen 87ab7cc69c Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-16 14:01:06 +08:00
lvxinran 6bcd974ef2 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-16 11:56:08 +08:00
lvxinran 98be53a50e 大闹天宫圣物重构 2021-04-16 11:56:02 +08:00
duhui 8c3c80de3f Merge branch 'master_test' into master_test_gn 2021-04-16 10:35:02 +08:00
duhui c2cd3b8ebe 计算机器人突破等级 2021-04-16 10:33:33 +08:00
duhui 4954417643 通用祭品 2021-04-16 10:31:51 +08:00
mengchengzhen b6f5926c4b 装备升星 2021-04-15 19:13:56 +08:00
duhui a9dbd45916 Merge branch 'master_test' into master_test_gn 2021-04-15 15:39:21 +08:00
lvxinran fe9e0858e3 车迟斗法修改,处理0伤害 2021-04-15 14:24:04 +08:00
lvxinran 29aa8a6b53 森罗幻境修改 2021-04-15 14:22:56 +08:00
lvxinran 49468dc793 森罗幻境修改 2021-04-15 14:21:18 +08:00
duhui e8e120ccc0 大闹天宫,专属圣物技能问题处理 2021-04-15 09:36:59 +08:00
lvxinran 8fc939ee52 Merge branch 'master_test' into master_test_gn 2021-04-12 19:10:13 +08:00
lvxinran 5b0e09d6be Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-12 17:13:50 +08:00
lvxinran 6742b70568 提示修改 2021-04-12 17:13:38 +08:00
mengchengzhen c0f10f4f49 Merge branch 'master_test_gn_mcz' into master_test_gn 2021-04-12 15:11:48 +08:00
mengchengzhen 2aa15c7c32 十五日优化 2021-04-12 15:09:43 +08:00
mengchengzhen 8af8ba001c 称号优化 2021-04-12 15:06:14 +08:00
lvxinran a765b7ec45 车迟斗法时间间隔修改 2021-04-12 00:33:31 +08:00
lvxinran be6a1b07d4 主题活动刷新修改 2021-04-12 00:33:17 +08:00
lvxinran b9503983ba 报空修改 2021-04-11 00:00:05 +08:00
lvxinran 153c9d618e 修改报空 2021-04-10 23:43:56 +08:00
lvxinran 94fec0387f 邮件修改 2021-04-12 23:32:38 +08:00
duhui 65b0008884 Merge branch 'master_test' into master_test_gn 2021-04-09 15:22:08 +08:00
duhui 3262b65099 gm,扶持功能 2021-04-09 15:21:47 +08:00
duhui 4d393b942f Merge branch 'master_test' into master_test_gn 2021-04-07 14:32:19 +08:00
duhui ad665bf5e5 魂印图鉴,英雄装备中魂印兼容 2021-04-07 14:31:46 +08:00
duhui 523501b6bf Merge branch 'master_test' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2021-04-07 13:38:27 +08:00
duhui 286f1e42b8 魂印图鉴,旧数据容错处理 2021-04-07 13:34:29 +08:00
duhui 323be12310 魂印图鉴,旧数据容错 2021-04-07 11:52:45 +08:00
mengchengzhen bce07ebf64 Merge branch 'master_test_gn_mcz' into master_test_gn 2021-04-06 15:54:48 +08:00
mengchengzhen b6031f08de 排行榜战力刷新优化 2021-04-06 15:53:00 +08:00
mengchengzhen b4029e7fd9 15 2021-04-06 15:51:32 +08:00
mengchengzhen 12a6f5d580 15 2021-04-16 20:47:46 +08:00
whb 8acb5abc25 天书秘卷 2021-04-02 10:36:36 +08:00
mengchengzhen 6b7a26a1e0 战力更新 2021-04-16 20:48:57 +08:00
lvxinran f6f0a20294 删除无用打印 2021-04-01 16:16:57 +08:00
mengchengzhen f07c099715 Merge branch 'master_test_gn' into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2021-04-01 13:45:41 +08:00
lvxinran ee53f583f5 归元修改 2021-05-19 00:18:01 +08:00
lvxinran 448c13c550 福星高照计时修改 2021-05-19 00:01:18 +08:00
lvxinran 15bd393c89 福星高照 2021-05-02 20:26:14 +08:00
lvxinran 0228b97402 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-01 13:57:43 +08:00
lvxinran bfe16940b2 储值活动、聊天修改 提交 2021-04-01 13:57:12 +08:00
lvxinran c4b4415e00 活动类型添加 2021-03-31 21:40:07 +08:00
mengchengzhen 859daed04b 15 2021-03-30 16:41:53 +08:00
whb 3db8b587be Merge branch 'master_test_gn' into master_test_gn_whb
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
2021-03-30 13:50:29 +08:00
mengchengzhen 2d9ad53842 Merge branch 'master_test_gn' into master_test_gn_mcz 2021-03-29 18:09:37 +08:00
mengchengzhen c6df17e07b 坐骑,皮肤,称号 2021-03-29 18:02:38 +08:00
duhui a7e306a564 惊喜礼盒时间优化 2021-03-29 17:05:39 +08:00
duhui 24323d620d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-03-29 15:53:55 +08:00
lvxinran 80df35b883 头像入库修改 2021-04-01 15:12:08 +08:00
lvxinran 638dc34630 删除无用日志 2021-04-01 15:00:30 +08:00
lvxinran 723d4336db 大闹天宫首次刷新bug修改 2021-04-01 14:03:19 +08:00
duhui 63b0989a9e 三界降魔发放奖励 2021-03-29 15:52:29 +08:00
lvxinran e39ac0cd61 冲突修改 2021-03-29 14:29:35 +08:00
lvxinran d080a9a0d8 Merge branch 'master_online_gn' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java
2021-03-29 14:26:02 +08:00
lvxinran ad35dedf3b 0元不算首冲修改,公会副本推送修改 2021-03-31 09:13:49 +08:00
lvxinran 1b472203e7 报错修改 2021-03-27 18:45:00 +08:00
lvxinran 4fa6b8e8af 冲突修改 2021-03-27 16:43:49 +08:00
lvxinran 2b06894b07 merge2 2021-03-27 16:40:32 +08:00
lvxinran 5f335130c9 merge 2021-03-27 16:30:56 +08:00
whb 7c14f87a04 图鉴 2021-03-25 16:05:35 +08:00
duhui 55dc3c50af 牛气冲天 2021-03-25 14:07:35 +08:00
lvxinran 4c0ce0872c 工会副本修改 2021-03-23 03:30:42 +08:00
lvxinran 6f8e28efcd 充值成功indication 2021-03-20 21:17:16 +08:00
lvxinran 70c50ed74b 删除无用日志 2021-03-20 14:59:55 +08:00
lvxinran 58713e49da 添加日志 2021-04-02 00:24:40 +08:00
lvxinran 97b65368e2 添加日志 2021-04-02 00:10:33 +08:00
lvxinran c6286f1834 添加日志 2021-04-01 23:51:00 +08:00
lvxinran 4f9f8a76eb 删除无用公会代码 2021-03-19 23:26:07 +08:00
whb 61ffca630c 羁绊激活 2021-03-19 18:41:28 +08:00
lvxinran 6907229c3f 修复代码 2021-03-19 17:49:49 +08:00
duhui 63a8cc5b33 Merge branch 'master_test' into master_test_gn 2021-03-19 17:26:26 +08:00
duhui 7786fa994a 大闹天宫,星级突破修改 2021-03-19 17:25:40 +08:00
duhui ba5554e271 Merge branch 'master_test' into master_test_gn 2021-03-19 16:58:18 +08:00
duhui 206a9496d5 星级突破等级上限修改 2021-03-19 16:54:43 +08:00
lvxinran 888c11dde2 国服设置第十四天后开启天宫秘宝 2021-03-19 16:43:04 +08:00
duhui ce52e73800 Merge branch 'master_test' into master_test_gn 2021-03-19 16:30:58 +08:00
duhui 47ac15c42f 修改求平均等级逻辑 2021-03-19 16:30:39 +08:00
duhui 88fba2ddb6 Merge branch 'master_test' into master_test_gn 2021-03-19 16:25:15 +08:00
duhui 5bec625ba5 大闹天宫,招募英雄限制最大星级和最低等级 2021-03-19 16:18:24 +08:00
mengchengzhen 1a197070ca Merge branch 'master_test' into master_test_gn 2021-03-19 15:11:07 +08:00
mengchengzhen 54dabc2564 大闹天宫优化 2021-03-19 15:10:36 +08:00
lvxinran 39e39e3ef6 tapdb参数修改 2021-03-19 14:12:43 +08:00
mengchengzhen baeb7e03cd Merge branch 'master_test' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ExpeditionManager.java
2021-03-19 14:06:44 +08:00
mengchengzhen 66bea3f2c5 大闹天宫优化 2021-03-19 14:05:16 +08:00
mengchengzhen 86103f1067 大闹天宫 优化 2021-03-19 13:43:45 +08:00
lvxinran 1c97143e97 大闹天宫修改 2021-03-18 22:35:49 +08:00
lvxinran f0677a6706 节点信息修改 2021-03-18 18:55:47 +08:00
lvxinran 3905b8b26d Merge branch 'master_test' into master_test_gn 2021-03-18 18:01:51 +08:00
lvxinran dc3cb7f760 大闹天宫保存血量 2021-03-18 18:01:35 +08:00
lvxinran 889b1d0513 Merge branch 'master_test' into master_test_gn 2021-03-18 16:58:21 +08:00
lvxinran 8f0f004ec6 血量修改 2021-03-18 16:57:42 +08:00
lvxinran 8b4c3c6703 Merge branch 'master_test_hw' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/HeroNodeGetInfoRequestHandler.java
2021-03-18 16:19:50 +08:00
duhui 29bf5b17be 代码修复 2021-03-18 16:16:45 +08:00
lvxinran 129a0cdaa1 Merge branch 'master_test_hw' into master_test_gn 2021-03-18 15:50:51 +08:00
lvxinran 5f5562938b 贪婪节点英雄信息 2021-03-18 15:50:35 +08:00
DESKTOP-98AVA47\Administrator 530468ba0c 大闹天宫,试炼节点调优 2021-03-20 02:42:45 +07:00
lvxinran ad85797051 贪婪节点没有英雄信息 2021-03-18 15:48:07 +08:00
lvxinran bce5d3c34c buff值代码修改 2021-03-18 13:52:12 +08:00
lvxinran 9c684c7c8f int long 修改 2021-03-18 11:55:54 +08:00
lvxinran 2b61537ab7 活跃度修改 2021-03-17 16:41:28 +08:00
duhui 1c518d0f73 大闹天宫,怪物魂印逻辑修改 2021-03-17 15:10:21 +08:00
duhui 1cd71db5cb 1.大闹天宫,招募英雄逻辑重写
2.竞技场,机器人突破id计算逻辑重写
3.公会排行榜,添加非空验证
2021-03-17 14:09:55 +08:00
lvxinran aa9fee7c60 buff类型回滚 2021-03-16 17:43:22 +08:00
duhui bf0ab56a93 大闹天宫,随机阵容问题处理 2021-03-16 11:14:27 +08:00
duhui 028c534428 四灵试炼,助战重写(算上鸿蒙阵加成) 2021-03-16 09:58:26 +08:00
duhui 0567561cee 大闹天宫,boos节点和精英节点战力问题解决 2021-03-16 09:49:37 +08:00
mengchengzhen 409b7a3468 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-15 18:50:19 +08:00
mengchengzhen eff18fe054 danaotiangong update 2021-03-15 18:50:12 +08:00
duhui 15fbc91a9b 原有的升级通知更换到setLevel外边,因为这个方法不只是升级用,也可能归送
hero实现clone接口,对象克隆
2021-03-15 16:18:16 +08:00
lvxinran 6804684744 非空判断 2021-03-15 11:11:21 +08:00
lvxinran 8966f25c5b 限时神装 2021-03-15 11:09:03 +08:00
lvxinran 72d408063d Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-15 09:52:06 +08:00
lvxinran 9fbb26d855 离线逻辑修改 2021-03-15 09:52:01 +08:00
mengchengzhen 8fa36b3b1a dntg bug 2021-03-11 21:01:10 +08:00
duhui 9e488abe4e 鸿蒙阵突破等级 2021-03-11 18:34:36 +08:00
duhui f086046586 符号 2021-03-11 18:27:32 +08:00
duhui e01097fabc 鸿蒙阵突破共鸣问题 2021-03-11 18:19:09 +08:00
duhui f85e86a2eb 公告问题 2021-03-11 17:12:52 +08:00
mengchengzhen d4e5a2b6a4 holy 37type update 2021-03-11 17:02:35 +08:00
duhui 888a04a023 助战小bug修改 2021-03-11 11:19:31 +08:00
lvxinran f0abc728be 阈值修改提交 2021-03-10 17:29:28 +08:00
lvxinran dbcb1f98f9 阈值修改 2021-03-10 16:56:08 +08:00
lvxinran 5d7fad815e 修改阈值冲突 2021-03-10 16:16:22 +08:00
lvxinran ecde209b04 Merge branch 'master_test_gn' into master_test_gn_datatype
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
#	tablemanager/src/main/java/config/SCHero.java
2021-03-10 16:13:37 +08:00
duhui b1d5c773c2 四灵试炼,跑马灯 2021-03-10 16:09:24 +08:00
mengchengzhen b83f8583ec danaotiangong battlenode 2021-03-10 15:17:47 +08:00
duhui 14f3dd54e3 建木神树,跑马灯 2021-03-10 11:22:58 +08:00
duhui 3ff5d19972 四灵试炼,跑马灯 2021-03-10 11:16:21 +08:00
duhui 06a18387ed Merge branch 'master_test_hw' into dh_dev_HavocInHeaven 2021-03-10 11:02:56 +08:00
mengchengzhen 9fe8dd3e5f 大闹天宫圣物修改 2021-03-10 10:28:59 +08:00
duhui 53aa975368 Revert "查看他人装备共鸣"
This reverts commit 36b669d9e9.
2021-03-09 16:06:17 +08:00
duhui e46c9b42ab 二次提交 2021-03-09 16:04:12 +08:00
duhui 36b669d9e9 查看他人装备共鸣 2021-03-09 16:02:49 +08:00
lvxinran f2a0fffe24 敏感字修改 2021-03-09 15:48:48 +08:00
duhui 0b60f9c4f7 表字段添加,战力排行榜查看他人共鸣熟悉 2021-03-09 15:29:49 +08:00
lvxinran 269d7e07e2 越南敏感字 2021-03-08 16:00:55 +08:00
duhui 3a3b2725e3 redis批量查询key问题处理 2021-03-08 15:29:40 +08:00
duhui 50ce973616 Merge branch 'master_test_hw' into master_test_hw_four_challenge 2021-03-08 15:21:46 +08:00
duhui cf740db4e4 1.大闹天宫创建节点结构修改,有旧代码删除逻辑
2.公用静态类部分map添加注释,无逻辑修改
3.其他文件无用引导包删除
2021-03-08 15:12:05 +08:00
lvxinran 927d7d3352 邮件移交会长修改 2021-03-07 21:58:14 +08:00
lvxinran 0e1dad5f4a Merge branch 'master_test_hw' into master_test_hw_i18n 2021-03-05 18:17:16 +08:00
lvxinran 3f97a7c4b9 起名修改 2021-03-06 09:51:45 +08:00
lvxinran e52d39d346 邮件本地化修改 2021-03-06 06:48:02 +08:00
duhui c766cc8622 等级上限容错 2021-03-05 16:59:25 +08:00
lvxinran 6b6fc590b0 修改Error 2021-03-05 16:20:21 +08:00
lvxinran 183326536f 错误消息修改 2021-03-05 14:37:38 +08:00
duhui bbf63c4918 试炼节点bug处理 2021-03-05 13:59:51 +08:00
lvxinran a66380f1fc 获得宝物本地化提示修改 2021-03-05 12:36:34 +08:00
whb e0daeb180d 大闹天宫招募2 2021-03-05 11:29:10 +08:00
whb 0ef63cdd79 大闹天宫招募 2021-03-05 10:54:42 +08:00
duhui 9cc1fd8fc9 大闹天宫,获取排行榜速度优化 2021-03-05 10:11:35 +08:00
duhui 25aa13bfd5 大闹天宫,圣物刷新,去除已刷出得圣物 2021-03-04 14:09:35 +08:00
lvxinran 220954d949 Merge branch 'dh_dev_HavocInHeaven' of http://60.1.1.230/backend/jieling_server into dh_dev_HavocInHeaven 2021-03-05 09:07:33 +08:00
lvxinran bc75aaade9 贪婪节点奖励修改 2021-03-05 09:06:47 +08:00
lvxinran ce12694f5a Merge branch 'dh_dev_HavocInHeaven' of http://60.1.1.230/backend/jieling_server into dh_dev_HavocInHeaven 2021-03-04 09:48:33 +08:00
lvxinran 52b8d83bab 试炼节点修改 2021-03-04 09:48:27 +08:00
duhui ba269c61b8 大闹天宫,灵兽问题处理 2021-03-03 17:16:03 +08:00
duhui e4e241192a 获取灵兽信息,代码冗余处理 2021-03-03 14:18:27 +08:00
duhui 55500f6aaa 大闹天宫,用户等级修正和遇敌灵兽添加 2021-03-03 13:58:12 +08:00
duhui c99f1bea67 机器人类 2021-03-02 17:54:24 +08:00
duhui 76b9919dbb Merge branch 'master_online_hw' into master_test_hw 2021-03-02 10:02:45 +08:00
lvxinran 6076d7d47f Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-02 12:11:34 +08:00
lvxinran 63aa8f13f3 断线重连 心跳修改 2021-03-02 12:11:25 +08:00
lvxinran f87beb7368 删除无用日志 2021-03-06 04:44:59 +08:00
duhui 3dbc87013d 邮件,非道具邮件可重复领取问题处理 2021-03-02 10:01:53 +08:00
duhui 78709a72e8 大闹天宫,英雄排序方式优化 2021-03-02 09:50:44 +08:00
duhui bb842b6ea6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-01 11:50:16 +08:00
duhui 11fb77045f 非空验证 2021-03-01 11:50:02 +08:00
duhui 974891f80a 大闹天宫,遇敌 2021-03-01 11:01:24 +08:00
duhui abb94cdfb1 建木神树和四灵试炼,公告添加 2021-03-01 10:14:49 +08:00
duhui 987e392ae9 四灵试炼,回放战力 2021-02-26 18:22:59 +08:00
lvxinran 34b1c6d891 阈值修改第一版 2021-02-26 15:40:57 +08:00
mengchengzhen 91e53bdf42 zabbix登陆限制监测 2021-02-26 14:09:29 +08:00
duhui 0c84c3f839 邮件背包已满提示处理 2021-02-26 11:31:50 +08:00
duhui 2dc01e8b26 大闹天宫,遇敌刷新逻辑修改 2021-02-26 11:29:44 +08:00
lvxinran 4a09b99d48 回滚临时代码 2021-02-26 00:22:20 +08:00
lvxinran 976e8bcafd 初始200级 2021-02-26 00:04:03 +08:00
lvxinran fc432b013e 200人测试 2021-02-25 23:59:23 +08:00
lvxinran bcc02f5447 添加虚拟账号代码 2021-02-25 23:56:55 +08:00
duhui 60231a23a5 鸿蒙阵,根据最大星级获取最大等级,走表 2021-02-25 11:11:54 +08:00
duhui 1099169d1f 大闹天宫,初版未完成 2021-02-25 10:34:05 +08:00
mengchengzhen d8160bdfb0 排行榜20位优化 2021-02-24 10:27:08 +08:00
mengchengzhen 91dd46a809 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-24 10:20:07 +08:00
mengchengzhen 4e82991332 新头像 2021-02-24 10:19:59 +08:00
lvxinran afe20ec571 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-24 00:07:20 +08:00
lvxinran 5a1f8e8268 删除公会 删除排行 2021-02-24 00:07:11 +08:00
lvxinran bf68a3b434 Merge branch 'master_test_hw' into master_test_hw_i18n 2021-02-23 18:20:04 +08:00
duhui 0cca7ec7b4 助战刷新问题处理 2021-02-23 17:44:27 +08:00
whb cc2d7f9064 datatype 2021-02-23 15:54:00 +08:00
duhui f1847c33a0 鸿蒙阵,升级返回原始等级 2021-02-20 17:20:11 +08:00
duhui a4f7cb971f 鸿蒙阵,魂宝灵宝计算修改 2021-02-20 16:51:30 +08:00
duhui 944b5d5405 鸿蒙阵,魂灵宝bug修改 2021-02-19 15:50:46 +08:00
duhui 256fff3c57 鸿蒙阵,鸿蒙守卫魂宝灵宝,等级显示问题处理 2021-02-19 15:44:59 +08:00
duhui fa6937881c redis模糊key,scan方法封装 2021-02-19 15:23:49 +08:00