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 |