zhangshanxue
|
7c907c8f73
|
社稷大典个人排行结算限制
|
2020-11-01 10:04:08 +08:00 |
zhangshanxue
|
6d538792e9
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-01 09:58:23 +08:00 |
zhangshanxue
|
afe95a16e8
|
社稷大典
|
2020-10-31 19:37:33 +08:00 |
lvxinran
|
dd2ef8617d
|
判官笔复活不计入天宫达人,bug修改
|
2020-10-28 16:52:59 +08:00 |
lvxinran
|
4f3c4fc8fb
|
灵兽系统消息添加
|
2020-10-28 16:51:51 +08:00 |
lvxinran
|
1fa383a2ed
|
首通奖励添加
|
2020-10-27 18:28:52 +08:00 |
lvxinran
|
89122562b5
|
怪物组内添加灵兽提交
|
2020-10-27 17:23:04 +08:00 |
lvxinran
|
09d9d1d536
|
活动抽卡埋点,升星埋点修改,灵兽升级修改
|
2020-10-27 15:43:28 +08:00 |
lvxinran
|
c96a16f112
|
Merge branch 'master_test_hw' into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-10-27 13:56:10 +08:00 |
zhangshanxue
|
101c50c28f
|
社稷大典公会排行
|
2020-10-31 11:39:15 +08:00 |
lvxinran
|
9f44b5de2a
|
无用日志
|
2020-10-27 13:53:49 +08:00 |
zhangshanxue
|
76c082bccc
|
数数免费礼包不上报 社稷大典排行进度 月礼包
|
2020-10-26 19:27:16 +08:00 |
lvxinran
|
40f12ac7b6
|
容错代码添加,心魔打点修改
|
2020-10-26 17:25:52 +08:00 |
zhangshanxue
|
2cf701c6eb
|
数数免费礼包不上报
|
2020-10-28 12:19:11 +08:00 |
zhangshanxue
|
ecc95a79a4
|
社稷大典公会排行
|
2020-10-28 12:14:06 +08:00 |
lvxinran
|
29fadcb9ea
|
灵兽信息获取
|
2020-10-26 16:05:50 +08:00 |
jiahuiwen
|
f62d9b6a13
|
注释日志
|
2020-10-26 13:43:56 +08:00 |
jiahuiwen
|
1a6a115b1c
|
getStartTime 添加日志
|
2020-10-26 10:19:20 +08:00 |
lvxinran
|
46fee5ae4e
|
战斗 灵兽修改
|
2020-10-26 10:05:30 +08:00 |
zhangshanxue
|
f1d7511218
|
社稷大典 初始化提交
|
2020-10-25 18:24:34 +08:00 |
zhangshanxue
|
df0850d74b
|
Merge branch 'master_test_hw' into master_test_hw_sheji
|
2020-10-25 17:01:48 +08:00 |
zhangshanxue
|
1d9452992c
|
社稷大典功能提交
|
2020-10-25 17:00:45 +08:00 |
zhangshanxue
|
210f4a1529
|
社稷大典代码提交
|
2020-10-25 17:00:00 +08:00 |
lvxinran
|
3dd49ea868
|
折扣 妖精抽卡次数提交
|
2020-10-24 15:52:25 +08:00 |
lvxinran
|
8a1c93570d
|
灵兽战斗数据组装
|
2020-10-23 17:54:22 +08:00 |
lvxinran
|
3cece5a571
|
代码优化
|
2020-10-23 14:11:02 +08:00 |
lvxinran
|
64fcc5a485
|
修改内存不一致,无尽副本迷雾问题
|
2020-10-23 14:09:46 +08:00 |
lvxinran
|
d054d48907
|
灵兽战斗数据添加
|
2020-10-23 13:38:08 +08:00 |
lvxinran
|
bf282624e7
|
灵兽提交
|
2020-10-22 20:26:40 +08:00 |
lvxinran
|
03069929b7
|
灵兽代码整理
|
2020-10-22 14:59:51 +08:00 |
lvxinran
|
ea949f28e5
|
Merge branch 'master_test_hw_special_monster' of http://60.1.1.230/backend/jieling_server into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-10-22 14:57:57 +08:00 |
lvxinran
|
f5427e27a7
|
灵兽放生,涅槃
|
2020-10-22 14:48:26 +08:00 |
jiahuiwen
|
bc486f6f9b
|
Merge branch 'master_test_hw_special_monster' of http://60.1.1.230/backend/jieling_server into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-10-21 17:54:16 +08:00 |
jiahuiwen
|
c8622ee56d
|
灵兽上阵
|
2020-10-21 17:52:39 +08:00 |
lvxinran
|
9f2f406561
|
商品空判断
|
2020-10-21 15:32:49 +08:00 |
lvxinran
|
c78f778881
|
灵兽升级
|
2020-10-21 15:30:47 +08:00 |
lvxinran
|
fc8401823f
|
修复十绝阵问题
|
2020-10-21 14:58:35 +08:00 |
zhangshanxue
|
19d6490be2
|
免费礼包无法领取
|
2020-10-21 11:22:30 +08:00 |
lvxinran
|
64744bb3bb
|
修改灵兽
|
2020-10-21 10:21:06 +08:00 |
jiahuiwen
|
871ba646e0
|
异妖可下阵
|
2020-10-20 20:08:36 +08:00 |
zhangshanxue
|
44f3df5fcf
|
获取玩家信息失败
|
2020-10-20 19:10:45 +08:00 |
jiahuiwen
|
defb87c5da
|
异妖编队修改
|
2020-10-20 17:56:27 +08:00 |
zhangshanxue
|
57f55498ee
|
gm账号添加英雄
|
2020-10-20 16:44:22 +08:00 |
lvxinran
|
34f3d40ee4
|
商店修改
|
2020-10-29 04:57:51 +08:00 |
lvxinran
|
4ff51ce551
|
添加特权
|
2020-10-29 09:29:23 +08:00 |
lvxinran
|
c38ea8c334
|
红点修改
|
2020-10-19 23:41:30 +08:00 |
lvxinran
|
947b8f78b5
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-19 23:17:57 +08:00 |
lvxinran
|
0a838fffcd
|
初始化道具修改
|
2020-10-19 23:17:48 +08:00 |
zhangshanxue
|
423787d310
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-19 22:49:16 +08:00 |
zhangshanxue
|
9ef34cd692
|
异步发奖 出错
|
2020-10-19 22:48:45 +08:00 |
lvxinran
|
b89fd738ca
|
添加道具
|
2020-10-19 22:36:24 +08:00 |
lvxinran
|
75d86b8203
|
逍遥游数据删除
|
2020-10-19 21:36:23 +08:00 |
zhangshanxue
|
005483bbf1
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-10-19 21:28:50 +08:00 |
zhangshanxue
|
e6c6819aae
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-10-19 21:27:08 +08:00 |
zhangshanxue
|
8740994520
|
线上账号登录异常
|
2020-10-19 21:26:55 +08:00 |
lvxinran
|
048c9177fd
|
逍遥游红点
|
2020-10-19 20:22:47 +08:00 |
lvxinran
|
1c0cbabcad
|
修改灵兽
|
2020-10-19 19:58:52 +08:00 |
lvxinran
|
42c7e31723
|
灵兽 结构修改,部分接口修改
|
2020-10-19 16:36:17 +08:00 |
lvxinran
|
d307a4a0fc
|
逍遥游消耗物品
|
2020-10-19 15:22:22 +08:00 |
lvxinran
|
7abd3c2dba
|
等级校验添加
|
2020-10-19 14:01:14 +08:00 |
lvxinran
|
674e421e27
|
普通奖励修改
|
2020-10-19 09:59:56 +08:00 |
lvxinran
|
3f862e1ce3
|
Merge branch 'master_test_hw' into master_test_journey
|
2020-10-17 18:14:06 +08:00 |
lvxinran
|
f4c4f22919
|
逍遥游修改
|
2020-10-17 18:11:58 +08:00 |
zhangshanxue
|
b27077e6f2
|
充值金额过滤
|
2020-10-16 15:22:12 +08:00 |
zhangshanxue
|
82673bcee7
|
user lru
|
2020-10-16 14:46:13 +08:00 |
lvxinran
|
f7c5cfb7c4
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-31 17:26:31 +08:00 |
lvxinran
|
f2cb92c4c2
|
宝物精炼不消耗bug
|
2020-10-31 17:26:22 +08:00 |
zhangshanxue
|
4c60691839
|
修复宝器进错背包数据
|
2020-10-19 01:13:31 +08:00 |
zhangshanxue
|
0c8cfc0e4a
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-19 00:33:52 +08:00 |
zhangshanxue
|
ab8815cfcd
|
魂印过滤及日常刷新
|
2020-10-19 00:33:42 +08:00 |
zhangshanxue
|
171d86addf
|
青龙秘宝任务刷新
|
2020-10-17 22:10:01 +08:00 |
lvxinran
|
10011c4027
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-10-30 16:25:17 +08:00 |
lvxinran
|
97de16f24a
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-10-30 15:40:18 +08:00 |
zhangshanxue
|
cccb53e1ae
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-08 14:35:00 +08:00 |
zhangshanxue
|
ddc7f15b63
|
掉落bug
|
2020-11-08 14:34:02 +08:00 |
lvxinran
|
c556d0c425
|
修改宝物分解
|
2020-10-30 15:40:14 +08:00 |
lvxinran
|
2d28e51301
|
回春散加血修改
|
2020-10-30 11:15:42 +08:00 |
lvxinran
|
6991d23e69
|
特权修复
|
2020-10-30 10:47:45 +08:00 |
lvxinran
|
663b3c9723
|
逍遥游逻辑
|
2020-10-16 14:19:16 +08:00 |
lvxinran
|
7ced543cb1
|
大闹天宫机器人修改
|
2020-10-15 21:27:25 +08:00 |
lvxinran
|
07cb65d63a
|
十绝阵排行修改
|
2020-10-15 21:25:20 +08:00 |
lvxinran
|
2cfe662de8
|
战斗类型添加
|
2020-10-14 21:12:24 +08:00 |
DESKTOP-98AVA47\Administrator
|
5fc0a86b00
|
乾坤宝盒保底次数负数修改
|
2020-10-14 16:31:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
e8616191b6
|
日常修复、森罗幻境修复
|
2020-10-14 16:29:19 +08:00 |
jiahuiwen
|
5499d28bf2
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-13 14:58:30 +08:00 |
jiahuiwen
|
8df6762548
|
25闯关礼包、26、心魔试炼礼包 触发和推送
|
2020-10-13 14:58:25 +08:00 |
zhangshanxue
|
af5d3395c3
|
新增达人活动
|
2020-10-12 13:45:00 +08:00 |
zhangshanxue
|
16cb452afe
|
新增达人活动
|
2020-10-23 14:27:52 +08:00 |
zhangshanxue
|
1751ac7e44
|
英雄脱装备修复
|
2020-10-10 10:51:21 +08:00 |
zhangshanxue
|
ca2e499a9f
|
法宝分解前后端不一致
|
2020-10-09 18:03:05 +08:00 |
zhangshanxue
|
42917b3043
|
升星法宝报错 和 法宝穿戴bug
|
2020-10-09 17:24:53 +08:00 |
zhangshanxue
|
43943aeed3
|
大闹天宫返还会掉落的装备
|
2020-10-09 17:24:01 +08:00 |
zhangshanxue
|
384f4ff481
|
踢人下线
|
2020-10-09 14:18:27 +08:00 |
zhangshanxue
|
f0bda1ef52
|
死循环
|
2020-10-02 02:22:11 +08:00 |
zhangshanxue
|
72256d2370
|
死循环
|
2020-10-02 01:00:48 +08:00 |
lvxinran
|
838db384fd
|
迷宫达人修改
|
2020-10-17 23:21:38 +08:00 |
zhangshanxue
|
adb2c8d9c9
|
成长基金报错
|
2020-09-30 14:12:02 +08:00 |
zhangshanxue
|
10d97f1de4
|
成长基金报错
|
2020-09-30 13:25:38 +08:00 |
lvxinran
|
0e8b31c1a7
|
森罗环境修复
|
2020-09-27 20:54:41 +08:00 |
lvxinran
|
dee3658f2f
|
下一层校验
|
2020-09-27 20:05:11 +08:00 |