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 |
gaojie
|
174da1a2db
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-05-07 16:33:03 +08:00 |
gaojie
|
e2554fc583
|
英雄上限处理
|
2019-05-07 16:32:59 +08:00 |
wangyuan
|
954d3168a9
|
装备属性必出
|
2019-05-07 15:41:21 +08:00 |
wangyuan
|
e103042663
|
英雄属性加成计算规则
|
2019-05-07 14:33:36 +08:00 |
wangyuan
|
c2ab44a181
|
装备重铸确认
|
2019-05-07 11:21:45 +08:00 |
wangyuan
|
f85bdde48e
|
buffer
|
2019-05-05 20:41:48 +08:00 |
wangyuan
|
edddf28ffb
|
fix gm
|
2019-05-05 13:37:26 +08:00 |
wangyuan
|
d3180bfc5c
|
fix gm
|
2019-04-30 17:12:17 +08:00 |
wangyuan
|
8842924478
|
equip掉落属性数值修改
|
2019-04-30 14:30:56 +08:00 |
jiahuiwen
|
e600edbeb3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-30 13:54:29 +08:00 |
jiahuiwen
|
7b5f34ba4b
|
完成任务奖励 和 完成事件分开
|
2019-04-30 13:53:59 +08:00 |
wangyuan
|
936406315c
|
数据提交
|
2019-04-30 11:55:51 +08:00 |
gaojie
|
ac32c58249
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-30 11:41:30 +08:00 |
gaojie
|
62ab9068a5
|
装备背包达上限 邮件发送
|
2019-04-30 11:41:19 +08:00 |
wangyuan
|
5a55ad0030
|
fix
|
2019-04-30 11:03:41 +08:00 |
wangyuan
|
31a56a778a
|
gm change
|
2019-04-30 11:00:58 +08:00 |
wangyuan
|
7d40c34067
|
fix item
|
2019-04-30 10:03:27 +08:00 |
wangyuan
|
5a0d87e4f3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-30 10:00:56 +08:00 |
gaojie
|
b7a314b27d
|
获得道具数量增量返回前端
|
2019-04-30 09:59:39 +08:00 |
wangyuan
|
3d0e7cebc6
|
fix null
|
2019-04-30 09:49:40 +08:00 |
gaojie
|
a00a5f4597
|
一次合成碎片上限处理
|
2019-04-29 20:45:41 +08:00 |
gaojie
|
37bb6046df
|
fix
|
2019-04-29 20:31:12 +08:00 |
gaojie
|
0bae114cc9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# conf/server/ItemConfig.txt
|
2019-04-29 20:23:43 +08:00 |
gaojie
|
22b68a1bf2
|
道具上限
|
2019-04-29 20:21:30 +08:00 |
jiahuiwen
|
db03f026cd
|
异妖传到前端
|
2019-04-29 18:47:36 +08:00 |
jiahuiwen
|
c0949548df
|
竞速 记录异妖
|
2019-04-29 18:46:08 +08:00 |
jiahuiwen
|
ff7a87f8fd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-29 18:38:58 +08:00 |
jiahuiwen
|
7637c763ad
|
少加个注解
|
2019-04-29 18:38:52 +08:00 |
wangyuan
|
1aaddcb350
|
fix地图排行数据
|
2019-04-29 18:17:04 +08:00 |
wangyuan
|
39734e733f
|
解决排行榜问题
|
2019-04-29 17:52:50 +08:00 |
wangyuan
|
f2f08a0613
|
血量初始值修改
|
2019-04-29 16:57:24 +08:00 |
wangyuan
|
ac20fac6d7
|
fix
|
2019-04-29 16:47:08 +08:00 |
wangyuan
|
4b86edcecb
|
打开校验开关
|
2019-04-29 16:46:40 +08:00 |
jiahuiwen
|
519679a116
|
区分战斗行为
|
2019-04-29 16:15:26 +08:00 |
jiahuiwen
|
6992512d3b
|
优化地图行为,并增加三个新行为
|
2019-04-29 15:31:46 +08:00 |
wangyuan
|
ac596f4612
|
redis key
|
2019-04-28 17:29:04 +08:00 |
wangyuan
|
9968986c49
|
areaID 赋值
|
2019-04-28 17:26:43 +08:00 |
jiahuiwen
|
61446dfd55
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-28 14:26:38 +08:00 |
jiahuiwen
|
503bf13c89
|
地图判断 3星 bug
|
2019-04-28 14:26:31 +08:00 |
wangyuan
|
0f4fe589a8
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-04-28 10:06:56 +08:00 |
wangyuan
|
dae316fa3e
|
check
|
2019-04-28 10:06:41 +08:00 |
gaojie
|
5ade3c345e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-28 10:06:20 +08:00 |
gaojie
|
41470ac7e2
|
邮件
|
2019-04-28 10:06:13 +08:00 |
jiahuiwen
|
1a67866d2f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-26 15:25:33 +08:00 |
wangyuan
|
05fd42448b
|
异妖进阶消耗数据读取问题
|
2019-04-26 16:56:52 +08:00 |
wangyuan
|
0132a2ff2c
|
修复挂机奖励和地图探索optionId问题
|
2019-04-26 16:31:09 +08:00 |
jiahuiwen
|
c76e2278d1
|
通关星级替换
|
2019-04-26 15:25:21 +08:00 |
gaojie
|
9e5c23315c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-04-25 21:03:15 +08:00 |
gaojie
|
66d4f6279c
|
升级
|
2019-04-25 21:03:07 +08:00 |
wangyuan
|
8760187393
|
等级校验
|
2019-04-25 20:23:07 +08:00 |