wangyuan
|
7e5eb8ece8
|
fix map
|
2019-08-01 11:20:09 +08:00 |
wangyuan
|
7131ed8204
|
s table
|
2019-08-01 11:11:56 +08:00 |
wangyuan
|
be43c5af87
|
fix guild
|
2019-08-01 11:10:41 +08:00 |
wangyuan
|
cf006d2184
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-01 10:10:28 +08:00 |
wangyuan
|
acffeefb07
|
guild & fix map
|
2019-08-01 10:09:19 +08:00 |
zhangshanxue
|
6a6ca5451c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
|
2019-07-31 18:20:40 +08:00 |
wangyuan
|
fdc0501110
|
activity
|
2019-07-31 17:48:16 +08:00 |
zhangshanxue
|
b5e8d25658
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
|
2019-07-31 17:28:10 +08:00 |
zhangshanxue
|
3943db124d
|
招财猫
|
2019-07-31 17:15:06 +08:00 |
lvxinran
|
52f8538e99
|
gamesetting修改
|
2019-07-31 10:51:28 +08:00 |
wangyuan
|
84c70e7b10
|
fxi map & serven happy
|
2019-07-31 10:29:23 +08:00 |
wangyuan
|
0ab956e693
|
急速探险花费道具
|
2019-07-30 20:05:37 +08:00 |
wangyuan
|
b34c233a21
|
fix treasure
|
2019-07-30 19:49:46 +08:00 |
wangyuan
|
6421cedac6
|
kt upload fix
|
2019-07-30 18:10:14 +08:00 |
wangyuan
|
7bb5acac24
|
update activity indication
|
2019-07-30 17:51:04 +08:00 |
wangyuan
|
830fc18252
|
map
|
2019-07-30 14:33:57 +08:00 |
wangyuan
|
b5873e24c4
|
条件类型7 & 跳转类型11
|
2019-07-30 14:05:55 +08:00 |
lvxinran
|
618704add2
|
45不推任务
|
2019-07-30 11:46:40 +08:00 |
wangyuan
|
982d97cd84
|
kt parm
|
2019-07-30 11:18:09 +08:00 |
lvxinran
|
4be1818716
|
图内被动技能清除
|
2019-07-30 09:58:45 +08:00 |
wangyuan
|
abd1e46d6e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-29 20:20:36 +08:00 |
wangyuan
|
45e38873d9
|
upload
|
2019-07-29 19:42:57 +08:00 |
lvxinran
|
c21467a109
|
埋点
|
2019-07-29 19:42:16 +08:00 |
wangyuan
|
5851bfde6d
|
createure
|
2019-07-29 17:31:06 +08:00 |
lvxinran
|
69c20ea03c
|
行为类型提交,试炼副本时间修改
|
2019-07-29 14:48:10 +08:00 |
wangyuan
|
7f384fc087
|
mapmission
|
2019-07-29 10:02:24 +08:00 |
lvxinran
|
5ce990e6ff
|
45behaivor
|
2019-07-29 09:46:02 +08:00 |
wangyuan
|
10dfabfd50
|
arena mail
|
2019-07-26 18:33:27 +08:00 |
wangyuan
|
65d65a597b
|
treasure
|
2019-07-26 17:27:39 +08:00 |
wangyuan
|
09dcb7ffe4
|
arena score
|
2019-07-26 17:04:07 +08:00 |
wangyuan
|
5950e80017
|
mission view
|
2019-07-26 16:43:23 +08:00 |
lvxinran
|
b3911c9734
|
behavior7
|
2019-07-26 16:27:35 +08:00 |
lvxinran
|
7622bf801f
|
类型7
|
2019-07-26 15:50:06 +08:00 |
lvxinran
|
b32a06a43e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-26 14:41:55 +08:00 |
lvxinran
|
3bb3477357
|
孙龙宝藏GM
|
2019-07-26 14:41:47 +08:00 |
wangyuan
|
f74badcd6d
|
robot force
|
2019-07-26 14:29:31 +08:00 |
wangyuan
|
3347c2f92a
|
pokemon force
|
2019-07-26 13:35:16 +08:00 |
lvxinran
|
2ec53a6b2d
|
功绩21修改
|
2019-07-26 11:27:53 +08:00 |
lvxinran
|
1b0e077f75
|
新的功绩类型21
|
2019-07-26 11:09:39 +08:00 |
lvxinran
|
13d00e36d0
|
云梦祈福刷新修改
|
2019-07-26 09:53:46 +08:00 |
lvxinran
|
9bf412c5c4
|
云梦祈福修改
|
2019-07-25 20:37:36 +08:00 |
wangyuan
|
2237a35f82
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-25 19:34:37 +08:00 |
wangyuan
|
cbcb8ae72e
|
time recovery
|
2019-07-25 19:34:21 +08:00 |
lvxinran
|
4b96a91122
|
装备锁定解锁
|
2019-07-25 17:46:09 +08:00 |
lvxinran
|
00f9935ef8
|
云梦祈福常量修改
|
2019-07-25 16:37:35 +08:00 |
lvxinran
|
7d68e534e7
|
同战斗逻辑
|
2019-07-25 16:20:33 +08:00 |
lvxinran
|
7ff90d3a74
|
时间修改
|
2019-07-25 15:44:10 +08:00 |
wangyuan
|
77d4d2c791
|
star reward
|
2019-07-25 15:22:11 +08:00 |
wangyuan
|
2cb68aebbb
|
match
|
2019-07-25 15:05:30 +08:00 |
wangyuan
|
f40ed6ea41
|
精英怪冰冻时间
|
2019-07-25 13:48:03 +08:00 |