lvxinran
|
b3db193d36
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-22 15:33:49 +08:00 |
wangyuan
|
869c9ec15c
|
conf
|
2019-07-25 06:08:30 +08:00 |
wangyuan
|
36acef4ac1
|
conf
|
2019-07-25 05:45:58 +08:00 |
wangyuan
|
2e49142f07
|
mision
|
2019-07-25 05:08:59 +08:00 |
wangyuan
|
c113ff4481
|
fix
|
2019-07-23 13:51:43 +08:00 |
lvxinran
|
3b386e47b5
|
设置teamId
|
2019-07-22 15:33:45 +08:00 |
wangyuan
|
e90e414522
|
buy goods
|
2019-07-22 13:45:47 +08:00 |
wangyuan
|
8ba85e72fc
|
goods
|
2019-07-22 11:58:41 +08:00 |
wangyuan
|
f6e9d89873
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-22 11:58:17 +08:00 |
wangyuan
|
4cac791acb
|
mail
|
2019-07-22 11:36:58 +08:00 |
lvxinran
|
352472345b
|
12点事件,头像框提交
|
2019-07-22 11:11:06 +08:00 |
wangyuan
|
02c41f53ed
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-22 10:32:34 +08:00 |
lvxinran
|
2a13db9fe3
|
战斗时间
|
2019-07-23 05:12:58 +08:00 |
wangyuan
|
a5438e7e5c
|
fix goods
|
2019-07-22 10:32:19 +08:00 |
wangyuan
|
cf00d2c7de
|
Merge branch 'online1.0'
|
2019-07-22 10:19:16 +08:00 |
wangyuan
|
a142e3d3d8
|
fix goods
|
2019-07-22 10:16:47 +08:00 |
wangyuan
|
5dde031242
|
blood fix
|
2019-07-19 16:59:35 +08:00 |
wangyuan
|
3b950da80e
|
fix conf
|
2019-07-19 15:46:09 +08:00 |
wangyuan
|
a8104095d0
|
扫荡要加个精英怪信息
|
2019-07-19 14:53:35 +08:00 |
wangyuan
|
dd612ca743
|
秘境奖励首次免费领取
|
2019-07-19 13:33:41 +08:00 |
wangyuan
|
c70999553a
|
fix activity
|
2019-07-18 19:17:36 +08:00 |
wangyuan
|
d9f193c552
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2019-07-18 19:06:35 +08:00 |
wangyuan
|
416f0153b4
|
gift & battle
|
2019-07-18 19:04:04 +08:00 |
lvxinran
|
35cacefab0
|
修改
|
2019-07-18 18:43:15 +08:00 |
lvxinran
|
124b7b5e0f
|
头像框修改、初始化提交
|
2019-07-18 17:46:17 +08:00 |
lvxinran
|
a25dc800dc
|
元素类提交
|
2019-07-18 12:13:19 +08:00 |
lvxinran
|
f0e926a3f9
|
精英本功绩修改,元素共鸣代码提交
|
2019-07-17 20:15:48 +08:00 |
wangyuan
|
bed7997dcc
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-17 15:15:41 +08:00 |
wangyuan
|
eab4d85aa3
|
礼包 & 血战
|
2019-07-17 15:15:29 +08:00 |
lvxinran
|
a4bc032cf2
|
试炼层级奖励领取
|
2019-07-17 10:21:11 +08:00 |
lvxinran
|
8381fd8008
|
装备图鉴
|
2019-07-17 10:14:03 +08:00 |
wangyuan
|
07ddd2c06a
|
skip fight snap
|
2019-07-16 20:24:33 +08:00 |
wangyuan
|
885bdebaff
|
match & drop hero per
|
2019-07-16 18:31:32 +08:00 |
lvxinran
|
195535617e
|
商店修改、表格结构修改
|
2019-07-16 18:07:23 +08:00 |
lvxinran
|
bbf6b94cba
|
功绩类新添加、图鉴添加
|
2019-07-16 17:39:34 +08:00 |
wangyuan
|
eaa9ffcd43
|
血战
|
2019-07-16 15:21:13 +08:00 |
wangyuan
|
96bf0a392e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-16 13:40:17 +08:00 |
wangyuan
|
63e131e40f
|
云游商店
|
2019-07-16 13:40:05 +08:00 |
lvxinran
|
aa5d85b68a
|
战斗逻辑错误修改
|
2019-07-16 11:26:54 +08:00 |
lvxinran
|
2b4f883990
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-16 10:59:55 +08:00 |
lvxinran
|
43f978e9b4
|
战斗逻辑修改
|
2019-07-16 10:59:40 +08:00 |
wangyuan
|
63d3168ffa
|
抽卡送宝箱
|
2019-07-16 10:58:11 +08:00 |
lvxinran
|
94ae24786f
|
战斗异常修改
|
2019-07-15 19:28:49 +08:00 |
lvxinran
|
b4f77dd3c3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-15 19:25:51 +08:00 |
lvxinran
|
91d33e56ed
|
同步战斗逻辑
|
2019-07-15 19:25:22 +08:00 |
wangyuan
|
405da77bb0
|
根据数组索引就行随机
|
2019-07-15 17:41:36 +08:00 |
wangyuan
|
28914e672c
|
fix 7
|
2019-07-15 17:29:51 +08:00 |
lvxinran
|
89affcf6c1
|
位置修改
|
2019-07-15 17:20:05 +08:00 |
gaojie
|
63a9dcbf5e
|
fix
|
2019-07-15 16:59:48 +08:00 |
lvxinran
|
c919681cc2
|
无关注释删除
|
2019-07-15 16:37:43 +08:00 |