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 |
lvxinran
|
dc59c1f768
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-26 18:36:20 +08:00 |
zhangshanxue
|
935131223e
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-09-27 18:19:02 +08:00 |
zhangshanxue
|
9186cfc5dc
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-27 18:03:51 +08:00 |
zhangshanxue
|
c7e179ba55
|
网页支付过滤条件
|
2020-09-27 18:03:38 +08:00 |
lvxinran
|
1384cca3ee
|
云梦祈福修改
|
2020-09-26 18:36:08 +08:00 |
lvxinran
|
6fda647587
|
活动特权修复
|
2020-09-26 17:59:40 +08:00 |
lvxinran
|
742dfb5cbb
|
免费礼包修改
|
2020-09-26 15:00:05 +08:00 |
lvxinran
|
7c88b404c9
|
金额校验
|
2020-09-27 11:58:44 +08:00 |
lvxinran
|
dc9665c93a
|
特权时间修改
|
2020-09-27 10:01:52 +08:00 |
lvxinran
|
45d15fec1f
|
宝物bug修改
|
2020-09-27 10:01:35 +08:00 |
lvxinran
|
64ba0f5ac7
|
积天好礼发邮件修改
|
2020-09-25 16:19:53 +08:00 |
lvxinran
|
805ac98057
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-09-25 14:31:42 +08:00 |
lvxinran
|
5ec7abded1
|
森罗环境小怪重置刷新
|
2020-09-25 14:02:20 +08:00 |
lvxinran
|
647a31a16b
|
三界除魔提交,达人活动发奖异步
|
2020-09-25 13:57:09 +08:00 |
zhangshanxue
|
9ad1f39f5b
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-25 11:37:14 +08:00 |
lvxinran
|
716d2160de
|
天宫秘宝bug修改
|
2020-10-02 05:01:11 +08:00 |
zhangshanxue
|
02f957f54e
|
网页支付礼包限制
|
2020-09-25 11:37:04 +08:00 |
lvxinran
|
b958742c74
|
三界活动 修改
|
2020-09-24 18:28:04 +08:00 |
zhangshanxue
|
fc6c95fc22
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-23 16:58:11 +08:00 |
lvxinran
|
e73992d1d3
|
满级校验
|
2020-10-10 13:30:27 +08:00 |
zhangshanxue
|
fe44a27b41
|
大闹天宫节点刷新bug
|
2020-09-23 16:58:00 +08:00 |
lvxinran
|
5ea0547673
|
三界提交
|
2020-09-23 01:34:58 +08:00 |
lvxinran
|
749f0aa253
|
青龙秘宝修改
|
2020-09-28 05:06:42 +08:00 |
lvxinran
|
16c9e3deac
|
达人活动添加
|
2020-09-23 16:08:00 +08:00 |
lvxinran
|
0dc8d8c5b8
|
天宫达人
|
2020-09-23 14:17:39 +08:00 |
lvxinran
|
175b75a796
|
免费礼包、达人活动提交
|
2020-09-25 11:44:36 +08:00 |
zhangshanxue
|
c264817928
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-22 18:17:15 +08:00 |
zhangshanxue
|
8788dba24e
|
公会bug
|
2020-09-22 18:16:40 +08:00 |
zhangshanxue
|
65602bd986
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 21:00:46 +08:00 |
zhangshanxue
|
cba3a332a7
|
未入库
|
2020-09-21 21:00:38 +08:00 |
lvxinran
|
a339c6f8df
|
关卡战斗修改
|
2020-09-21 20:44:23 +08:00 |
zhangshanxue
|
0875daa209
|
未入库
|
2020-09-21 20:29:09 +08:00 |
zhangshanxue
|
949cc3cf50
|
数据上报错误
|
2020-09-21 20:06:34 +08:00 |
lvxinran
|
e347397922
|
关卡日志修改
|
2020-09-21 18:21:45 +08:00 |
zhangshanxue
|
c90d741866
|
数据上报错误
|
2020-09-21 17:41:48 +08:00 |
zhangshanxue
|
86724a73b7
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 16:19:12 +08:00 |
zhangshanxue
|
f3eea7067d
|
数据上报目录配置
|
2020-09-21 16:18:43 +08:00 |
lvxinran
|
cff0723c20
|
战力排行修复
|
2020-09-21 12:14:43 +08:00 |
lvxinran
|
d2c96bbe1a
|
战力排行信息修改
|
2020-09-21 11:58:20 +08:00 |
lvxinran
|
085e611beb
|
战力排行日志
|
2020-09-21 11:56:43 +08:00 |
lvxinran
|
0778e74ca8
|
战力排行日志
|
2020-09-21 11:18:30 +08:00 |
lvxinran
|
0d28f6fae5
|
0.99充值活动修改
|
2020-09-23 07:14:49 +08:00 |
lvxinran
|
e3027f1157
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-09-21 06:03:35 +08:00 |
lvxinran
|
c107d23934
|
累充0.99修改
|
2020-09-21 06:03:24 +08:00 |
zhangshanxue
|
0b3715aae1
|
大闹天宫刷新时间
|
2020-09-18 18:31:08 +08:00 |
lvxinran
|
c8913cb5ac
|
上报ip修改
|
2020-09-18 00:53:27 +08:00 |
lvxinran
|
991f789f6c
|
道具流水gm修改
|
2020-09-17 17:50:23 +08:00 |
DESKTOP-98AVA47\Administrator
|
1fa16cadd0
|
猎妖之路节点生成错误
|
2020-09-24 21:43:09 +08:00 |
lvxinran
|
22a5668ac2
|
在线奖励添加一键领取
|
2020-09-16 12:32:53 +08:00 |
lvxinran
|
28d2780c3b
|
车迟斗法排行日志
|
2020-09-16 05:16:02 +08:00 |
lvxinran
|
cb75ce8f9d
|
破阵诛仙活动 刷新修改
|
2020-09-16 05:03:09 +08:00 |
lvxinran
|
64e67ae8a1
|
大闹天宫打点
|
2020-09-15 20:52:46 +08:00 |
lvxinran
|
7b33db16df
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 18:49:27 +08:00 |
lvxinran
|
8bc3d089dd
|
大闹天宫埋点修改
|
2020-09-15 18:49:17 +08:00 |
jiahuiwen
|
ff1271b151
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:44:32 +08:00 |
jiahuiwen
|
a4d8819350
|
规范日志
|
2020-09-15 16:44:15 +08:00 |
lvxinran
|
a9c7040dc9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:19:35 +08:00 |
zhangshanxue
|
0a565bb025
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:16:07 +08:00 |
zhangshanxue
|
f4dc939fc2
|
网页支付玩家定制化商品列表
|
2020-09-15 16:15:59 +08:00 |
lvxinran
|
ff8772dd4f
|
工会副本buff修改
|
2020-09-15 16:15:56 +08:00 |
lvxinran
|
bb6a149f89
|
天宫秘宝修改
|
2020-09-15 14:43:13 +08:00 |
lvxinran
|
d0aebf10f3
|
数据上报字段修改,森罗环境层数排行修改
|
2020-09-15 13:47:04 +08:00 |
lvxinran
|
3328d48b41
|
重置最高层减1
|
2020-09-15 11:02:02 +08:00 |
jiahuiwen
|
33bd562ea6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-11 10:05:49 +08:00 |
lvxinran
|
a1b7bc9e68
|
tapdb货币类型
|
2020-09-17 16:12:13 +08:00 |
jiahuiwen
|
5c4d7e49e2
|
添加空判断
|
2020-09-11 10:05:43 +08:00 |
lvxinran
|
ccc1011023
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 15:17:12 +08:00 |
lvxinran
|
644632f740
|
心魔、日常打点修改
|
2020-09-10 15:17:04 +08:00 |
lvxinran
|
4b0083bea9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-25 10:32:14 +08:00 |
lvxinran
|
066de19115
|
天宫秘宝修改
|
2020-09-25 10:32:09 +08:00 |
zhangshanxue
|
d2c5509766
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-09 15:06:55 +08:00 |
zhangshanxue
|
7aad0e485b
|
商品id未赋值
|
2020-09-09 15:06:48 +08:00 |
zhangshanxue
|
70d170c341
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 18:13:05 +08:00 |
zhangshanxue
|
eb37e958f6
|
充值上报汇率
|
2020-09-07 18:12:26 +08:00 |
lvxinran
|
9e32a22e06
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-20 20:55:38 +08:00 |