Commit Graph

5138 Commits (d265432e5a3b9574e5c2e5222a96722fa54c3283)
 

Author SHA1 Message Date
lvxinran d265432e5a 无用代码注释 2021-07-10 01:00:06 +08:00
lvxinran 99de70fb11 休战期处理 2021-07-10 00:44:15 +08:00
lvxinran 9eb6920fe7 缓存删除修改 2021-07-10 00:27:46 +08:00
lvxinran 24cc1fbbf1 跨服修改 2021-07-05 01:27: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 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 af83955bd5 跨服时间状态 2021-06-23 14:43:00 +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 870f5eea52 临时保存 2021-06-17 15:23:37 +08:00
lvxinran c4d6ee097b 跨服修改 2021-06-16 18:11:23 +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
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 b50ef76173 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-06-10 16:44:28 +08:00
xuexinpeng 50d70c41f9 山河社稷图奖励数据排序 2021-06-10 16:39:08 +08:00
lvxinran 62ddfec982 删除无用 2021-06-10 16:36:46 +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