Commit 09eeb49b authored by liyadong's avatar liyadong

Merge branch 'test' of http://gitlab.cccwangluo.com/zhoujun/uc_card into test

parents 3d5d04bf d6959177
......@@ -100,8 +100,10 @@ class CardController extends Controller
$this->getCheckRoleInfoTable($tableName);
$verity = DB::connection('wx_mysql')->table($tableName)->where('uid',$userId)->where('role_id',$roleId)->select('id')->first();
if($verity) return $this->jsonReturn(0, '角色绑定成功');
$insert = $this->getInsertRoleInfo($userId,$roleId,$serverId,$serverName,$tableName);
return $this->jsonReturn(0, '角色绑定成功');
if($insert['code'] == 200) $this->jsonReturn(0, '角色绑定成功');
return $this->jsonReturn($insert['code'], $insert['msg']);
}
/**
......@@ -116,7 +118,6 @@ class CardController extends Controller
$targetRole = [];
$roleIdsKey = "user_roleIds:" . $userId;
$roleList = json_decode(Redis::get($roleIdsKey), true);
if (!isset($roleList[$serverId])){
$array['code'] = 7003;
$array['msg'] = '请选择正确的服务器';
......@@ -134,18 +135,7 @@ class CardController extends Controller
$array['msg'] = '请刷新重新选择角色';
return $array;
}
$duelTotal = 0;
$duelWin = 0;
$maxRank = '';
$win = GameUserPvpCount::where('server_id',$serverId)->where('role_id',$roleId)->select('role_id','total_pvp_num','pvp_win_num')->first();
if($win){
$duelTotal = $win->total_pvp_num;
$duelWin = $win->pvp_win_num;
}
$rank = GameUserPvp::where('server_id',$serverId)->where('role_id',$roleId)->select('role_id','level')->first();
if($rank) $maxRank = $rank->level;
$gmService = new AldGmService();
$roleInfo = $gmService->getCPRoleInfo($serverId,$targetRole['userId'],$roleId);
if(!$roleInfo){
......@@ -154,7 +144,18 @@ class CardController extends Controller
return $array;
}
$roleScore = $roleInfo['RoleScore'] ?? 0;
$duelTotal = $roleInfo['PKTotalNum'] ?? 0;
$duelWin = $roleInfo['PkWinNum'] ?? 0;
$maxRank = '';
$seasonLevelID = $roleInfo['SeasonLevelID'] ?? 0;
$rankConfig = config('sign.rank');
if($seasonLevelID){
$first = substr($seasonLevelID,0,1);
$second = 50 - substr($seasonLevelID,1,2);
if($second == 0) $second = '';
$first = $rankConfig[$first] ?? '';
if($first != '') $maxRank = $first.$second;
}
$armsIds = [];
$armsScore = [];
$armsStrong = [];
......@@ -342,8 +343,8 @@ class CardController extends Controller
if(!$info) return redirect(route('index'));
$serverName = '';
if($info->server_name != ''){
$serverName = str_replace('硬核-','',$info->server_name);
$serverName = str_replace('硬核-','',$serverName);
$serverName = str_replace('硬核-','',$info->server_name);
$serverName = str_replace('硬核-','',$serverName);
$serverName = str_replace('越狱-','',$serverName);
}
......@@ -393,9 +394,7 @@ class CardController extends Controller
$data['ybImg'] = 'img-C';
}
$data['rank'] = '青铜5';
$rank = explode('-',$info->max_rank);
if(!empty($rank)) $data['rank'] = empty($rank[0]) ? '青铜5' : $rank[0];
$data['rank'] = $info->max_rank ?? '';
if(!empty($armsScore)){
$armsScoreNum = '00000';
if(strlen($armsScore[0]['score']) == 1) $armsScoreNum = '0000'.(string)$armsScore[0]['score'];
......
......@@ -135,4 +135,6 @@ return [
'WX_APPID' => 'wx2db57391553aa064',
'WX_AppSecret' => 'f6d533f6d0851c629da52cd10fab910b',
'rank' => [1=>'青铜',2=>'白银',3=>'黄金',4=>'铂金',5=>'钻石',6=>'最强王者']
];
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment