zhangshanxue
|
bacd35c48e
|
测试充值
|
2020-08-25 18:29:17 +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 |
lvxinran
|
cc3f0d662d
|
公会副本次数修改
|
2020-09-01 14:14:26 +08:00 |
lvxinran
|
c98aa7f20d
|
公会副本次数修改
|
2020-09-01 22:30:59 +08:00 |
lvxinran
|
57057330aa
|
上报乘100修改
|
2020-08-22 16:57:01 +08:00 |
lvxinran
|
d56aa73460
|
Merge branch 'master' into 公会副本
|
2020-08-22 15:39:33 +08:00 |
lvxinran
|
146c394e7a
|
公会副本提交
|
2020-08-22 15:38:31 +08:00 |
lvxinran
|
86eee21319
|
怪物战力修改表数据
|
2020-08-21 20:53:26 +08:00 |
zhangshanxue
|
3ef43a64a7
|
灵动网页支付
|
2020-08-21 20:31:30 +08:00 |
lvxinran
|
26e02ac204
|
无尽修改
|
2020-08-21 19:25:31 +08:00 |
lvxinran
|
388a28507b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-21 18:46:55 +08:00 |
lvxinran
|
e9fe5e2992
|
礼包修改
|
2020-08-21 18:46:49 +08:00 |
lvxinran
|
f7b77d668a
|
副本提交
|
2020-08-28 14:38:20 +08:00 |
lilei
|
80bd02138f
|
破阵诛仙累冲任务修正
|
2020-08-21 18:00:07 +08:00 |
lilei
|
7c7e5cf9f1
|
破阵诛仙系列任务
|
2020-08-21 16:36:46 +08:00 |
lvxinran
|
c6a0354f81
|
公会副本提交,大闹天宫埋点提交
|
2020-08-20 23:02:13 +08:00 |
lvxinran
|
95375eab26
|
公会副本提交
|
2020-08-27 19:49:57 +08:00 |
lilei
|
2cdf521ce3
|
探索达人替换为极速达人,增加探索次数特权逻辑
|
2020-08-20 14:06:48 +08:00 |
lilei
|
bf1ef4c1a3
|
活动热更延期增加遗留数据清理
|
2020-08-19 20:36:18 +08:00 |
zhangshanxue
|
b83687ea23
|
revert 错误合并
|
2020-08-19 11:16:28 +08:00 |
lvxinran
|
ec758ee011
|
公会副本排行榜
|
2020-08-19 09:58:33 +08:00 |
lvxinran
|
41d73df618
|
公会副本排行
|
2020-08-19 09:50:37 +08:00 |
lilei
|
50f33a02c0
|
Merge branch 'develop_treasure'
|
2020-08-19 09:47:27 +08:00 |
lilei
|
2ef8972406
|
青龙秘宝
|
2020-08-19 09:47:02 +08:00 |
zhangshanxue
|
bc50b90957
|
重连有问题
|
2020-08-18 22:27:30 +08:00 |
zhangshanxue
|
413f84af8a
|
十绝阵结算
|
2020-08-18 20:10:12 +08:00 |
lvxinran
|
1b70b3c73a
|
公会副本
|
2020-08-18 19:42:50 +08:00 |
lilei
|
f202f73b73
|
青龙秘宝,工坊合成装备任务改为锻器阁合成装备
|
2020-08-18 17:10:06 +08:00 |
zhangshanxue
|
22aca76856
|
充值和数据转换
|
2020-08-18 16:22:38 +08:00 |
zhangshanxue
|
000b4466b3
|
充值和数据转换
|
2020-08-18 16:12:54 +08:00 |
lvxinran
|
38c3cffa54
|
appId加入
|
2020-08-21 14:22:14 +08:00 |
zhangshanxue
|
cc801a8510
|
充值价格
|
2020-08-18 11:27:03 +08:00 |
lilei
|
c18ac44bcf
|
青龙秘宝
|
2020-08-18 09:42:32 +08:00 |
zhangshanxue
|
024e339bc3
|
合服
|
2020-08-17 22:31:25 +08:00 |
zhangshanxue
|
90e14e4493
|
合服
|
2020-08-17 21:40:49 +08:00 |
lilei
|
b797c85de6
|
青龙秘宝,新增任务类型
|
2020-08-17 19:53:26 +08:00 |
zhangshanxue
|
d9bd59ea26
|
合服
|
2020-08-17 15:30:25 +08:00 |
lilei
|
f73829b5d4
|
青龙秘宝,新增部分任务类型
|
2020-08-17 15:01:28 +08:00 |
zhangshanxue
|
29f85c959b
|
合服
|
2020-08-17 11:09:35 +08:00 |
zhangshanxue
|
b643307e5a
|
合服
|
2020-08-17 10:26:46 +08:00 |
lvxinran
|
588e22626f
|
修改部分日志
|
2020-08-17 10:11:27 +08:00 |
lvxinran
|
237317a677
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-30 21:15:02 +08:00 |