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
|
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 |
wangyuan
|
15a12ec5ca
|
修复活动数据没有入库
|
2019-07-25 11:43:33 +08:00 |
lvxinran
|
08153b9bfd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-25 11:08:09 +08:00 |
lvxinran
|
3d9ee7400a
|
头像框修改
|
2019-07-25 11:08:05 +08:00 |
wangyuan
|
faf64f5339
|
mission
|
2019-07-25 11:00:12 +08:00 |
wangyuan
|
172ddbbd95
|
删除红点
|
2019-07-25 10:29:27 +08:00 |
wangyuan
|
212d34ca3f
|
treasure
|
2019-07-25 10:01:38 +08:00 |
wangyuan
|
2f628f1b10
|
7
|
2019-07-24 21:56:21 +08:00 |
lvxinran
|
668635d0ef
|
云梦祈福初始化
|
2019-07-24 21:56:04 +08:00 |
wangyuan
|
538f965b32
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-24 20:47:25 +08:00 |
wangyuan
|
12448b77c2
|
item flush
|
2019-07-24 20:47:11 +08:00 |
lvxinran
|
e5b63f835e
|
提交
|
2019-07-24 19:45:24 +08:00 |
wangyuan
|
f7f0b30645
|
item recovey
|
2019-07-24 19:42:10 +08:00 |
wangyuan
|
74aadb0f82
|
force
|
2019-07-24 17:51:33 +08:00 |
lvxinran
|
9c0b47c8f9
|
功绩修改
|
2019-07-24 16:10:53 +08:00 |
wangyuan
|
525bf2eafe
|
push mission
|
2019-07-24 15:49:20 +08:00 |
wangyuan
|
5fa727711c
|
装备邮件
|
2019-07-24 15:39:13 +08:00 |
wangyuan
|
e772fe4630
|
delete log
|
2019-07-24 15:27:18 +08:00 |
wangyuan
|
306e57a1de
|
公式修改
|
2019-07-24 15:25:34 +08:00 |
wangyuan
|
b357fa2aa2
|
mission
|
2019-07-24 15:14:14 +08:00 |
wangyuan
|
557ac14709
|
teamid
|
2019-07-24 15:02:14 +08:00 |
wangyuan
|
e1b0b71d7f
|
treasure
|
2019-07-24 15:00:26 +08:00 |
wangyuan
|
b89aa9a2a0
|
fix map
|
2019-07-24 14:43:33 +08:00 |
wangyuan
|
c1d9f8fdb0
|
fix
|
2019-07-24 14:25:48 +08:00 |
wangyuan
|
9943d08dba
|
fix hero
|
2019-07-24 14:24:07 +08:00 |
wangyuan
|
eca6706f75
|
item
|
2019-07-24 13:52:07 +08:00 |
wangyuan
|
672b7990c3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-07-24 13:47:27 +08:00 |
wangyuan
|
030e0f728e
|
mission & store
|
2019-07-24 13:46:40 +08:00 |
lvxinran
|
4fe6793c59
|
阵营光环当前生命值修复
|
2019-07-24 13:42:30 +08:00 |
lvxinran
|
db732001aa
|
44行为类型
|
2019-07-23 21:52:07 +08:00 |
lvxinran
|
d677a1066c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-23 21:01:46 +08:00 |
lvxinran
|
d5c4168295
|
刷新次数修改
|
2019-07-23 21:01:41 +08:00 |
wangyuan
|
26270ae6da
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-23 20:35:29 +08:00 |
wangyuan
|
3e6b25bb3d
|
孙龙的任务
|
2019-07-23 20:35:15 +08:00 |
lvxinran
|
f96932c50a
|
元素共鸣报错修改
|
2019-07-23 18:04:16 +08:00 |
wangyuan
|
34dac1a17f
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-23 18:03:01 +08:00 |
wangyuan
|
4c12b893da
|
mission
|
2019-07-23 18:00:46 +08:00 |
lvxinran
|
dda168c324
|
云梦祈福逻辑提交
|
2019-07-23 17:41:48 +08:00 |
lvxinran
|
ea89394c70
|
云梦祈福结构修改
|
2019-07-23 11:18:44 +08:00 |
wangyuan
|
060e554809
|
item fresh
|
2019-07-23 10:01:43 +08:00 |
wangyuan
|
4a9d1812af
|
storelogic
|
2019-07-22 18:18:47 +08:00 |
wangyuan
|
fbcee502b6
|
buy goods
|
2019-07-22 17:42:49 +08:00 |
wangyuan
|
f814586624
|
recharge
|
2019-07-25 07:16:34 +08:00 |
lvxinran
|
cfbc1eb00e
|
光环提交
|
2019-07-22 16:13:15 +08:00 |
lvxinran
|
3e70a0384c
|
阵营光环上线
|
2019-07-22 15:53:50 +08:00 |
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
|
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 |