lvxinran
|
78f86421be
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-27 15:17:00 +08:00 |
lvxinran
|
d4a0550657
|
宝器 每日副本 代码提交
|
2020-04-27 15:15:58 +08:00 |
zhangshanxue
|
0df73d956e
|
gm添加角色
|
2020-04-27 10:41:55 +08:00 |
zhangshanxue
|
213ba2997e
|
配置移除 报错
|
2020-04-27 10:26:37 +08:00 |
zhangshanxue
|
913b1e780f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-27 10:07:49 +08:00 |
zhangshanxue
|
a011e862f2
|
配置移除 报错
|
2020-04-27 10:07:43 +08:00 |
wangyuan
|
d9d3baaa03
|
fix level activity
|
2020-04-27 09:39:48 +08:00 |
wangyuan
|
f20ce8ad39
|
升级达人
|
2020-04-26 16:12:28 +08:00 |
wangyuan
|
49ff1455f0
|
task
|
2020-04-27 18:32:58 +08:00 |
lvxinran
|
47d60b8588
|
itemType增加
|
2020-04-24 10:33:38 +08:00 |
wangyuan
|
1a7e178016
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-04-24 09:58:00 +08:00 |
wangyuan
|
cd3d831b6b
|
删除七天日后才能领取宝箱
|
2020-04-24 09:57:54 +08:00 |
lvxinran
|
c0b4c7a02d
|
EquipManager存储类型修改
|
2020-04-23 20:55:19 +08:00 |
zhangshanxue
|
c6d30a11fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-23 19:53:03 +08:00 |
zhangshanxue
|
ab36222035
|
数据库对象添加深度复制
|
2020-04-23 19:52:54 +08:00 |
wangyuan
|
658a045270
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-04-22 11:28:49 +08:00 |
wangyuan
|
c8fdd5b47d
|
store
|
2020-04-22 11:28:35 +08:00 |
lvxinran
|
5b18de9941
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-21 17:37:48 +08:00 |
lvxinran
|
d3fbbd89e8
|
队伍存在要分解的妖灵师修改
|
2020-04-21 17:37:42 +08:00 |
zhangshanxue
|
c8534de2de
|
协议号映射
|
2020-04-21 17:07:44 +08:00 |
zhangshanxue
|
d33638ca65
|
协议号映射
|
2020-04-21 17:05:23 +08:00 |
zhangshanxue
|
1915b19735
|
协议号映射
|
2020-04-21 17:04:20 +08:00 |
zhangshanxue
|
07fc753eed
|
协议号映射
|
2020-04-21 16:52:22 +08:00 |
lvxinran
|
b0a9c5bed4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-21 14:16:59 +08:00 |
lvxinran
|
1a337241ea
|
已上阵英雄修改
|
2020-04-21 14:16:55 +08:00 |
wangyuan
|
12996dc439
|
装备套装
|
2020-04-21 11:09:54 +08:00 |
wangyuan
|
e66fef396d
|
force + fix month card mission
|
2020-04-20 18:22:39 +08:00 |
wangyuan
|
6ecd4fb2ff
|
fix
|
2020-04-20 11:44:03 +08:00 |
wangyuan
|
b50414e1d5
|
公式修改
|
2020-04-20 11:33:01 +08:00 |
zhangshanxue
|
83bd04b84b
|
活动系统db替换
|
2020-04-20 11:16:40 +08:00 |
zhangshanxue
|
00f2e2ca03
|
活动系统db替换
|
2020-04-18 14:45:18 +08:00 |
wangyuan
|
8880f655a1
|
修复光环重复计算问题
|
2020-04-17 14:47:57 +08:00 |
wangyuan
|
9a7ff84db5
|
fix 法宝
|
2020-04-17 14:22:26 +08:00 |
lvxinran
|
387a64ec88
|
光环修改
|
2020-04-17 14:09:23 +08:00 |
wangyuan
|
400a23e82f
|
fix hero in team
|
2020-04-17 10:16:11 +08:00 |
lvxinran
|
7ab0a3642a
|
阵营光环修改
|
2020-04-16 19:59:12 +08:00 |
zhangshanxue
|
6058b8140e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-16 16:21:47 +08:00 |
zhangshanxue
|
ab4d885994
|
合成bug
|
2020-04-16 16:15:27 +08:00 |
wangyuan
|
018cddf766
|
战斗数据修改
|
2020-04-16 15:43:55 +08:00 |
lvxinran
|
9fb69b69bf
|
战斗同步
|
2020-04-16 15:10:04 +08:00 |
lvxinran
|
7d40e3d2fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-16 15:09:03 +08:00 |
wangyuan
|
653579444f
|
fix
|
2020-04-22 15:07:02 +08:00 |
wangyuan
|
8f247ddff2
|
fix item drop
|
2020-04-22 15:06:24 +08:00 |
wangyuan
|
bbd9fe8271
|
team force
|
2020-04-16 11:52:20 +08:00 |
lvxinran
|
a2b94590ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2020-04-15 17:20:23 +08:00 |
lvxinran
|
7650ddf064
|
编队修改
|
2020-04-15 17:19:23 +08:00 |
wangyuan
|
322f1735b7
|
修改魂印计算属性
|
2020-04-15 14:51:11 +08:00 |
wangyuan
|
734b7cb055
|
fix force
|
2020-04-15 14:21:26 +08:00 |
wangyuan
|
6eadad2496
|
fix soul equip check
|
2020-04-14 10:16:34 +08:00 |
wangyuan
|
0257faf2d7
|
fix hero passive
|
2020-04-13 20:02:56 +08:00 |
wangyuan
|
55019f706a
|
check
|
2020-04-13 11:26:32 +08:00 |
wangyuan
|
11b28fab35
|
fix gamesetting
|
2020-04-13 11:15:24 +08:00 |
wangyuan
|
6f05bae898
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-04-13 11:12:00 +08:00 |
wangyuan
|
8372da1907
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# tablemanager/src/main/java/config/SEquipConfig.java
|
2020-04-13 11:10:52 +08:00 |
zhangshanxue
|
1d28d4e51d
|
测试服bug
|
2020-04-11 18:48:02 +08:00 |
lvxinran
|
4320ed3650
|
战斗修改
|
2020-04-10 18:04:21 +08:00 |
lvxinran
|
86f5c6a74d
|
删除日志
|
2020-04-10 15:29:47 +08:00 |
lvxinran
|
bf2cfc3bcf
|
战斗修改
|
2020-04-10 14:52:41 +08:00 |
lvxinran
|
870b745e05
|
删除法宝职业额外加成
|
2020-04-10 13:39:20 +08:00 |
wangyuan
|
2c937c623e
|
soul equip
|
2020-04-09 20:35:50 +08:00 |
lvxinran
|
fb3c445361
|
英雄属性公式修改
|
2020-04-09 19:54:33 +08:00 |
zhangshanxue
|
b1b01decdb
|
【ID1006916】
【月卡】只开普通月卡,到期后,金额不对
|
2020-05-07 20:00:46 +08:00 |
zhangshanxue
|
ca6ebe6940
|
【ID1006878】【签到】5点刷新后还是第一天的签到奖励
|
2020-04-14 05:10:57 +08:00 |
lvxinran
|
47dbe898dc
|
法宝技能添加
|
2020-04-03 16:59:22 +08:00 |
lvxinran
|
f08d202d70
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-01 16:15:09 +08:00 |
lvxinran
|
78b2823b14
|
法宝等级默认一级
|
2020-05-01 16:15:04 +08:00 |
lvxinran
|
586c38221d
|
特权时间是否可叠加修改,签到bug修改
|
2020-05-01 16:14:33 +08:00 |
zhangshanxue
|
64fabcd9d7
|
Task 【ID1006033】【新战斗版本】后端装备合成系统
|
2020-04-03 11:45:56 +08:00 |
zhangshanxue
|
8e8cc31b08
|
Task 【ID1006033】【新战斗版本】后端装备合成系统
|
2020-04-03 11:45:33 +08:00 |
wangyuan
|
071a6c8aa2
|
刪除魂印
|
2020-04-02 17:18:34 +08:00 |
lvxinran
|
790273b96f
|
删除无用方法
|
2020-04-02 15:23:28 +08:00 |
lvxinran
|
44f8aa82f2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-02 15:14:34 +08:00 |
lvxinran
|
d1cf55e9ac
|
法宝重做
|
2020-04-02 15:14:30 +08:00 |
zhangshanxue
|
1794716b5e
|
window 虚拟机attack卡死 原因未知
|
2020-04-02 11:55:42 +08:00 |
zhangshanxue
|
91e20d3e4e
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-06-30 15:51:13 +08:00 |
zhangshanxue
|
252da3274f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-04 05:07:10 +08:00 |
zhangshanxue
|
f1da1afbce
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-05-04 05:07:01 +08:00 |
wangyuan
|
f0cb24a2e3
|
修复切换赛程没有竞猜信息
|
2020-03-30 18:38:41 +08:00 |
wangyuan
|
470a104809
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-03-30 17:48:05 +08:00 |
wangyuan
|
f409c43ab6
|
巅峰赛时间修改
|
2020-03-30 17:47:54 +08:00 |
wangyuan
|
b7fe433994
|
戒灵秘宝改成直购
|
2020-03-30 17:28:25 +08:00 |
lvxinran
|
eb2259ac92
|
献祭、回溯修改
|
2020-03-27 15:42:18 +08:00 |
lvxinran
|
6b9ac180e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-27 14:04:47 +08:00 |
lvxinran
|
1588a437b1
|
回溯、分解英雄
|
2020-03-27 14:04:42 +08:00 |
zhangshanxue
|
20a2a3c495
|
成就系统
|
2020-03-26 13:56:07 +08:00 |
zhangshanxue
|
ef3bc85d6e
|
充值后再次签到
|
2020-03-25 11:21:49 +08:00 |
zhangshanxue
|
9dde66d590
|
充值后再次签到
|
2020-03-25 10:14:56 +08:00 |
zhangshanxue
|
8f981bc846
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-25 10:12:47 +08:00 |
wangyuan
|
52117ad434
|
fix recharge vip
|
2020-03-24 16:21:52 +08:00 |
zhangshanxue
|
f8251f06cf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-24 10:59:20 +08:00 |
zhangshanxue
|
91593f8fa0
|
奖励优化
|
2020-03-24 10:58:52 +08:00 |
wangyuan
|
f23d6924fd
|
删除无效代码
|
2020-03-24 10:57:06 +08:00 |
wangyuan
|
b119ff1ce9
|
fix get goods info way
|
2020-03-23 18:42:48 +08:00 |
wangyuan
|
23489baf4a
|
背包内和互动关联的道具,活动到期后道具的优化
|
2020-03-20 18:13:58 +08:00 |
wangyuan
|
d23c8baeed
|
fix 道具直购初始化时间
|
2020-03-20 18:09:05 +08:00 |
lvxinran
|
bf8a3a59d7
|
戒灵秘宝时间剩余
|
2020-03-25 05:01:03 +08:00 |
wangyuan
|
c208cc6bb7
|
fix 直购礼包结束时间计算
|
2020-03-20 14:53:52 +08:00 |
wangyuan
|
b02f07e874
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-03-20 11:01:19 +08:00 |
wangyuan
|
651c7697c8
|
道具直购
|
2020-03-20 11:00:59 +08:00 |
lvxinran
|
0034193cb4
|
Merge branch 'project0.95'
|
2020-03-19 11:11:17 +08:00 |
lvxinran
|
287720f7d4
|
Merge branch 'project0.95' of http://60.1.1.230/backend/jieling_server into project0.95
|
2020-03-18 17:41:29 +08:00 |
lvxinran
|
d41c1da745
|
系统消息修改,好友全部同意提示
|
2020-03-18 17:41:24 +08:00 |
wangyuan
|
e7d2e52ea4
|
邮件提示
|
2020-03-18 14:40:00 +08:00 |
wangyuan
|
fe37d4fb31
|
任务更新
|
2020-03-17 17:13:52 +08:00 |
zhangshanxue
|
6d4134f2b1
|
猎妖数据过大
|
2020-03-17 17:12:46 +08:00 |
zhangshanxue
|
9f8c1006e2
|
竞技场防御战力未更新
|
2020-03-17 17:10:52 +08:00 |
zhangshanxue
|
abd7ba7804
|
线程重复
|
2020-03-16 11:41:58 +08:00 |
zhangshanxue
|
550ce57411
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-16 11:01:02 +08:00 |
zhangshanxue
|
3900141126
|
线程创建多个
|
2020-03-16 11:00:48 +08:00 |
lvxinran
|
be83f871c0
|
关卡排行热更
|
2020-03-13 15:21:49 +08:00 |
lvxinran
|
288c4d627e
|
战力方法修改
|
2020-03-13 14:47:39 +08:00 |
wangyuan
|
2fa05aade5
|
fix mainrank
|
2020-03-13 14:42:35 +08:00 |
lvxinran
|
566fc26e6d
|
好友友情点修改
|
2020-03-13 14:26:45 +08:00 |
lvxinran
|
50110c8723
|
关卡排行榜修改
|
2020-03-13 11:11:29 +08:00 |
wangyuan
|
1a6b3fdd86
|
启动服务器加索引
|
2020-03-13 10:15:31 +08:00 |
lvxinran
|
082671a2d9
|
5点0点刷新修改
|
2020-03-13 05:10:37 +08:00 |
wangyuan
|
789730d3c7
|
view mem
|
2020-03-12 18:09:20 +08:00 |
lvxinran
|
f268f19439
|
减少日志
|
2020-03-12 15:43:39 +08:00 |
lvxinran
|
4425bfd75b
|
排行榜修改
|
2020-03-12 14:14:36 +08:00 |
wangyuan
|
b2ced29b8c
|
fix rank
|
2020-03-15 21:19:05 +08:00 |
wangyuan
|
c7a280108d
|
fix indication
|
2020-03-10 16:56:21 +08:00 |
wangyuan
|
13b83b1050
|
fix indication
|
2020-03-10 16:54:17 +08:00 |
lvxinran
|
ae294080a6
|
东海寻仙bug修改
|
2020-03-12 10:40:25 +08:00 |
wangyuan
|
0601a3d746
|
'商品type改成id'
|
2020-03-09 17:07:53 +08:00 |
zhangshanxue
|
743e54ceb5
|
cdk全渠道需求
|
2020-03-09 12:39:30 +08:00 |
zhangshanxue
|
498dbbb80f
|
cdk全渠道需求
|
2020-03-09 11:31:28 +08:00 |
zhangshanxue
|
674d88210e
|
cdk全渠道需求
|
2020-03-09 11:02:06 +08:00 |
lvxinran
|
435ed56a0f
|
特权刷新先后顺序
|
2020-03-03 05:04:32 +08:00 |
lvxinran
|
c5d8e67d2e
|
敏感词
|
2020-02-28 16:43:24 +08:00 |
lvxinran
|
9c82a394dd
|
戒灵秘宝升级修改
|
2020-02-29 00:03:07 +08:00 |
lvxinran
|
81eedff9df
|
戒灵秘宝升级修改
|
2020-02-28 12:29:53 +08:00 |
lvxinran
|
0846bdfe2d
|
戒灵秘宝逻辑修改
|
2020-02-28 12:04:02 +08:00 |
lvxinran
|
82c102391b
|
东海寻仙活动
|
2020-02-29 00:01:33 +08:00 |
zhangshanxue
|
f132f859c4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-26 16:54:22 +08:00 |
zhangshanxue
|
c53b6056ed
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组
|
2020-02-26 16:54:12 +08:00 |
lvxinran
|
fb104288e5
|
限时抽卡 寻仙榜修改
|
2020-02-26 14:38:07 +08:00 |
wangyuan
|
66ea5b103f
|
修复设置异妖组件最大等级校验
|
2020-02-25 14:55:14 +08:00 |
wangyuan
|
a3716c257f
|
巅峰赛编队有竞技场进攻变成竞技场防守
|
2020-02-25 11:47:10 +08:00 |
zhangshanxue
|
b0ad311440
|
线上分支回退 改回来
|
2020-02-25 09:57:36 +08:00 |
zhangshanxue
|
1ce01c52e3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 21:45:51 +08:00 |
zhangshanxue
|
57fa2c6652
|
线上分支回退 稍后再改回来
|
2020-02-24 21:45:42 +08:00 |
wangyuan
|
4c327414b9
|
零点刷新
|
2020-02-24 18:26:28 +08:00 |
zhangshanxue
|
9ee9d9f2e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 18:06:02 +08:00 |
zhangshanxue
|
49140cc3d7
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容
|
2020-02-24 18:05:51 +08:00 |
lvxinran
|
d005fbed44
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 17:14:08 +08:00 |
lvxinran
|
85a1947791
|
刷新充值礼包改为0点
|
2020-02-24 17:14:03 +08:00 |
wangyuan
|
257de4422f
|
修改工会战编队id可动态改
|
2020-02-24 16:21:10 +08:00 |
zhangshanxue
|
f41cf48f3b
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 去掉每日战力快照 取最大战力
|
2020-02-24 15:57:11 +08:00 |
zhangshanxue
|
f3fca07cf2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 15:00:43 +08:00 |
zhangshanxue
|
267f621cc0
|
BUG 【ID1006263】 【五星成长礼】在碎片合成时,获得五星猎妖师,偶尔没有前往的弹窗
|
2020-02-24 15:00:35 +08:00 |
wangyuan
|
4e98fff425
|
fix
|
2020-02-21 18:30:36 +08:00 |
zhangshanxue
|
a7ed154936
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-21 17:55:45 +08:00 |
zhangshanxue
|
441480aed0
|
Task【ID1005747】【猎妖之路优化】 猎妖之路优化内容 死亡猎妖师未下阵
|
2020-02-21 17:55:36 +08:00 |
wangyuan
|
d9b592cc81
|
修复功能按类型开
|
2020-02-21 17:54:41 +08:00 |
zhangshanxue
|
0304f78695
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容
|
2020-02-21 11:09:57 +08:00 |
zhangshanxue
|
ae01d515ec
|
前端gm指令 后期屏蔽
|
2020-02-20 17:46:26 +08:00 |
zhangshanxue
|
d902f1d34e
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-20 16:40:08 +08:00 |
zhangshanxue
|
861c6a2ec5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-20 09:34:19 +08:00 |
wangyuan
|
d1bd1ebade
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2020-03-26 00:03:27 +08:00 |
wangyuan
|
d3a84ad2a8
|
商店刷新 & 工会行走
|
2020-03-26 00:02:26 +08:00 |
zhangshanxue
|
4afff38ff3
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-20 09:34:08 +08:00 |
zhangshanxue
|
44c00e9fcb
|
Task【ID1005460】【玩法需求】猎妖之路 节点更新不对
|
2020-02-19 14:53:20 +08:00 |
zhangshanxue
|
cbfee44510
|
Task【ID1005460】【玩法需求】猎妖之路 节点更新不对
|
2020-02-19 10:58:09 +08:00 |
zhangshanxue
|
95b9eb58d5
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-18 13:52:23 +08:00 |
zhangshanxue
|
f3e27888ee
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-17 18:19:29 +08:00 |
zhangshanxue
|
624282c742
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-17 15:51:37 +08:00 |
zhangshanxue
|
b838d8b25b
|
五星成长礼注释
|
2020-02-17 13:55:01 +08:00 |
zhangshanxue
|
67b85decc5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-13 16:13:31 +08:00 |
zhangshanxue
|
da2943dd9a
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-13 16:13:21 +08:00 |
zhangshanxue
|
38e9e4d5f9
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-13 10:24:11 +08:00 |
lvxinran
|
337e0ebeec
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-10 09:52:02 +08:00 |
lvxinran
|
8c06c9fed2
|
战力修改
|
2020-02-10 09:51:55 +08:00 |
zhangshanxue
|
4e5542393c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-02-09 19:53:28 +08:00 |
zhangshanxue
|
4769cadda1
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-09 19:48:55 +08:00 |
lvxinran
|
9331c2ce1f
|
红包过期提示
|
2020-01-16 18:24:26 +08:00 |
lvxinran
|
ed97e5b734
|
戒灵秘宝任务获取
|
2020-01-18 16:14:34 +08:00 |
wangyuan
|
8438d69f40
|
扫荡奖励
|
2020-01-16 15:28:55 +08:00 |
wangyuan
|
3e67fb76ec
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-16 14:29:30 +08:00 |
lvxinran
|
18ff74bef6
|
寻仙榜加入活动id修改
|
2020-01-18 11:52:04 +08:00 |
wangyuan
|
cf83bf24fb
|
礼包邮件时间
|
2020-01-16 14:28:44 +08:00 |
lvxinran
|
2ea5eddff3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-16 11:09:15 +08:00 |
lvxinran
|
6dc9f0370e
|
特权时间修改
|
2020-01-16 11:09:02 +08:00 |
wangyuan
|
40d339793c
|
活动修改&新手结束
|
2020-01-16 11:00:57 +08:00 |
lvxinran
|
0d5dd5811f
|
红包随机方法修改
|
2020-01-16 10:15:05 +08:00 |
wangyuan
|
f4cd55beb5
|
guildbossj邮件奖励
|
2020-01-15 18:30:01 +08:00 |
wangyuan
|
d02d25acc1
|
guildbossj邮件奖励
|
2020-01-15 18:14:50 +08:00 |
lvxinran
|
7de892ae24
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 17:20:10 +08:00 |
lvxinran
|
7d110d4220
|
五星成长礼修改
|
2020-01-15 17:20:05 +08:00 |
wangyuan
|
02288406d9
|
上次伤害
|
2020-01-15 15:26:03 +08:00 |
lvxinran
|
3721397aa0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 14:25:52 +08:00 |
lvxinran
|
5f181a4df7
|
发送抢到红包消息
|
2020-01-15 14:25:29 +08:00 |
wangyuan
|
fa7534ce86
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-15 10:02:27 +08:00 |
wangyuan
|
0999804d3c
|
工会boss奖励
|
2020-01-15 10:02:10 +08:00 |
wangyuan
|
4750308d69
|
活动修改发奖
|
2020-01-16 00:08:07 +08:00 |
lvxinran
|
58f1606268
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-14 18:01:28 +08:00 |
lvxinran
|
38e9b4ef3b
|
发送红包奖励改为邮件
|
2020-01-14 18:01:15 +08:00 |
wangyuan
|
6e7a116b72
|
特权、礼包过期邮件通知
|
2020-01-14 14:09:53 +08:00 |
lvxinran
|
4148f0d9ee
|
特权修改时发送挂机奖励
|
2020-01-14 13:41:22 +08:00 |
lvxinran
|
bedd39c0a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-17 17:48:41 +08:00 |
lvxinran
|
2b40c77e68
|
挂机邮件
|
2020-01-17 17:48:36 +08:00 |
lvxinran
|
6e5642857a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 14:41:10 +08:00 |
lvxinran
|
1e36eb0195
|
特权过期
|
2020-01-15 14:41:00 +08:00 |
wangyuan
|
9dd949808d
|
预告
|
2020-01-13 17:43:42 +08:00 |
wangyuan
|
9b45351ae2
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-16 01:35:36 +08:00 |
wangyuan
|
831653bde4
|
修改到期时间
|
2020-01-16 01:35:21 +08:00 |
wangyuan
|
eda6fd40f4
|
基金
|
2020-01-13 11:10:51 +08:00 |
wangyuan
|
4ef3ca72c9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-13 10:48:11 +08:00 |
wangyuan
|
22262c4bb7
|
刷新商品
|
2020-01-13 10:45:48 +08:00 |
lvxinran
|
04b5b3e39e
|
工会红包 职位添加
|
2020-01-10 16:09:39 +08:00 |
lvxinran
|
9d70702214
|
东海寻仙邮件
|
2020-01-16 00:02:21 +08:00 |
lvxinran
|
7656c76f94
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-11 13:39:04 +08:00 |
lvxinran
|
1329c2b56b
|
抢红包校验
|
2020-01-11 13:38:58 +08:00 |
wangyuan
|
1ab634aeb6
|
商品购买
|
2020-01-09 18:06:45 +08:00 |
lvxinran
|
27a48fac95
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-09 17:02:03 +08:00 |
lvxinran
|
50093c8c58
|
特权时间修改,点赞物品添加
|
2020-01-09 17:01:53 +08:00 |
wangyuan
|
dfb50edaa0
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-09 16:43:56 +08:00 |
wangyuan
|
2596295a30
|
商品购买和刷新
|
2020-01-09 16:43:47 +08:00 |
lvxinran
|
0d2f9e9fe9
|
红包榜,点赞提交
|
2020-01-09 15:59:13 +08:00 |
zhangshanxue
|
8d640e290b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-09 15:21:10 +08:00 |
zhangshanxue
|
eab36c5f27
|
TASK【ID1005460】【玩法需求】猎妖之路
|
2020-01-09 15:20:09 +08:00 |
lvxinran
|
6a7878b8e6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 18:35:42 +08:00 |
wangyuan
|
d9d46dc362
|
hurt value
|
2020-01-08 18:35:28 +08:00 |
wangyuan
|
f16f86c7ee
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-08 17:58:46 +08:00 |
wangyuan
|
cb1954d8a2
|
vip权限
|
2020-01-08 17:58:36 +08:00 |
lvxinran
|
101d1bcdf3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 17:19:28 +08:00 |
lvxinran
|
403364b2fd
|
公会红包提交
|
2020-01-08 17:19:23 +08:00 |
zhangshanxue
|
465c18b000
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 16:18:47 +08:00 |
zhangshanxue
|
da646a7f5c
|
TASK【ID1005460】【玩法需求】猎妖之路
|
2020-01-08 16:18:40 +08:00 |
lvxinran
|
7c0ac91a44
|
特权时间修改,红包时间修改
|
2020-01-08 02:36:36 +08:00 |
wangyuan
|
a0fe74fa22
|
vip校验方法名称修改
|
2020-01-07 19:24:55 +08:00 |
wangyuan
|
e67f511a4b
|
表
|
2020-01-07 13:57:23 +08:00 |
wangyuan
|
bd2ec67784
|
清除数据库
|
2020-01-07 11:17:08 +08:00 |
lvxinran
|
04f7ce2fb3
|
活动51
|
2020-01-07 09:51:45 +08:00 |
lvxinran
|
569ce11b46
|
多余更新特权 删除
|
2020-01-06 14:11:01 +08:00 |
lvxinran
|
bcde683628
|
特权修改推送修改
|
2020-01-06 13:41:36 +08:00 |
lvxinran
|
5bb8355fb6
|
东海寻仙结算
|
2020-01-03 17:46:24 +08:00 |
lvxinran
|
4bc5c1d99c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-05 00:15:30 +08:00 |
lvxinran
|
59cb27bbf3
|
特权持续时间
|
2020-01-05 00:15:25 +08:00 |
lvxinran
|
35531d21db
|
增益修改
|
2020-01-06 15:56:32 +08:00 |
zhangshanxue
|
cc4ecd78d2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-03 16:09:59 +08:00 |
zhangshanxue
|
130beba759
|
网络连接bug
|
2020-01-03 16:09:48 +08:00 |
lvxinran
|
2c6eccad1a
|
排行榜,特权修改
|
2020-01-03 15:02:54 +08:00 |
lvxinran
|
a89c0df8bd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 16:57:39 +08:00 |
lvxinran
|
99496504fb
|
权限修改
|
2020-01-02 16:57:25 +08:00 |
wangyuan
|
9c4ec8e048
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-02 16:57:19 +08:00 |
wangyuan
|
91ca5da378
|
活动检验是否开启
|
2020-01-02 16:57:09 +08:00 |
lvxinran
|
9e542cd1cb
|
监听事件
|
2020-01-02 16:20:07 +08:00 |
lvxinran
|
06fcc21636
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 16:12:46 +08:00 |
lvxinran
|
12dd7885ce
|
东海寻仙修改,排行榜加字段
|
2020-01-02 16:12:41 +08:00 |
lvxinran
|
39b48bf320
|
限时抽卡修改
|
2019-12-31 18:37:01 +08:00 |