wangyuan
|
b4e7cf3e5d
|
vip level task
|
2019-08-05 15:58:48 +08:00 |
lvxinran
|
8f588acb05
|
无尽副本修改
|
2019-08-05 15:43:29 +08:00 |
lvxinran
|
981c3f163a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-05 15:41:08 +08:00 |
wangyuan
|
f52c4f5462
|
fix activity flush five
|
2019-08-05 15:20:12 +08:00 |
lvxinran
|
fc9e2c54fe
|
无尽副本修改
|
2019-08-05 15:09:18 +08:00 |
wangyuan
|
7f5ccf558b
|
活动掉落
|
2019-08-05 15:07:47 +08:00 |
wangyuan
|
54c4f06df1
|
fix new mission
|
2019-08-05 11:30:58 +08:00 |
wangyuan
|
9cb5277436
|
new task
|
2019-08-05 11:27:13 +08:00 |
wangyuan
|
f90bbee15a
|
公会
|
2019-08-05 10:02:29 +08:00 |
lvxinran
|
bfa231635c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-03 16:51:21 +08:00 |
lvxinran
|
f2556361e7
|
定时
|
2019-08-03 16:51:12 +08:00 |
wangyuan
|
eef97e054a
|
fix family & task
|
2019-08-03 16:49:47 +08:00 |
wangyuan
|
703a7686b9
|
离开公会
|
2019-08-03 16:15:38 +08:00 |
lvxinran
|
e5110e48e5
|
无尽副本,自动回复提交
|
2019-08-03 15:46:23 +08:00 |
wangyuan
|
f187a5043b
|
beginner task
|
2019-08-03 14:59:20 +08:00 |
zhangshanxue
|
dba41c51a3
|
活动初始化和漏刷
|
2019-08-03 11:02:03 +08:00 |
zhangshanxue
|
b05268b766
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-03 09:59:45 +08:00 |
zhangshanxue
|
3167653418
|
战力排行
|
2019-08-03 09:59:18 +08:00 |
zhangshanxue
|
5f5c7ba5f1
|
排行榜
|
2019-08-02 18:30:13 +08:00 |
lvxinran
|
27e3ec0380
|
无尽副本修改
|
2019-08-02 14:57:56 +08:00 |
zhangshanxue
|
f4665ee4c7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-02 13:35:33 +08:00 |
zhangshanxue
|
3edd6e7ebc
|
战力排行
|
2019-08-02 13:34:37 +08:00 |
wangyuan
|
dfc0ca056c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-02 09:59:09 +08:00 |
wangyuan
|
d8ce89bd38
|
family
|
2019-08-02 09:57:01 +08:00 |
lvxinran
|
e045241e91
|
标志修改
|
2019-08-01 20:57:41 +08:00 |
lvxinran
|
b3f597083a
|
设置无尽副本点
|
2019-08-01 20:45:20 +08:00 |
lvxinran
|
ab071737d5
|
代码提交
|
2019-08-01 18:37:46 +08:00 |
lvxinran
|
ef94caf44e
|
无尽副本提交
|
2019-08-01 18:27:17 +08:00 |
lvxinran
|
8e1a7efd45
|
无尽副本提交
|
2019-08-01 18:23:49 +08:00 |
wangyuan
|
54407dabe6
|
fix guild
|
2019-08-01 18:16:03 +08:00 |
zhangshanxue
|
0f34c27c48
|
招财猫
|
2019-08-01 17:33:30 +08:00 |
zhangshanxue
|
75555828e4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-01 14:45:16 +08:00 |
zhangshanxue
|
63b7f3ee86
|
战力排行
|
2019-08-01 14:15:19 +08:00 |
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
|
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 |
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 |
wangyuan
|
63d3168ffa
|
抽卡送宝箱
|
2019-07-16 10:58:11 +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 |
lvxinran
|
8e727965dd
|
精英本扫荡
|
2019-07-15 16:34:26 +08:00 |
wangyuan
|
bbbd5d2344
|
Merge branch 'online1.0'
|
2019-07-15 15:16:45 +08:00 |
wangyuan
|
36b1071efc
|
行为类型7
|
2019-07-15 14:35:38 +08:00 |
wangyuan
|
534886c920
|
Merge branch 'online1.0'
|
2019-07-15 11:00:49 +08:00 |
wangyuan
|
fb2b2ff379
|
修改计算
|
2019-07-15 10:41:36 +08:00 |
lvxinran
|
4dfc832ca2
|
Merge branch 'online1.0'
|
2019-07-12 18:26:07 +08:00 |
gaojie
|
6add54c66b
|
好友推送状态
|
2019-07-12 17:29:49 +08:00 |
gaojie
|
55c7f19b45
|
Merge branch 'online1.0' of http://60.1.1.230/backend/jieling_server into online1.0
|
2019-07-12 16:54:31 +08:00 |
gaojie
|
934185db65
|
删除好友保留之前赠送体力状态
|
2019-07-12 16:54:27 +08:00 |
gaojie
|
d73d77c28e
|
好友赠送体力
|
2019-07-13 11:56:36 +08:00 |
wangyuan
|
956e689396
|
mission
|
2019-07-12 16:48:38 +08:00 |
lvxinran
|
84654cb0fd
|
Merge branch 'online1.0'
|
2019-07-12 14:45:56 +08:00 |
wangyuan
|
242be06ec4
|
fix daily mission
|
2019-07-12 14:44:31 +08:00 |
lvxinran
|
6fb6390d60
|
随机数修改
|
2019-07-12 13:33:56 +08:00 |
lvxinran
|
24eca20b07
|
功绩事件类型添加
|
2019-07-12 11:21:33 +08:00 |
lvxinran
|
98e2309523
|
装备特性随机提交
|
2019-07-12 10:19:23 +08:00 |
lvxinran
|
3b2ebae2c5
|
试炼最高层处理
|
2019-07-11 17:12:11 +08:00 |
wangyuan
|
e88a8fd3b5
|
thread
|
2019-07-15 16:50:54 +08:00 |
lvxinran
|
1e572b1142
|
日志修改
|
2019-07-11 15:14:46 +08:00 |
lvxinran
|
9c1533621f
|
试炼重置修改、排行榜协议修改
|
2019-07-11 14:50:57 +08:00 |
lvxinran
|
69da7e98ca
|
试炼排行榜修改
|
2019-07-11 11:02:33 +08:00 |
wangyuan
|
71e36e025d
|
red & fix vip mission
|
2019-07-11 10:57:13 +08:00 |
lvxinran
|
628ff1a05c
|
删除无关注释
|
2019-07-11 10:36:04 +08:00 |
lvxinran
|
9b051399b6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-11 10:06:09 +08:00 |
lvxinran
|
35c69631b2
|
试炼排行榜实现
|
2019-07-11 10:06:05 +08:00 |
gaojie
|
745ddbeadf
|
统一线程处理数据
|
2019-07-11 10:02:18 +08:00 |
wangyuan
|
2d11d1485e
|
red point
|
2019-07-10 19:48:45 +08:00 |
gaojie
|
bdc04f8046
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-10 15:21:57 +08:00 |
gaojie
|
cbd0e4d78c
|
请求所需的时间
|
2019-07-10 15:21:13 +08:00 |
lvxinran
|
f602185b16
|
buff不生效修改
|
2019-07-10 15:07:43 +08:00 |
wangyuan
|
444bcddf9b
|
red
|
2019-07-18 21:14:47 +08:00 |
wangyuan
|
aa2396aa44
|
fix upload
|
2019-07-09 20:22:16 +08:00 |
lvxinran
|
fcd3811495
|
试炼商店修改
|
2019-07-09 18:25:12 +08:00 |
wangyuan
|
eed7984934
|
data upload
|
2019-07-09 18:03:12 +08:00 |
lvxinran
|
c8965f70cd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-09 17:57:02 +08:00 |
lvxinran
|
88eb2cb440
|
试炼商店修改
|
2019-07-09 17:56:58 +08:00 |
gaojie
|
8e7b04b6a5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-09 16:05:14 +08:00 |
gaojie
|
55bcdafa24
|
fix
|
2019-07-09 16:05:10 +08:00 |
wangyuan
|
287f00ef47
|
delete log
|
2019-07-09 16:02:44 +08:00 |
wangyuan
|
431d82b163
|
item
|
2019-07-09 16:00:46 +08:00 |
lvxinran
|
4d0a4d312d
|
五点刷新白名单
|
2019-07-09 05:06:41 +08:00 |
lvxinran
|
ed20d889cb
|
召唤首领修改
|
2019-07-08 19:56:25 +08:00 |
lvxinran
|
cab55a367c
|
爬塔时间修改
|
2019-07-08 19:54:57 +08:00 |
wangyuan
|
1b49020695
|
hotfix lua
|
2019-07-08 18:10:40 +08:00 |
wangyuan
|
e67bf61141
|
删除完成活动
|
2019-07-08 17:24:26 +08:00 |
gaojie
|
db5ddc0fcc
|
fix
|
2019-07-08 16:58:02 +08:00 |
wangyuan
|
96bcf70018
|
data upload
|
2019-07-08 15:26:03 +08:00 |
wangyuan
|
80bf7abc1a
|
fix time
|
2019-07-08 13:34:09 +08:00 |
wangyuan
|
bea4839821
|
fix
|
2019-07-08 13:14:40 +08:00 |
wangyuan
|
96c2665505
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-08 12:55:40 +08:00 |
wangyuan
|
4cd3f99c1c
|
red indition & recharge
|
2019-07-08 12:51:54 +08:00 |
gaojie
|
cadbc57677
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
|
2019-07-08 10:48:23 +08:00 |
gaojie
|
21c50c2383
|
屏蔽敏感校验
|
2019-07-08 10:47:54 +08:00 |
wangyuan
|
f3bcc3c516
|
fix
|
2019-07-05 20:44:33 +08:00 |
wangyuan
|
002557fad1
|
数据上报
|
2019-07-05 20:44:18 +08:00 |
wangyuan
|
c333aade20
|
delete return
|
2019-07-05 18:58:46 +08:00 |
wangyuan
|
6a7d9a2ba4
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-05 18:19:03 +08:00 |
wangyuan
|
1108c04935
|
kt http upload
|
2019-07-05 18:18:31 +08:00 |
jiahuiwen
|
891bd568b6
|
热更表版本判断
|
2019-07-05 16:13:07 +08:00 |
jiahuiwen
|
5217601d47
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-05 15:59:00 +08:00 |
jiahuiwen
|
aeeeb61995
|
打包版本号
|
2019-07-05 15:58:53 +08:00 |
lvxinran
|
9e2cf35c4e
|
错误修改
|
2019-07-05 15:48:32 +08:00 |
lvxinran
|
50f3127f01
|
Data参数提交
|
2019-07-05 15:00:11 +08:00 |
jiahuiwen
|
269d4e0267
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-05 14:53:28 +08:00 |
jiahuiwen
|
ea12488b93
|
调用热更新
|
2019-07-05 14:52:54 +08:00 |
wangyuan
|
5b389f9b09
|
聊天不校验特殊字符
|
2019-07-05 14:41:15 +08:00 |
wangyuan
|
99d2828a6c
|
send http
|
2019-07-05 14:13:59 +08:00 |
lvxinran
|
be52cac2bb
|
登陆数据接收
|
2019-07-05 13:49:16 +08:00 |
wangyuan
|
c614a976e0
|
kt
|
2019-07-20 16:07:05 +08:00 |
wangyuan
|
ae717d5caa
|
decompase
|
2019-07-20 15:07:10 +08:00 |
wangyuan
|
4920b68b41
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/ktbeans/KtEventUtils.java
|
2019-07-20 14:51:01 +08:00 |
wangyuan
|
506e1b4277
|
日志上报动态参数
|
2019-07-19 13:43:16 +08:00 |
lvxinran
|
cec1a85669
|
代码修改提交
|
2019-07-05 10:15:02 +08:00 |
wangyuan
|
c0cf345b40
|
mail red
|
2019-07-05 03:04:24 +08:00 |
lvxinran
|
2416934b0f
|
conf
|
2019-07-05 02:14:18 +08:00 |
lvxinran
|
58c8dfc970
|
提交
|
2019-07-05 01:27:59 +08:00 |
lvxinran
|
4877b24cc8
|
conf
|
2019-07-05 01:12:53 +08:00 |
wangyuan
|
cb747e49dc
|
delete open server mail
|
2019-07-04 23:12:58 +08:00 |
wangyuan
|
b4828b943c
|
fix adventure left
|
2019-07-04 23:05:37 +08:00 |
wangyuan
|
4c799d300a
|
adventure fix
|
2019-07-04 21:54:41 +08:00 |
lvxinran
|
5238704d95
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 21:48:10 +08:00 |
lvxinran
|
72a7ef8a1f
|
修复重置扫荡
|
2019-07-04 21:46:21 +08:00 |
wangyuan
|
16b8210460
|
fix force
|
2019-07-04 21:44:13 +08:00 |
wangyuan
|
a4d3c653fe
|
kt
|
2019-07-04 21:27:18 +08:00 |
lvxinran
|
3870c87694
|
字段修改
|
2019-07-04 20:26:26 +08:00 |
lvxinran
|
232159bf22
|
BIReason修改,副本难度暂存修改
|
2019-07-04 20:19:44 +08:00 |
lvxinran
|
1d17e074d1
|
精英副本难度记录实现
|
2019-07-04 17:58:37 +08:00 |
wangyuan
|
9e74d3dbc4
|
delete http pool
|
2019-07-04 17:46:59 +08:00 |
gaojie
|
3946bdc27b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 17:27:20 +08:00 |
gaojie
|
9547d08080
|
使用道具
|
2019-07-04 17:27:16 +08:00 |
wangyuan
|
f6bb11312f
|
print log
|
2019-07-07 15:46:49 +08:00 |
wangyuan
|
0c11ff2e4d
|
conf & test lua & mission
|
2019-07-04 17:11:08 +08:00 |
gaojie
|
ea2353bb06
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 15:43:16 +08:00 |
gaojie
|
ea09857a64
|
好友信息
|
2019-07-04 15:42:57 +08:00 |
lvxinran
|
a2d5ecd93a
|
试炼掉出地图重置修改
|
2019-07-04 15:38:01 +08:00 |
gaojie
|
6fafd9c49b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 14:41:52 +08:00 |
gaojie
|
788c92b0e8
|
httppool fix
|
2019-07-04 14:41:47 +08:00 |
lvxinran
|
39825d03cd
|
开天接数据方法提交
|
2019-07-04 14:40:01 +08:00 |
wangyuan
|
14983f6ccb
|
log
|
2019-07-06 14:11:52 +08:00 |
wangyuan
|
a76bfb8249
|
skip new player
|
2019-07-06 13:51:13 +08:00 |
wangyuan
|
f9b7f8b7c2
|
mail
|
2019-07-06 12:24:38 +08:00 |
gaojie
|
3a73c47823
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-04 11:33:52 +08:00 |
wangyuan
|
bf451dd19b
|
log
|
2019-07-05 22:36:07 +08:00 |
gaojie
|
31988bce68
|
fix
|
2019-07-04 11:33:18 +08:00 |
lvxinran
|
85b0837e31
|
战斗buff修复
|
2019-07-03 21:48:06 +08:00 |
lvxinran
|
997a6edb3e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 21:47:37 +08:00 |
lvxinran
|
1d994ccee2
|
GM外敌
|
2019-07-03 21:15:47 +08:00 |
wangyuan
|
1f538c8faa
|
conf & map & ktbean
|
2019-07-03 20:57:47 +08:00 |
gaojie
|
19c2e880ee
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-07-03 19:16:48 +08:00 |
gaojie
|
134c779373
|
同步数据
|
2019-07-03 19:15:54 +08:00 |
lvxinran
|
63107c3af7
|
41行为类型添加
|
2019-07-03 18:28:04 +08:00 |
lvxinran
|
4d4a47dd0f
|
爬塔奖励第一层修改
|
2019-07-03 17:00:05 +08:00 |
lvxinran
|
24b4080062
|
扫荡修改
|
2019-07-03 16:25:25 +08:00 |
lvxinran
|
181649ee07
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 16:16:20 +08:00 |
lvxinran
|
12bb758a38
|
试炼奖励修复
|
2019-07-03 16:16:16 +08:00 |
wangyuan
|
becff88ad7
|
kill reward
|
2019-07-03 14:22:54 +08:00 |
wangyuan
|
46e9d4c318
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-03 14:08:59 +08:00 |
wangyuan
|
bd763bcb1c
|
fix map sweep
|
2019-07-03 14:08:51 +08:00 |
lvxinran
|
78d14781c8
|
服务器报错修改
|
2019-07-03 12:14:03 +08:00 |
gaojie
|
d6079d0964
|
fix
|
2019-07-03 11:59:35 +08:00 |
gaojie
|
5781cad3f8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 11:53:35 +08:00 |
gaojie
|
6ef92b7d2d
|
上报数据
|
2019-07-03 11:53:30 +08:00 |
lvxinran
|
5cf515aa1a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 11:41:03 +08:00 |
lvxinran
|
309069c622
|
试炼精气值修改
|
2019-07-03 11:40:59 +08:00 |
gaojie
|
4bd4b07f88
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-03 11:32:48 +08:00 |
gaojie
|
c76141c21e
|
fix
|
2019-07-03 11:31:59 +08:00 |
lvxinran
|
3e3de9e38d
|
试炼重置修改
|
2019-07-03 11:17:41 +08:00 |
lvxinran
|
69f2522702
|
日志打印修改
|
2019-07-03 10:00:29 +08:00 |
lvxinran
|
57d77bea09
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 22:51:11 +08:00 |
lvxinran
|
ec27295b72
|
日志修改,重置buff修改
|
2019-07-02 22:51:07 +08:00 |
wangyuan
|
c7ef7294ff
|
food buffer
|
2019-07-02 22:49:27 +08:00 |
wangyuan
|
33cd931e82
|
fix
|
2019-07-02 22:09:38 +08:00 |
wangyuan
|
c5261cc9be
|
mapmanager
|
2019-07-02 21:58:04 +08:00 |
lvxinran
|
f4f72607cc
|
爬塔时间修改
|
2019-07-02 21:37:59 +08:00 |
wangyuan
|
ab5f807e7d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-02 21:16:14 +08:00 |
wangyuan
|
fe3bac1880
|
rechage
|
2019-07-02 21:14:48 +08:00 |
lvxinran
|
71f01bc239
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 21:10:47 +08:00 |
lvxinran
|
8b5daa805d
|
时间修改
|
2019-07-02 21:10:42 +08:00 |
wangyuan
|
4622b3ff8e
|
Merge branches 'master' and 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-02 19:54:02 +08:00 |
wangyuan
|
4bc16b9c3a
|
每日任务首次计数
|
2019-07-02 19:45:52 +08:00 |
wangyuan
|
19fcb74513
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-07-02 18:57:06 +08:00 |
jiahuiwen
|
2cac0935cb
|
爬塔副本 未初始精英怪bug
|
2019-07-02 18:12:27 +08:00 |
gaojie
|
074cd07972
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 17:52:40 +08:00 |
gaojie
|
feb2dbe8f4
|
关卡扫荡
|
2019-07-02 17:52:31 +08:00 |
wangyuan
|
57a9809a48
|
sweep
|
2019-07-02 17:19:32 +08:00 |
lvxinran
|
07d172257a
|
爬塔buff修改
|
2019-07-02 17:12:51 +08:00 |
wangyuan
|
659f0f6945
|
修复迷雾森林
|
2019-07-02 16:38:11 +08:00 |
gaojie
|
f834a14c59
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-02 15:36:31 +08:00 |
wangyuan
|
0a832f3e08
|
修复任务
|
2019-07-12 15:20:03 +08:00 |
wangyuan
|
b449d4166e
|
fix daily mission
|
2019-07-12 15:14:11 +08:00 |
gaojie
|
5724c775ec
|
系统邮件一分钟从数据库中取一次
|
2019-07-02 15:35:58 +08:00 |
lvxinran
|
caafce3a02
|
回滚
|
2019-07-02 15:01:31 +08:00 |
lvxinran
|
02124be971
|
爬塔商店修改
|
2019-07-02 13:56:57 +08:00 |
lvxinran
|
4e670fea26
|
fix tower shop
|
2019-07-02 09:57:19 +08:00 |
wangyuan
|
ba2a9bf57a
|
mission
|
2019-07-10 22:37:28 +08:00 |
wangyuan
|
8576327656
|
mission
|
2019-07-10 22:37:13 +08:00 |
wangyuan
|
1e34fc8993
|
fix
|
2019-07-08 22:03:17 +08:00 |
wangyuan
|
b74d2b13b6
|
fix
|
2019-07-08 22:02:39 +08:00 |
wangyuan
|
4f2b52a685
|
扫荡计数
|
2019-07-08 21:22:26 +08:00 |
wangyuan
|
aaa50d506f
|
fix type
|
2019-07-08 21:10:37 +08:00 |
wangyuan
|
ee5a9d752f
|
fix
|
2019-07-07 21:08:36 +08:00 |
wangyuan
|
c8b8961ac4
|
mission open
|
2019-07-07 21:07:53 +08:00 |
wangyuan
|
eb81581ee1
|
fix function type
|
2019-07-07 20:38:48 +08:00 |
lvxinran
|
dc92619cbe
|
爬塔最后一层时间、爬塔扫荡、退出地图修改
|
2019-07-01 20:28:42 +08:00 |
wangyuan
|
1c7be8d183
|
FIX
|
2019-07-07 20:22:38 +08:00 |
wangyuan
|
38950f5f46
|
修复体力80问题
|
2019-07-06 18:51:56 +08:00 |
wangyuan
|
7a4ef76467
|
fix
|
2019-07-06 18:25:12 +08:00 |
wangyuan
|
bd54eea409
|
fix mission
|
2019-07-06 18:22:14 +08:00 |
wangyuan
|
1f4eea88c0
|
fix hero
|
2019-07-06 18:04:17 +08:00 |
lvxinran
|
1846fed4c9
|
爬塔修改
|
2019-07-01 18:00:39 +08:00 |
lvxinran
|
58a2d9e87a
|
试炼更新
|
2019-07-01 17:29:39 +08:00 |
wangyuan
|
6e71bccd2a
|
conf
|
2019-07-02 13:01:43 +08:00 |
gaojie
|
fb63575f3f
|
体力上限
|
2019-07-01 12:00:55 +08:00 |
gaojie
|
681e26ae0a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-07-01 11:28:24 +08:00 |
gaojie
|
4d31031f31
|
log
|
2019-07-01 11:26:42 +08:00 |
wangyuan
|
be4cabc23b
|
fix mission
|
2019-06-29 16:49:09 +08:00 |
lvxinran
|
de2b8cf853
|
试炼副本相关提交
|
2019-06-29 16:29:28 +08:00 |
wangyuan
|
92d17073ae
|
fix force
|
2019-06-29 16:22:34 +08:00 |
wangyuan
|
51257cda85
|
坐标
|
2019-06-29 11:06:33 +08:00 |
lvxinran
|
4dd64f4237
|
试炼爬塔副本相关提交
|
2019-06-29 10:11:52 +08:00 |
lvxinran
|
23aa6369c7
|
Hero信息修改
|
2019-06-28 19:19:00 +08:00 |
wangyuan
|
50fdae30bf
|
fix
|
2019-06-30 20:14:40 +08:00 |
wangyuan
|
d064d102ab
|
new event type
|
2019-06-30 20:11:34 +08:00 |
wangyuan
|
0f7550d798
|
misison
|
2019-06-30 19:59:49 +08:00 |
wangyuan
|
f979eb10a2
|
任务
|
2019-06-30 19:24:45 +08:00 |
wangyuan
|
62340bf943
|
击杀奖励
|
2019-06-30 15:39:15 +08:00 |
wangyuan
|
8ec7059ba1
|
fix
|
2019-06-28 11:54:26 +08:00 |
wangyuan
|
1128d19217
|
领取秘境奖励次数
|
2019-06-28 11:24:17 +08:00 |
wangyuan
|
a13cd2de02
|
fix work shop
|
2019-06-27 20:50:42 +08:00 |
wangyuan
|
0204a27a38
|
fix skip fight
|
2019-06-27 19:32:03 +08:00 |
wangyuan
|
121c465496
|
创角时间
|
2019-06-27 18:06:00 +08:00 |
wangyuan
|
18cd2bd4b9
|
fix 40
|
2019-06-27 17:45:25 +08:00 |
wangyuan
|
82c1fc4dd8
|
挂机
|
2019-06-27 17:34:21 +08:00 |
wangyuan
|
1655043499
|
fix skip boss
|
2019-06-27 17:08:56 +08:00 |
lvxinran
|
09a19a126b
|
表格信息更改
|
2019-06-27 14:56:23 +08:00 |
wangyuan
|
e5cf962cee
|
地图类型40
|
2019-06-27 14:08:10 +08:00 |
wangyuan
|
f7ee8b388e
|
修复日常任务多穿了一个参数
|
2019-06-26 20:55:11 +08:00 |
jiahuiwen
|
2a3c2988f2
|
删除
|
2019-06-26 19:01:43 +08:00 |
jiahuiwen
|
7cea727ea5
|
删除多余方法
|
2019-06-26 18:57:58 +08:00 |
jiahuiwen
|
79bc55a648
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-26 18:56:47 +08:00 |
jiahuiwen
|
6a806eca6d
|
爬塔副本
|
2019-06-26 18:56:15 +08:00 |
wangyuan
|
ec6c26e8a9
|
自动删除精英怪坐标
|
2019-06-26 18:04:54 +08:00 |
wangyuan
|
5dbcbb4bd3
|
fix
|
2019-06-26 16:25:39 +08:00 |
wangyuan
|
84093dd1a4
|
battle
|
2019-06-26 16:02:31 +08:00 |
wangyuan
|
587c317dc4
|
fix
|
2019-06-26 15:02:21 +08:00 |
lvxinran
|
9245d843b7
|
线程管理单例修改
|
2019-06-26 14:49:47 +08:00 |
lvxinran
|
7ee6ab2961
|
修改系统时间延迟修改
|
2019-06-26 13:40:20 +08:00 |
wangyuan
|
a9f8d02ece
|
功绩奖励-》一维数组
|
2019-06-26 10:36:11 +08:00 |
jiahuiwen
|
4b612732ef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 20:03:41 +08:00 |
jiahuiwen
|
d9bf43b0d1
|
爬塔副本
|
2019-06-25 20:03:36 +08:00 |
gaojie
|
62f5c925e0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 19:41:26 +08:00 |
gaojie
|
7fe45e7d71
|
装备打造跑马灯
|
2019-06-25 19:41:18 +08:00 |
jiahuiwen
|
9c4d61065b
|
炸弹id
|
2019-06-25 18:06:16 +08:00 |
jiahuiwen
|
c010b09b78
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 17:14:15 +08:00 |
jiahuiwen
|
c3037991e6
|
爬塔副本
|
2019-06-25 17:14:08 +08:00 |
wangyuan
|
990e3bada9
|
回复英雄副本时间
|
2019-06-25 17:06:54 +08:00 |
wangyuan
|
eb8d6f6038
|
秘境邮件
|
2019-06-25 15:59:31 +08:00 |
wukang
|
a47395fcea
|
add log
|
2019-06-25 15:37:09 +08:00 |
wukang
|
1e6044b691
|
fix
|
2019-06-25 15:29:49 +08:00 |
jiahuiwen
|
ee1234ad2c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-25 15:29:36 +08:00 |
jiahuiwen
|
505547fa66
|
爬塔副本信息(试炼副本)
|
2019-06-25 15:28:07 +08:00 |
wangyuan
|
24e9d35228
|
fix 取mission问题
|
2019-06-25 14:21:26 +08:00 |
wangyuan
|
65f9592f68
|
2-->3
|
2019-06-25 13:58:13 +08:00 |
jiahuiwen
|
9eeabfdbe7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-06-25 12:08:06 +08:00 |
jiahuiwen
|
f4e77f9ada
|
爬塔副本初版
|
2019-06-25 12:06:41 +08:00 |
wangyuan
|
1116f2de9c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-25 12:02:48 +08:00 |
wangyuan
|
2b28e768fb
|
地图任务
|
2019-06-25 12:02:10 +08:00 |
wukang
|
7b51289291
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-06-25 10:14:55 +08:00 |
wukang
|
7b9eeb78f1
|
add log
|
2019-06-25 10:14:36 +08:00 |
wangyuan
|
c7fdef8058
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-06-25 10:12:51 +08:00 |
wangyuan
|
b99522734d
|
地图探索任务
|
2019-06-25 10:12:25 +08:00 |