lvxinran
|
b3222d42b3
|
删除无用代码
|
2020-11-23 21:27:47 +08:00 |
jiahuiwen
|
8df6762548
|
25闯关礼包、26、心魔试炼礼包 触发和推送
|
2020-10-13 14:58:25 +08:00 |
zhangshanxue
|
a1b2d3e3f3
|
任务类型和充值计费点
|
2020-09-09 23:22:00 +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 |
zhangshanxue
|
3ef43a64a7
|
灵动网页支付
|
2020-08-21 20:31:30 +08:00 |
zhangshanxue
|
b83687ea23
|
revert 错误合并
|
2020-08-19 11:16:28 +08:00 |
zhangshanxue
|
433ef98265
|
充值类型更换
|
2020-08-14 23:08:45 +08:00 |
zhangshanxue
|
7225ca8ab4
|
TASK 【ID1006352】【活动需求】升级礼包推送
|
2020-06-17 09:40:33 +08:00 |
lvxinran
|
f25e6a5980
|
冲突修改
|
2020-06-12 17:09:03 +08:00 |
lvxinran
|
2670dcd04a
|
等级礼包暂时提交
|
2020-06-12 17:04:47 +08:00 |
wangyuan
|
7ad319cd7e
|
random card
|
2020-05-16 16:56:15 +08:00 |
wangyuan
|
651c7697c8
|
道具直购
|
2020-03-20 11:00:59 +08:00 |
wangyuan
|
0d64c47eb1
|
表时间修改
|
2020-01-16 17:53:38 +08:00 |
wangyuan
|
2596295a30
|
商品购买和刷新
|
2020-01-09 16:43:47 +08:00 |
zhangshanxue
|
bb75dfbcfa
|
【ID1005331】【星级成长礼】
|
2019-12-26 10:09:06 +08:00 |
zhangshanxue
|
28cb6035d4
|
五星英雄成长礼
|
2019-11-25 20:17:30 +08:00 |
zhangshanxue
|
fb33d6bdb6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SRechargeCommodityConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/config/SSpecialConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/config/STreasureTaskConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/UserLevelEventHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
|
2019-10-11 16:55:39 +08:00 |
zhangshanxue
|
85996ead41
|
工具模块 配置模块提取 热更新优化
|
2019-10-11 16:32:20 +08:00 |
wangyuan
|
1b09b921f9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-09-06 11:04:28 +08:00 |