YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-10-29 14:38:11 +08:00
parent 02f0c966c5 61a2484b0a
commit c787abbcdf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/api/model/Room.php
View File

@@ -727,6 +727,7 @@ class Room extends Model
if($is_pk){ if($is_pk){
$pk_info['pk_room_id'] = $is_pk['room_id_b'];//对方房间id $pk_info['pk_room_id'] = $is_pk['room_id_b'];//对方房间id
$pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];//发起pk用户id $pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];//发起pk用户id
$pk_info['receive_pk_user_id'] = $is_pk['receive_user_id'];//接受者用户id
$pk_info['pk_id'] = $is_pk['pk_id'];//pkid $pk_info['pk_id'] = $is_pk['pk_id'];//pkid
$pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;//pk结束时间 $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;//pk结束时间
$pk_info['my_room_value'] = $is_pk['create_value_a'];//自己房间的值 $pk_info['my_room_value'] = $is_pk['create_value_a'];//自己房间的值
@@ -755,6 +756,7 @@ class Room extends Model
if($is_pk){ if($is_pk){
$pk_info['pk_room_id'] = $is_pk['room_id_a']; $pk_info['pk_room_id'] = $is_pk['room_id_a'];
$pk_info['invite_pk_user_id'] = $is_pk['create_user_id']; $pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];
$pk_info['receive_pk_user_id'] = $is_pk['receive_user_id'];//接受者用户id
$pk_info['pk_id'] = $is_pk['pk_id']; $pk_info['pk_id'] = $is_pk['pk_id'];
$pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60; $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;
$pk_info['my_room_value'] = $is_pk['receive_value_b']; $pk_info['my_room_value'] = $is_pk['receive_value_b'];
@@ -1914,6 +1916,7 @@ class Room extends Model
if($is_pk){ if($is_pk){
$pk_info['pk_room_id'] = $is_pk['room_id_b'];//对方房间id $pk_info['pk_room_id'] = $is_pk['room_id_b'];//对方房间id
$pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];//发起pk用户id $pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];//发起pk用户id
$pk_info['receive_pk_user_id'] = $is_pk['receive_user_id'];//接受者用户id
$pk_info['pk_id'] = $is_pk['pk_id'];//pkid $pk_info['pk_id'] = $is_pk['pk_id'];//pkid
$pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;//pk结束时间 $pk_info['pk_end_times'] = $is_pk['start_time'] + $is_pk['pk_times'] * 60;//pk结束时间
$pk_info['my_room_value'] = $is_pk['create_value_a'];//自己房间的值 $pk_info['my_room_value'] = $is_pk['create_value_a'];//自己房间的值
@@ -1942,6 +1945,7 @@ class Room extends Model
if($is_pk){ if($is_pk){
$pk_info['pk_room_id'] = $is_pk['room_id_a']; $pk_info['pk_room_id'] = $is_pk['room_id_a'];
$pk_info['invite_pk_user_id'] = $is_pk['create_user_id']; $pk_info['invite_pk_user_id'] = $is_pk['create_user_id'];
$pk_info['receive_pk_user_id'] = $is_pk['receive_user_id'];//接受者用户id
$pk_info['pk_id'] = $is_pk['pk_id']; $pk_info['pk_id'] = $is_pk['pk_id'];
$pk_info['my_room_value'] = $is_pk['receive_value_b']; $pk_info['my_room_value'] = $is_pk['receive_value_b'];
$pk_info['pk_room_value'] = $is_pk['create_value_a']; $pk_info['pk_room_value'] = $is_pk['create_value_a'];