server/game2006api
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'james_bc' of git.kingsome.cn:server/game2006api into james_bc

Browse Source
This commit is contained in:
aozhiwei 2022-12-13 16:21:00 +08:00
commit e52d6d6ad9
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/controller/BaseAuthedController.class.php
View File

@ -393,7 +393,7 @@ class BaseAuthedController extends BaseController {
$headsDb = emptyReplace(json_decode($userInfo['head_list'], true), array());
$headFramesDb = emptyReplace(json_decode($userInfo['head_frame_list'], true), array());
$heads = array_unique(array_merge($heads, $headsDb));
$headFrames = array_unique(array_merge($headFrames, $headFramesDb));
$headFrames = array_values(array_unique(array_merge($headFrames, $headFramesDb)));
$this->_updateUserInfo(array(
'head_list' => json_encode($heads),
'head_frame_list' => json_encode($headFrames),

7
webapp/models/Parachute.php
View File

@ -20,9 +20,14 @@ class Parachute extends BaseModel
public static function addParachute($itemMeta){
if ($itemMeta){
if ($itemMeta['type'] == mt\Item::PARACHUTE_TYPE){
SqlHelper::insert(
SqlHelper::upsert(
myself()->_getSelfMysql(),
't_parachute',
array(
'account_id' => myself()->_getAccountId(),
'item_id' => $itemMeta['id'],
),
array(),
array(
'account_id' => myself()->_getAccountId(),
'item_id' => $itemMeta['id'],

21
webapp/models/UserSeasonRing.php
View File

@ -46,17 +46,20 @@ class UserSeasonRing extends BaseModel
public static function internalAddHero($conn, $itemMeta, $accountId)
{
$fieldsKv = array(
'account_id' => $accountId,
'item_id' => $itemMeta['id'],
'createtime' => myself()->_getNowTime(),
'modifytime' => myself()->_getNowTime()
);
SqlHelper::insert(
SqlHelper::upsert(
$conn,
't_user_season_ring',
$fieldsKv
array(
'account_id' => $accountId,
'item_id' => $itemMeta['id'],
),
array(),
array(
'account_id' => $accountId,
'item_id' => $itemMeta['id'],
'createtime' => myself()->_getNowTime(),
'modifytime' => myself()->_getNowTime()
)
);
}
}