Commit Graph

4371 Commits (7118b6a40c5fc05171d70cced4a62b74b42e69ee)
 

Author SHA1 Message Date
lvxinran f275342e67 物品上限添加 2020-11-27 18:49:25 +08:00
lvxinran 0494ff83f2 战斗同步 2020-11-27 16:52:55 +08:00
zhangshanxue 6b4d5296db Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena 2020-11-27 15:27:06 +08:00
zhangshanxue b27f4e489c 初步提交 2020-11-27 15:26:55 +08:00
duhui 4051b4dd61 法宝升级通知 2020-11-27 14:19:14 +08:00
duhui 249580edf7 暂存,功能没写完 2020-11-27 14:07:56 +08:00
lvxinran 44a241b52c Revert "鸿蒙碑初版"
This reverts commit 8057c913bb.
2020-11-27 10:58:29 +08:00
lvxinran e80c2b6e03 Revert "鸿蒙阵"
This reverts commit c1bc98d972.
2020-11-27 10:58:18 +08:00
lvxinran fd5d07ee15 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-27 10:49:33 +08:00
lvxinran c2bbab2c13 灵兽分页,背包已满 添加 2020-11-27 10:49:24 +08:00
jiahuiwen c1bc98d972 鸿蒙阵 2020-11-26 20:24:33 +08:00
jiahuiwen 0ad0e87617 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-11-26 20:06:24 +08:00
jiahuiwen 8057c913bb 鸿蒙碑初版 2020-11-26 20:06:17 +08:00
duhui 1c3102157d 竞技场积分修改,物品掉落 2020-11-26 11:13:47 +08:00
zhangshanxue 42b0ca9980 恢复榜单 2020-11-25 21:19:59 +08:00
zhangshanxue b16b5e79de 恢复榜单 2020-11-25 21:14:27 +08:00
zhangshanxue 8ea43c3aff 恢复榜单 2020-11-25 20:40:42 +08:00
zhangshanxue 1c43e235ae Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw 2020-11-25 20:28:44 +08:00
zhangshanxue c35dbf7dbe 恢复榜单 2020-11-25 20:28:11 +08:00
lvxinran 82f9aca0d0 社稷大典修改删除数据 2020-11-25 17:01:22 +08:00
lvxinran 6c7b164b53 打点加入日志 2020-11-24 16:36:03 +08:00
lvxinran a44c3aa81f Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportEventEnum.java
2020-11-23 21:24:05 +08:00
zhangshanxue 424fe9e01d 社稷大典活动开始 公会积分不清 2020-11-23 17:13:01 +08:00
lvxinran 976671200f 工会副本边界修改 2020-11-23 16:43:40 +08:00
DESKTOP-98AVA47\Administrator 6141729602 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-28 05:05:22 +08:00
DESKTOP-98AVA47\Administrator bdd009d7cb Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-19 22:52:01 +08:00
DESKTOP-98AVA47\Administrator 52cbb01232 工会副本修改 2020-12-17 04:10:05 +08:00
lvxinran 0a9e9203cd 公会副本修改 2020-12-01 09:18:18 +08:00
lvxinran a8a99c38e9 技能修改 2020-12-01 04:08:02 +08:00
lvxinran 6789a64113 公会副本修改 2020-11-30 10:50:30 +08:00
lvxinran 171bbd248d 跨服竞技场新加功能 2020-11-30 09:23:00 +08:00
lvxinran 24643113b9 灵兽抽卡打点修改 2020-11-30 09:22:21 +08:00
lvxinran 850ff06022 充值上报设备id,公会副本第二天首次不嫩挑战 2020-11-30 08:09:14 +08:00
lvxinran d2b35e4d32 公会副本最后一个修改 2020-11-26 07:37:51 +08:00
lvxinran 2868cf7c6e 副本刷新 2020-11-24 07:28:52 +08:00
lvxinran 5640521082 修改表数据 2020-11-23 15:18:28 +08:00
lvxinran 9de88982e2 天宫秘宝15攻击力加成 2020-11-23 14:31:37 +08:00
lvxinran 3107bf3254 修改分组 2020-11-23 14:00:50 +08:00
lvxinran 8ed8485114 服务器分组修改 2020-11-23 13:58:32 +08:00
lvxinran 416beb8d33 分组提交 2020-12-01 10:55:37 +08:00
lvxinran 88c481126f Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena 2020-12-01 10:25:10 +08:00
lvxinran b89e6988fe 工具类添加 2020-12-01 10:24:46 +08:00
lvxinran dae97e80a4 车迟斗法抢夺排行修改 2020-11-21 19:29:58 +08:00
lvxinran 499bc8099f 埋点错误修改 2020-11-21 19:29:37 +08:00
lvxinran 1cd25bedf6 数数打点修改 2020-11-20 15:26:40 +08:00
lvxinran 3d6da1905c 每分钟线程加入打印内存 2020-11-22 07:40:52 +08:00
lvxinran f8a502b6b0 推送礼包修改 2020-11-21 15:17:31 +08:00
lvxinran 46257c701e 公会副本boss修改 2020-11-20 13:20:00 +08:00
zhangshanxue b9fd7bfdf7 跨服服务器通信初版完成 2020-11-20 10:23:16 +08:00
zhangshanxue 4d9a185be5 跨服服务器通信初版完成 2020-11-19 20:33:41 +08:00