1
This commit is contained in:
parent
ad98c03aa2
commit
fa35db7d89
@ -585,7 +585,9 @@ class GuildEx(object):
|
|||||||
self.fields = [
|
self.fields = [
|
||||||
['guild_id', 0, '工会id'],
|
['guild_id', 0, '工会id'],
|
||||||
['guild_name', '', '工会名称'],
|
['guild_name', '', '工会名称'],
|
||||||
['guild_badge', '', '工会头像']
|
['guild_badge', '', '工会头像'],
|
||||||
|
['owner_id', '', '会长id'],
|
||||||
|
['owner_name', '', '会长名称'],
|
||||||
]
|
]
|
||||||
|
|
||||||
class RankingItemEx(object):
|
class RankingItemEx(object):
|
||||||
@ -995,5 +997,7 @@ class EventRankingList(object):
|
|||||||
['wave', 0, '活动轮数'],
|
['wave', 0, '活动轮数'],
|
||||||
['themeType', 0, '1 击杀榜,2 吃鸡榜,3 场次榜,4 工会榜'],
|
['themeType', 0, '1 击杀榜,2 吃鸡榜,3 场次榜,4 工会榜'],
|
||||||
['themeName', '', '活动名称'],
|
['themeName', '', '活动名称'],
|
||||||
|
['startTime', '', '开始时间'],
|
||||||
|
['endTime', '', '结束时间'],
|
||||||
['status', 0, '0:已结束 1:进行中 2:等待中'],
|
['status', 0, '0:已结束 1:进行中 2:等待中'],
|
||||||
]
|
]
|
||||||
|
@ -25,7 +25,9 @@ class Guild extends BaseModel
|
|||||||
return array(
|
return array(
|
||||||
'guild_id' => $row['guild_id'],
|
'guild_id' => $row['guild_id'],
|
||||||
'guild_name' => $row['guild_name'],
|
'guild_name' => $row['guild_name'],
|
||||||
'guild_badge' => $row['guild_badge']
|
'guild_badge' => $row['guild_badge'],
|
||||||
|
'owner_id' => $row['guild_badge'],
|
||||||
|
'owner_name' => $row['owner_name'],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,7 +105,7 @@ class User extends BaseModel {
|
|||||||
'address' => phpcommon\extractOpenId($row['account_id']),
|
'address' => phpcommon\extractOpenId($row['account_id']),
|
||||||
'name' => $row['name'],
|
'name' => $row['name'],
|
||||||
'sex' => $row['sex'],
|
'sex' => $row['sex'],
|
||||||
'head_id' => $row['hero_id'],
|
'head_id' => $row['head_id'],
|
||||||
'head_frame' => $row['head_frame'],
|
'head_frame' => $row['head_frame'],
|
||||||
'level' => $row['level'],
|
'level' => $row['level'],
|
||||||
'exp' => $row['exp'],
|
'exp' => $row['exp'],
|
||||||
|
@ -45,6 +45,8 @@ class EventRanking
|
|||||||
'wave' => $meta['wave'],
|
'wave' => $meta['wave'],
|
||||||
'themeType' => $meta['themeType'],
|
'themeType' => $meta['themeType'],
|
||||||
'themeName' => $meta['themeName'],
|
'themeName' => $meta['themeName'],
|
||||||
|
'startTime' => $meta['startTime'],
|
||||||
|
'endTime' => $meta['endTime'],
|
||||||
);
|
);
|
||||||
$now = myself()->_getNowTime();
|
$now = myself()->_getNowTime();
|
||||||
switch ($now){
|
switch ($now){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user