wangyuan
|
fe567310c5
|
分解妖灵师
|
2019-05-29 17:58:02 +08:00 |
wangyuan
|
7667d21b8f
|
云游商店
|
2019-05-29 17:55:32 +08:00 |
wangyuan
|
3d2bcae72f
|
fix
|
2019-05-29 15:33:11 +08:00 |
wangyuan
|
0c21ef4ad6
|
data
|
2019-05-29 14:36:50 +08:00 |
wangyuan
|
ca2386824b
|
vip
|
2019-05-29 13:55:41 +08:00 |
wangyuan
|
65747a5daf
|
突破返还
|
2019-05-29 13:31:41 +08:00 |
wangyuan
|
c3f08b1321
|
fix bossid
|
2019-05-28 18:26:14 +08:00 |
wangyuan
|
5888a398d7
|
fix
|
2019-05-28 18:18:04 +08:00 |
wangyuan
|
f768d3552f
|
fix
|
2019-05-28 17:58:59 +08:00 |
wangyuan
|
89716f3c90
|
mission
|
2019-05-28 17:56:59 +08:00 |
wangyuan
|
0b4b87a003
|
工坊
|
2019-05-28 16:30:43 +08:00 |
wangyuan
|
09608adc81
|
fix no in db
|
2019-05-28 13:49:08 +08:00 |
wangyuan
|
48251b75a8
|
data
|
2019-05-28 13:48:06 +08:00 |
wangyuan
|
3d86b7d034
|
任务
|
2019-05-28 10:01:23 +08:00 |
wangyuan
|
672121e598
|
任务初版
|
2019-05-27 15:30:56 +08:00 |
wangyuan
|
62d581bf59
|
暂时删除校验挑战次数
|
2019-05-27 11:07:00 +08:00 |
wangyuan
|
21b245ed82
|
暂时提交vip相关
|
2019-05-24 14:12:00 +08:00 |
wangyuan
|
5d0c9224b8
|
挂机
|
2019-05-24 13:39:04 +08:00 |
wangyuan
|
536a5e02f2
|
广播
|
2019-05-20 21:24:24 +08:00 |
jiahuiwen
|
bb7abbe506
|
@Component
|
2019-05-20 16:25:00 +08:00 |
jiahuiwen
|
03c4fc6e1e
|
行为类型 36 推任务,消耗道具,删除指定地图点
|
2019-05-20 16:18:41 +08:00 |
wangyuan
|
b36f434768
|
挂机奖励
|
2019-05-20 15:26:57 +08:00 |
gaojie
|
86858a8c25
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-20 14:07:39 +08:00 |
gaojie
|
ea594dfaa7
|
商店购买
|
2019-05-20 14:07:35 +08:00 |
wangyuan
|
204e2ef785
|
robotlevel
|
2019-05-20 12:00:16 +08:00 |
wangyuan
|
a33d66e0e7
|
异妖加载修改
|
2019-05-20 11:11:29 +08:00 |
wangyuan
|
7c537afd21
|
mail reward
|
2019-05-18 15:30:11 +08:00 |
wangyuan
|
a1c4640fcf
|
异妖
|
2019-05-18 13:07:25 +08:00 |
wangyuan
|
af3d862561
|
修改获取user方式
|
2019-05-17 13:41:07 +08:00 |
wangyuan
|
02f29bd9a0
|
todo vip fix
|
2019-05-17 10:36:44 +08:00 |
wangyuan
|
18c2b0fc21
|
秘盒跨赛季不需要重置次数
|
2019-05-17 10:29:01 +08:00 |
wangyuan
|
03468ddcfc
|
增加怪物是否被击杀
|
2019-05-16 20:35:04 +08:00 |
gaojie
|
cdaf854d55
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-16 20:21:11 +08:00 |
gaojie
|
0119d33b6b
|
商店刷新,分解卡牌
|
2019-05-16 20:21:06 +08:00 |
wangyuan
|
2a0368d75e
|
fix
|
2019-05-16 20:18:03 +08:00 |
wangyuan
|
1e46f4db2b
|
挂机推送
|
2019-05-16 20:16:46 +08:00 |
wangyuan
|
85cceace2b
|
挂机
|
2019-05-16 19:24:32 +08:00 |
wangyuan
|
544ba36938
|
挂机
|
2019-05-16 17:50:40 +08:00 |
gaojie
|
48375cd38f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-16 17:36:48 +08:00 |
gaojie
|
5a9249d29b
|
log
|
2019-05-16 17:36:43 +08:00 |
gaojie
|
115d68181f
|
商店刷新
|
2019-05-16 17:35:32 +08:00 |
wangyuan
|
b9a5cb43ff
|
delete
|
2019-05-16 14:52:58 +08:00 |
wangyuan
|
a9de0f5425
|
挂机初版
|
2019-05-16 14:51:05 +08:00 |
wangyuan
|
820ba8455b
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-16 10:02:59 +08:00 |
wangyuan
|
068fa31db8
|
fix hero
|
2019-05-16 10:02:30 +08:00 |
jiahuiwen
|
8548c4f9c2
|
35 推任务,删除指定地图点,生成新的事件点。
|
2019-05-15 15:55:46 +08:00 |
wangyuan
|
9593836b3c
|
错误提示信息
|
2019-05-15 14:01:41 +08:00 |
wangyuan
|
d0cff52e89
|
对手分数
|
2019-05-15 13:54:56 +08:00 |
wangyuan
|
55301d2894
|
fix
|
2019-05-15 12:25:12 +08:00 |
wangyuan
|
8f5c282aaf
|
fix bug
|
2019-05-14 19:51:02 +08:00 |
wangyuan
|
052a589225
|
fix bug
|
2019-05-14 19:45:53 +08:00 |
wangyuan
|
5ba0990bb0
|
fix
|
2019-05-14 19:08:57 +08:00 |
wangyuan
|
85cbae09db
|
计算属性
|
2019-05-14 18:17:00 +08:00 |
wangyuan
|
b25d7067ba
|
time control
|
2019-05-14 16:41:21 +08:00 |
wangyuan
|
dba44383fe
|
数据互换
|
2019-05-14 15:17:51 +08:00 |
wangyuan
|
b39de8d120
|
积分变换
|
2019-05-14 14:50:52 +08:00 |
wangyuan
|
6b34c37eaa
|
时间控制功能
|
2019-05-14 14:28:47 +08:00 |
wangyuan
|
4d0bdf2920
|
fix
|
2019-05-14 13:51:15 +08:00 |
wangyuan
|
e68ea3591e
|
秘盒 增加今日抽取次数限制
|
2019-05-14 13:50:34 +08:00 |
wangyuan
|
329746439d
|
零点执行
|
2019-05-14 11:31:11 +08:00 |
wangyuan
|
0d5010107d
|
竞技场放回数据
|
2019-05-14 11:12:46 +08:00 |
wangyuan
|
27441582f6
|
score bug
|
2019-05-13 20:00:54 +08:00 |
wangyuan
|
deab593bc3
|
fix null
|
2019-05-13 18:35:55 +08:00 |
wangyuan
|
3fd33d0068
|
fix redis over times
|
2019-05-13 18:31:58 +08:00 |
wangyuan
|
36fbfa28e7
|
删除测试数据
|
2019-05-13 18:25:58 +08:00 |
wangyuan
|
f213e4cdd1
|
错误信息提示
|
2019-05-13 18:23:22 +08:00 |
wangyuan
|
4d08e5e0ce
|
修复装备
|
2019-05-13 18:16:06 +08:00 |
wangyuan
|
a0a23e4d7c
|
fix
|
2019-05-13 18:03:39 +08:00 |
wangyuan
|
e45fc9a2e8
|
fix
|
2019-05-13 17:59:22 +08:00 |
wangyuan
|
41ec525158
|
自动切赛季
|
2019-05-13 17:41:53 +08:00 |
wangyuan
|
b467cd23f2
|
fix
|
2019-05-13 16:10:41 +08:00 |
wangyuan
|
398b485c69
|
秘盒时间控制
|
2019-05-13 16:10:03 +08:00 |
wangyuan
|
69d2ba019d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-13 15:33:29 +08:00 |
wangyuan
|
1ebb90b31b
|
竞技场
|
2019-05-13 15:28:03 +08:00 |
gaojie
|
9870d36663
|
充值商店刷新次数
|
2019-05-13 15:26:38 +08:00 |
gaojie
|
be46197ed2
|
fix
|
2019-05-13 15:05:06 +08:00 |
gaojie
|
04de59ded6
|
商店刷新
|
2019-05-13 15:01:38 +08:00 |
wangyuan
|
c5b27e63d4
|
fix
|
2019-05-11 17:28:44 +08:00 |
wangyuan
|
ac3585efc3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoKey.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java
|
2019-05-11 17:27:25 +08:00 |
wangyuan
|
16294cfe15
|
秘盒 & 英雄修改
|
2019-05-11 17:26:02 +08:00 |
gaojie
|
08935d2c7e
|
fix
|
2019-05-11 17:25:33 +08:00 |
gaojie
|
93beaecf89
|
获取商店信息
|
2019-05-11 17:23:31 +08:00 |
gaojie
|
9f25f8bd12
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
|
2019-05-11 11:46:53 +08:00 |
gaojie
|
56e3a60a38
|
fix
|
2019-05-11 11:44:50 +08:00 |
wangyuan
|
ec99e122cd
|
arena
|
2019-05-11 11:41:02 +08:00 |
wangyuan
|
983d1d85ce
|
属性修改
|
2019-05-11 11:39:45 +08:00 |
wangyuan
|
0d473165c8
|
fight
|
2019-05-10 19:31:20 +08:00 |
wangyuan
|
4eb0121eef
|
竞技场初版
|
2019-05-10 17:44:44 +08:00 |
wangyuan
|
6282689e52
|
fixs
|
2019-05-10 09:51:23 +08:00 |
wangyuan
|
211c1d325d
|
战斗时间
|
2019-05-09 19:19:30 +08:00 |
wangyuan
|
d84b58ac5b
|
漏提交SGlobalSystemConfig;
|
2019-05-09 17:58:42 +08:00 |
wangyuan
|
56d87dbaf6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-09 17:49:42 +08:00 |
wangyuan
|
7aa786221b
|
fight
|
2019-05-09 17:49:23 +08:00 |
gaojie
|
d54335ed93
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-08 16:30:59 +08:00 |
gaojie
|
5a856fd5c8
|
掉落走邮件
|
2019-05-08 16:30:12 +08:00 |
wangyuan
|
aafb262d83
|
装备评分日志
|
2019-05-08 15:40:25 +08:00 |
wangyuan
|
fdef8df986
|
fix bug
|
2019-05-07 20:18:50 +08:00 |
wangyuan
|
51df1cd10e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-05-07 20:01:17 +08:00 |
wangyuan
|
1be3f7ce3e
|
fight check
|
2019-05-07 20:01:07 +08:00 |
gaojie
|
ef12ae1b20
|
fix
|
2019-05-07 16:47:02 +08:00 |