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 |
lvxinran
|
d00c9f8c64
|
cdk 服务器id添加
|
2020-09-20 20:55:04 +08:00 |
lvxinran
|
834f6e303e
|
八日登录修改,公会副本边界,不发排行奖励修改
|
2020-09-09 08:13:51 +08:00 |
lvxinran
|
2d788828d5
|
0消耗判断
|
2020-09-07 17:31:46 +08:00 |
lvxinran
|
897563644f
|
魂印战力修改
|
2020-09-07 16:23:38 +08:00 |
lvxinran
|
324a93d144
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 15:51:49 +08:00 |
lvxinran
|
51ca7053a1
|
购买buff修改,魂印基础战力
|
2020-09-07 15:51:44 +08:00 |
lvxinran
|
748f792faa
|
工会副本修改
|
2020-09-17 19:18:08 +08:00 |
lvxinran
|
09a07cd559
|
修改副本
|
2020-09-17 19:06:11 +08:00 |
lvxinran
|
92ed17c747
|
保存编队修改
|
2020-09-17 02:40:36 +08:00 |
lvxinran
|
13ca97db1c
|
代码回滚
|
2020-09-17 01:41:58 +08:00 |
lvxinran
|
80bdaf491e
|
删除无用buff
|
2020-09-17 01:41:16 +08:00 |
lvxinran
|
99febadec7
|
清除无用buff点
|
2020-09-17 01:40:38 +08:00 |
DESKTOP-98AVA47\Administrator
|
5cf95e7e09
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-07 10:28:48 +08:00 |
lvxinran
|
2b16cf567b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-19 08:15:03 +08:00 |
lvxinran
|
de8524d70a
|
暂时修改工会副本
|
2020-09-19 08:14:27 +08:00 |
lvxinran
|
fcc07cc679
|
森罗幻境埋点
|
2020-09-19 07:56:53 +08:00 |
lvxinran
|
e2ab570525
|
打点修改 工会副本5点刷新伤害
|
2020-09-19 06:59:17 +08:00 |
lvxinran
|
28d42eb762
|
破阵诛仙任务读表修改
|
2021-01-17 05:02:58 +08:00 |
lvxinran
|
ade62badfa
|
论数修改
|
2021-01-17 05:02:10 +08:00 |
zhangshanxue
|
6125cbcb65
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-14 17:52:49 +08:00 |
zhangshanxue
|
048d00080e
|
网页支付玩家商品信息获取
|
2020-09-14 17:52:00 +08:00 |
lvxinran
|
37735820ef
|
日常副本打点修改
|
2020-09-14 09:49:16 +08:00 |
lvxinran
|
556fe1e95b
|
本地服修改
|
2020-09-11 13:52:51 +08:00 |
lvxinran
|
9256a17ef9
|
本地服修改
|
2020-09-11 12:20:04 +08:00 |
lvxinran
|
2f4c29045b
|
打点修改,道具流水修改,天宫秘宝修改
|
2020-09-11 11:50:10 +08:00 |
DESKTOP-98AVA47\Administrator
|
5fe1028faf
|
redis key错误
|
2020-09-07 10:28:28 +08:00 |
lvxinran
|
d37d1176ed
|
修改森罗环境卡牌被分解不能战斗
|
2020-09-04 11:57:02 +08:00 |
jiahuiwen
|
2982500416
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-04 10:31:26 +08:00 |
jiahuiwen
|
b5feff687e
|
消耗增加负值判断
|
2020-09-04 10:31:21 +08:00 |
lvxinran
|
612a407006
|
打点修改
|
2020-09-03 10:58:07 +08:00 |
jiahuiwen
|
c3aa0b815f
|
替换 System.out.println
|
2020-09-02 16:27:26 +08:00 |
jiahuiwen
|
d1eccf88b9
|
代码优化
|
2020-09-01 17:20:57 +08:00 |
jiahuiwen
|
c3be084f49
|
优化代码
|
2020-09-01 14:45:47 +08:00 |
jiahuiwen
|
f6d885559b
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-01 10:45:21 +08:00 |
jiahuiwen
|
8e31ca0acf
|
优化代码
|
2020-09-01 10:45:16 +08:00 |
lvxinran
|
f223f8217c
|
血量战斗修改
|
2020-08-28 05:26:02 +08:00 |
lvxinran
|
e4fd71e3a5
|
无尽本修改
|
2020-08-28 04:45:17 +08:00 |
lvxinran
|
3a2d1001aa
|
打印日志
|
2020-08-28 04:37:22 +08:00 |
lvxinran
|
b96da4ee17
|
无尽修改
|
2020-08-28 04:29:41 +08:00 |
lvxinran
|
f078d184f0
|
副本修改
|
2020-08-28 04:10:01 +08:00 |
lvxinran
|
064d737212
|
云梦祈福 修改状态
|
2020-08-28 03:06:54 +08:00 |
lvxinran
|
87955174a7
|
上报修改
|
2020-08-28 01:34:47 +08:00 |
lvxinran
|
8c917c414b
|
进阶编队校验修改
|
2020-09-10 05:35:54 +08:00 |
lvxinran
|
9c658b6acd
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 05:15:01 +08:00 |
lvxinran
|
8b5fd5bc20
|
五星任务
|
2020-09-10 05:14:50 +08:00 |
lvxinran
|
9ccd699d8b
|
天宫秘宝修改
|
2020-09-20 04:24:44 +08:00 |
zhangshanxue
|
a1b2d3e3f3
|
任务类型和充值计费点
|
2020-09-09 23:22:00 +08:00 |
lvxinran
|
e45c58c3d1
|
云梦祈福修改
|
2020-09-04 03:37:06 +08:00 |
lvxinran
|
7d141098f9
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-04 02:15:02 +08:00 |
lvxinran
|
8bd27071d3
|
副本修改
|
2020-09-04 02:14:54 +08:00 |
lvxinran
|
f6d757aa16
|
吃装备计数修改
|
2020-09-03 15:30:10 +08:00 |
lvxinran
|
445f0a4965
|
天宫7天限制
|
2020-09-03 15:29:48 +08:00 |
zhangshanxue
|
be086265c7
|
上报报错
|
2020-08-28 20:46:06 +08:00 |
zhangshanxue
|
5ff3eb46ba
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-28 18:02:29 +08:00 |
zhangshanxue
|
31677bdff6
|
任务累充金额
|
2020-08-28 18:02:16 +08:00 |
lvxinran
|
62fbd0f9b8
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-27 13:32:01 +08:00 |
zhangshanxue
|
3075948147
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-28 11:00:40 +08:00 |
lvxinran
|
c8cc9af30e
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-04 10:38:01 +08:00 |
lvxinran
|
32aab7a641
|
竞技场排行榜
|
2020-09-04 10:37:36 +08:00 |
lvxinran
|
fbb03e44f8
|
森罗修改
|
2020-10-05 02:11:20 +08:00 |
lvxinran
|
5f9b70ea80
|
天宫秘宝积分购买添加 公会副本击杀奖励修改
|
2020-10-01 00:40:30 +08:00 |
lvxinran
|
e0e89d377e
|
公会副本排行奖励
|
2020-10-01 00:19:39 +08:00 |
lvxinran
|
f0f28b8fa6
|
世界等级 物品掉落 宝物战力修改
|
2020-09-10 17:46:14 +08:00 |
lvxinran
|
77098ce6a1
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-10 16:25:09 +08:00 |
lvxinran
|
ce9370be4a
|
基金修改
|
2020-09-10 16:25:00 +08:00 |
lvxinran
|
656e089d0f
|
公会副本修改
|
2020-09-10 15:10:04 +08:00 |
lvxinran
|
d4ee477baa
|
云梦祈福刷新
|
2020-09-10 11:19:40 +08:00 |
zhangshanxue
|
9fd22f7623
|
巅峰赛名次任务
|
2020-08-28 11:00:12 +08:00 |
zhangshanxue
|
0417a4c728
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-27 21:09:08 +08:00 |
zhangshanxue
|
8b01414491
|
先后手
|
2020-08-27 21:08:56 +08:00 |
lvxinran
|
85c45138da
|
排行修改
|
2020-08-27 13:31:49 +08:00 |
zhangshanxue
|
8257fbe430
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-26 15:43:58 +08:00 |
zhangshanxue
|
7f55f8cbc4
|
浮点精度
|
2020-08-26 15:43:42 +08:00 |
lvxinran
|
f1d88626b6
|
森罗环境修改
|
2020-09-10 18:17:09 +08:00 |
lvxinran
|
330e7c105a
|
青龙秘宝修改
|
2020-09-10 17:59:38 +08:00 |
lvxinran
|
bcf288b69f
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-08-25 15:11:31 +08:00 |
lvxinran
|
793be7aeb2
|
修改青龙礼包合公会副本经验
|
2020-08-25 15:11:20 +08:00 |
zhangshanxue
|
459ef26b50
|
测试充值
|
2020-08-25 14:50:19 +08:00 |
zhangshanxue
|
07595796fa
|
合分支
|
2020-08-24 23:36:16 +08:00 |
zhangshanxue
|
23ade886ae
|
Merge branch 'master' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# tablemanager/src/main/java/config/SRechargeCommodityConfig.java
|
2020-08-24 23:16:18 +08:00 |
zhangshanxue
|
e77644359d
|
充值价格
|
2020-08-24 23:14:03 +08:00 |
lvxinran
|
a57bdbc37f
|
五星成长礼修改
|
2020-09-01 22:11:12 +08:00 |
lvxinran
|
10858c2606
|
剑影仙踪活动修改
|
2020-09-01 18:30:29 +08:00 |
lvxinran
|
b586b0c502
|
时间5天改成30天
|
2020-09-01 14:55:09 +08:00 |