duhui
|
813ff75cfb
|
套装优化
|
2020-12-11 17:17:12 +08:00 |
zhangshanxue
|
95870b74d5
|
跨服服务器
|
2020-12-11 13:57:47 +08:00 |
zhangshanxue
|
64700c9190
|
社稷积分
|
2020-12-10 16:37:14 +08:00 |
DESKTOP-98AVA47\Administrator
|
13849ac7b8
|
社稷大典积分恢复
|
2020-12-11 02:07:22 +08:00 |
lvxinran
|
3e4b27fa9d
|
竞技场修改
|
2020-12-08 21:10:15 +08:00 |
jiahuiwen
|
ed1e5e1233
|
鸿蒙碑等级
|
2020-12-08 18:08:45 +08:00 |
zhangshanxue
|
5e0c455469
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-12-08 16:58:46 +08:00 |
zhangshanxue
|
220d2b802d
|
巅峰赛 记录bug
|
2020-12-08 16:58:38 +08:00 |
jiahuiwen
|
d3a11d5305
|
鸿蒙碑
|
2020-12-08 16:28:09 +08:00 |
duhui
|
2ae47522f3
|
Merge branch 'dev_dh_xinjiang' into master_test_hw
|
2020-12-08 11:36:41 +08:00 |
lvxinran
|
a2a1edb290
|
战斗覆盖技能
|
2020-12-08 11:32:59 +08:00 |
duhui
|
d7b5a22965
|
竞技场积分加减1问题
|
2020-12-08 11:12:09 +08:00 |
duhui
|
39505c9d24
|
竞技场分数+-1问题
|
2020-12-08 10:40:42 +08:00 |
DESKTOP-98AVA47\Administrator
|
951e54fb0b
|
社稷大典跨期刷新
|
2020-12-15 21:38:46 +08:00 |
zhangshanxue
|
4bce4b8e96
|
跨服服务器
|
2020-12-07 14:44:12 +08:00 |
duhui
|
c1fcfcf3a2
|
新将活动应策划需求改版,掉落比例重新计算
|
2020-12-07 13:53:25 +08:00 |
zhangshanxue
|
bfb89434cd
|
跨服服务器
|
2020-12-03 21:02:17 +08:00 |
zhangshanxue
|
92e5c50e24
|
大闹天宫圣物效果
|
2020-12-03 19:32:28 +08:00 |
zhangshanxue
|
08b85eb654
|
大闹天宫圣物效果
|
2020-12-03 16:23:56 +08:00 |
duhui
|
686596375d
|
新将来袭初版
|
2020-12-03 10:27:55 +08:00 |
lvxinran
|
b217c19431
|
竞技场排名优化
|
2020-12-03 10:06:22 +08:00 |
jiahuiwen
|
98ddcf78fc
|
鸿蒙碑
|
2020-12-02 19:30:19 +08:00 |
duhui
|
e0c2c51303
|
no message
|
2020-12-02 14:13:11 +08:00 |
duhui
|
21aec6d252
|
竞技场修改
|
2020-12-02 10:42:23 +08:00 |
duhui
|
ed7d883cce
|
临时提交2
|
2020-12-02 10:29:51 +08:00 |
zhangshanxue
|
904d77814f
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-30 11:56:35 +08:00 |
zhangshanxue
|
93b394ce7e
|
【模块】大闹天宫-战斗后圣物刷新种类不正确
|
2020-11-30 11:55:29 +08:00 |
lvxinran
|
e1bae5947d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-28 08:55:56 +08:00 |
lvxinran
|
2476e457af
|
挂机预览修改
|
2020-11-28 08:55:46 +08:00 |
lvxinran
|
f275342e67
|
物品上限添加
|
2020-11-27 18:49:25 +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
|
11ac7ec7ad
|
鸿蒙 切分支
|
2020-11-27 10:57:42 +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 |
lvxinran
|
9de88982e2
|
天宫秘宝15攻击力加成
|
2020-11-23 14:31:37 +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
|
416beb8d33
|
分组提交
|
2020-12-01 10:55:37 +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 |
zhangshanxue
|
360a8c51e0
|
跨服服务器
|
2020-11-19 17:24:22 +08:00 |
jiahuiwen
|
47d40eae84
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-16 16:13:52 +08:00 |
lvxinran
|
6b88321136
|
车迟斗法超int修改,打点信息修改
|
2020-11-18 11:44:37 +08:00 |
zhangshanxue
|
f94f4dca70
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-14 11:17:12 +08:00 |
lvxinran
|
23bfdbe50f
|
灵兽抽卡修改
|
2020-11-16 21:09:43 +08:00 |
lvxinran
|
3a9dd33fe9
|
Merge branch 'master_test_hw' into master_test_hw_monsterActivity
|
2020-11-16 20:21:10 +08:00 |
lvxinran
|
36304b135e
|
灵兽活动提交
|
2020-11-16 20:20:45 +08:00 |
zhangshanxue
|
e49bce75c2
|
巅峰赛竞猜bug
|
2020-11-14 11:17:04 +08:00 |
zhangshanxue
|
aa985f2a7f
|
公会任命bug
|
2020-11-14 05:59:44 +08:00 |
jiahuiwen
|
1d9f38d9ca
|
最大星级判断
|
2020-11-11 14:25:54 +08:00 |
lvxinran
|
e97dc6b28c
|
灵兽相关打点
|
2020-12-24 08:35:32 +08:00 |
lvxinran
|
f72e72a48e
|
累计充值修改bug
|
2020-12-24 06:27:56 +08:00 |
lvxinran
|
dbd56d502e
|
特权0点到期
|
2020-12-15 18:07:28 +08:00 |
lvxinran
|
64136e2f0f
|
特权时间改5点
|
2020-12-15 17:39:23 +08:00 |
lvxinran
|
79d99139fe
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_review_gm.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-12-15 17:00:45 +08:00 |
lvxinran
|
7e59e80929
|
特权时间修复
|
2020-12-15 15:40:13 +08:00 |
jiahuiwen
|
5a84536aa6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-11 09:57:25 +08:00 |
jiahuiwen
|
d646106de5
|
英雄觉醒飘字
|
2020-11-11 09:57:11 +08:00 |
zhangshanxue
|
0c67fac433
|
//重置线上线上线程
|
2020-11-09 15:06:29 +08:00 |
zhangshanxue
|
718468b3a1
|
易经宝库
|
2020-11-09 13:42:03 +08:00 |
zhangshanxue
|
f84dcbd84c
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-09 11:12:44 +08:00 |
lvxinran
|
3be0f4ff8d
|
更换皮肤 上传战力修改
|
2020-11-15 10:58:25 +08:00 |
lvxinran
|
3da4886afb
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-15 09:47:39 +08:00 |
zhangshanxue
|
16ded73f10
|
易经宝库道具回收
|
2020-11-17 16:59:04 +08:00 |
lvxinran
|
73510bd864
|
皮肤活动提交
|
2020-11-15 09:47:25 +08:00 |
zhangshanxue
|
08e1b94c60
|
易经宝库
|
2020-11-09 11:12:37 +08:00 |
lvxinran
|
f303840402
|
森罗环境皮肤
|
2020-11-06 17:18:07 +08:00 |
zhangshanxue
|
cd8fd29036
|
Merge branch 'master_test_hw' into master_test_hw_sub
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-11-06 16:24:38 +08:00 |
zhangshanxue
|
8e3704bf67
|
易经宝库提交
|
2020-11-06 16:22:53 +08:00 |
jiahuiwen
|
d1d38a85a0
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-06 16:12:42 +08:00 |
jiahuiwen
|
fd8e564a15
|
英雄觉醒
|
2020-11-06 16:12:37 +08:00 |
lvxinran
|
51d30fe4e0
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-06 15:11:24 +08:00 |
lvxinran
|
298d799594
|
技能皮肤修改
|
2020-11-06 15:11:18 +08:00 |
zhangshanxue
|
7a42112a9c
|
查看历史记录
|
2020-11-06 14:38:34 +08:00 |
lvxinran
|
44852b0601
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-12 14:47:52 +08:00 |
lvxinran
|
76d2fea459
|
打点修改,车迟斗法无抢夺目标修改
|
2020-11-12 14:47:15 +08:00 |
zhangshanxue
|
977df8a09c
|
大闹天宫
|
2020-11-06 13:32:43 +08:00 |
lvxinran
|
9ee34bc002
|
森罗皮肤时间
|
2020-11-06 10:56:52 +08:00 |
lvxinran
|
01620df5a9
|
Merge branch 'master_test_hw' into master_test_skin
|
2020-11-06 10:21:37 +08:00 |
lvxinran
|
841d2aa8a8
|
皮肤逻辑提交
|
2020-11-06 10:21:12 +08:00 |
zhangshanxue
|
9e9fc2e3c6
|
网页支付礼包逻辑
|
2020-11-04 18:10:18 +08:00 |
zhangshanxue
|
711fa42582
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-11-04 17:54:04 +08:00 |
zhangshanxue
|
1c56fa0487
|
网页支付礼包逻辑
|
2020-11-04 17:51:50 +08:00 |
lvxinran
|
ebc1382f72
|
过期数据清除
|
2020-12-30 05:15:14 +08:00 |
lvxinran
|
4a85ed8661
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-30 04:43:14 +08:00 |
lvxinran
|
3c8b1cd713
|
灵兽修改
|
2020-12-30 04:43:06 +08:00 |
lvxinran
|
ffc193d2fe
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-30 03:46:25 +08:00 |
lvxinran
|
3ea067d9cb
|
配置加入
|
2020-12-30 03:46:13 +08:00 |
lvxinran
|
da8f86864d
|
老号特权修改
|
2020-12-30 02:04:05 +08:00 |
lvxinran
|
b99117fe0b
|
默认值修改
|
2020-12-23 01:16:14 +08:00 |
lvxinran
|
cda3ad53a7
|
巅峰赛修改
|
2020-12-23 01:10:55 +08:00 |
lvxinran
|
5dc5ab2ae5
|
巅峰赛加入灵兽
|
2020-12-08 23:47:25 +08:00 |
zhangshanxue
|
fa68864f62
|
Revert "巅峰赛临时提交"
This reverts commit c654004bc8 .
|
2020-11-07 12:35:33 +08:00 |
zhangshanxue
|
c654004bc8
|
巅峰赛临时提交
|
2020-11-07 12:28:04 +08:00 |
zhangshanxue
|
ca17f5d39d
|
Revert "巅峰赛临时提交"
This reverts commit 78dc96b172 .
|
2020-11-07 12:26:15 +08:00 |
zhangshanxue
|
78dc96b172
|
巅峰赛临时提交
|
2020-11-07 12:16:26 +08:00 |
lvxinran
|
17fc7ac344
|
打点报错信息打印,抽卡打点修改
|
2020-11-04 14:24:08 +08:00 |
lvxinran
|
f3af1b0c4b
|
皮肤修改
|
2020-11-04 13:50:33 +08:00 |
lvxinran
|
93fae4842a
|
商店try catch
|
2020-11-04 09:34:50 +08:00 |
lvxinran
|
4105cb1292
|
激活皮肤消耗
|
2020-11-01 18:50:54 +08:00 |
lvxinran
|
7232b8604a
|
皮肤 头像修改
|
2020-11-03 05:25:17 +08:00 |
lvxinran
|
aa6133e571
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-01 17:38:13 +08:00 |
zhangshanxue
|
adc51d3942
|
战斗日志打印
|
2020-11-07 01:43:58 +08:00 |
lvxinran
|
606753c705
|
森罗灵兽加成修改,宝物容错加入
|
2020-11-01 17:38:08 +08:00 |
lvxinran
|
4c78acd96f
|
上阵校验
|
2020-11-03 06:11:39 +08:00 |
lvxinran
|
348fff34e4
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-03 05:27:01 +08:00 |
zhangshanxue
|
1478f5e48b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-04 03:34:26 +08:00 |
zhangshanxue
|
cedf01492c
|
商店可动态控制栏位显示
|
2020-11-04 03:34:10 +08:00 |
lvxinran
|
51ef8ff581
|
编队灵兽修改
|
2020-11-03 05:26:52 +08:00 |
lvxinran
|
51dbb4e596
|
循环最大次数校验
|
2020-10-31 10:50:25 +08:00 |
lvxinran
|
d81ab02559
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-10-31 10:02:42 +08:00 |
zhangshanxue
|
345de35e8e
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
# tablemanager/src/main/java/config/SGodSacrificeSetting.java
|
2020-11-04 00:32:18 +08:00 |
zhangshanxue
|
9a4e721ba7
|
功能刷新和大闹天宫试炼节点bug
|
2020-11-04 00:26:44 +08:00 |
zhangshanxue
|
f9b2a3e52a
|
修复月卡不触发
|
2020-11-09 01:11:50 +08:00 |
lvxinran
|
8eb7441775
|
小游戏内存修改
|
2020-10-31 10:02:33 +08:00 |
lvxinran
|
aa94e3bc5b
|
英雄皮肤添加
|
2020-10-31 09:58:34 +08:00 |
lvxinran
|
66c2308952
|
车迟斗法抢夺匹配修改
|
2020-10-31 04:54:46 +08:00 |
lvxinran
|
4b53c7e5d0
|
皮肤添加
|
2020-10-31 04:53:56 +08:00 |
lvxinran
|
1ee9ca08fa
|
逍遥游上个首通的限制
|
2020-10-30 13:24:31 +08:00 |
lvxinran
|
f420ebc347
|
地方teamSkill
|
2020-10-30 13:14:21 +08:00 |
lvxinran
|
8528baa1b4
|
teamSkill修改
|
2020-10-30 12:58:04 +08:00 |
lvxinran
|
edc1b58d5e
|
无尽修改坐标
|
2020-10-29 12:01:44 +08:00 |
lvxinran
|
19069e4586
|
地图修改
|
2020-10-29 10:29:22 +08:00 |
lvxinran
|
161bc6fa52
|
无尽副本位置弹回
|
2020-10-28 21:07:49 +08:00 |
lvxinran
|
f9da69c0a5
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-10-28 16:53:08 +08:00 |
zhangshanxue
|
d560e2bfee
|
月卡刷新
|
2020-11-06 17:35:10 +08:00 |
zhangshanxue
|
4b389f5a8f
|
社稷大典公会排行发奖
|
2020-10-28 20:24:15 +08:00 |
zhangshanxue
|
5fcfaa1f36
|
社稷大典
|
2020-10-31 14:06:31 +08:00 |
zhangshanxue
|
763872915f
|
社稷大典公会排行
|
2020-10-31 14:02:38 +08:00 |
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 |