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
|
1efd3bd58d
|
fight
|
2019-05-09 17:50:38 +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
|
db08e4a7f8
|
修改加密解密
|
2019-05-06 12:03: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 |
wangyuan
|
a030ae6219
|
修改读表
|
2019-04-30 11:43:24 +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 |