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

Scenario 초기화 버그 수정

Browse Source 
리셋 시 로그 초기화
This commit is contained in:
Hide_D
2018-03-31 19:42:16 +09:00
parent 8713bac296
commit 87c6130d17
4 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/sammo/Scenario.php
+8 -5
View File
@@ -31,6 +31,8 @@ class Scenario{
if($this->initOK){
return;
}
$this->initOK = true;
$data = $this->data;
$this->nations = [];
$this->nations[0] = new Scenario\Nation(0, '재야', '#ffffff', 0, 0);
@@ -96,7 +98,7 @@ class Scenario{
list(
$affinity, $name, $pictureID, $nationID, $locatedCity,
$leadership, $power, $intel, $birth, $death, $ego,
$leadership, $power, $intel, $level, $birth, $death, $ego,
$char, $text
) = $rawGeneral;
@@ -115,6 +117,7 @@ class Scenario{
$leadership,
$power,
$intel,
$level,
$birth,
$death,
$ego,
@@ -242,7 +245,7 @@ class Scenario{
continue;
}
$rawGeneral = $this->tmpGeneralQueue[$general->$name];
$rawGeneral = $this->tmpGeneralQueue[$general->name];
$birth = $general->birth;
if(!key_exists($birth, $remainGenerals)){
$remainGenerals[$birth] = [];
@@ -256,7 +259,7 @@ class Scenario{
continue;
}
$rawGeneral = $this->tmpGeneralQueue[$general->$name];
$rawGeneral = $this->tmpGeneralQueue[$general->name];
$birth = $general->birth;
if(!key_exists($birth, $remainGenerals)){
$remainGenerals[$birth] = [];
@@ -282,7 +285,7 @@ class Scenario{
public function build($env=[]){
$this->initFull();
//NOTE: 초기화가 되어있다고 가정함.
/*
@@ -325,7 +328,7 @@ class Scenario{
$events = array_map(function($rawEvent){
return [
'cond'=>Json::encode($rawEvent['cond']),
'condition'=>Json::encode($rawEvent['cond']),
'action'=>Json::encode($rawEvent['action'])
];
}, $this->events);