devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

1차 버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-01-25 01:02:13 +09:00
parent 17daf67662
commit 02e37eaf88
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/css/msg.css
+2 -2
View File
@@ -60,11 +60,11 @@
} }
.diplomacy_message{ .diplomacy_message{
height:667px; flex: 1;
} }
.national_message{ .national_message{
flex: 1; height:667px;
} }
.private_message{ .private_message{
hwe/func.php
+1 -1
View File
@@ -400,7 +400,7 @@ function myNationInfo() {
} }
function checkSecretPermission($me){ function checkSecretPermission($me){
if(!key_exists($me['penalty']) || !key_exists($me['permission'])){ if(!key_exists('penalty', $me) || !key_exists('permission', $me)){
trigger_error ('canAccessSecret() 함수에 필요한 인자가 부족'); trigger_error ('canAccessSecret() 함수에 필요한 인자가 부족');
} }
$penalty = Json::decode($me['penalty'])??[]; $penalty = Json::decode($me['penalty'])??[];
hwe/func_template.php
+2 -2
View File
@@ -136,9 +136,9 @@ function commandButton() {
} }
$db = DB::db(); $db = DB::db();
$me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID); $me = $db->queryFirstRow("select no,nation,level,belong,permission,penalty from general where owner=%i", $userID);
$nation = $db->queryFirstRow("select permission,penalty,nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[ $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
'nation'=>0, 'nation'=>0,
'level'=>0, 'level'=>0,
'secretlimit'=>99, 'secretlimit'=>99,
hwe/j_basic_info.php
+1
View File
@@ -2,6 +2,7 @@
namespace sammo; namespace sammo;
include('lib.php'); include('lib.php');
include 'func.php';
$result = [ $result = [
"generalID"=>null, "generalID"=>null,
hwe/j_msg_get_recent.php
+2 -2
View File
@@ -90,7 +90,7 @@ $result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$min
$lastType = 'national'; $lastType = 'national';
} }
return $msg->toArray(); return $msg->toArray();
}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 40, $reqSequence)); }, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 20, $reqSequence));
$result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){ $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){
if($msg->id > $nextSequence){ if($msg->id > $nextSequence){
@@ -105,7 +105,7 @@ $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$min
$values['text'] = '(외교 문서입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함 $values['text'] = '(외교 문서입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
} }
return $values; return $values;
}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 40, $reqSequence)); }, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 20, $reqSequence));
if($lastType !== null){ if($lastType !== null){
array_pop($result[$lastType]); array_pop($result[$lastType]);