Skip to content

Commit b9a765f

Browse files
committed
show evec zone tape in modal
1 parent 0f62e82 commit b9a765f

File tree

4 files changed

+38
-2
lines changed

4 files changed

+38
-2
lines changed

public/javascripts/line_judge.2020.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ app.controller('ModalInstanceCtrl', function ($scope, $uibModalInstance, $timeou
13301330
}else if(tile.evacExit>=0){
13311331
rot = tile.evacExit;
13321332
}
1333-
rot += $scope.$parent.sRotate;
1333+
rot += sRotate;
13341334
return rot%360;
13351335
}
13361336
$scope.next = [];

public/javascripts/line_sign.2020.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ app.controller('ModalInstanceCtrl', function ($scope, $uibModalInstance, mtile,
10041004
}else if(tile.evacExit>=0){
10051005
rot = tile.evacExit;
10061006
}
1007-
rot += $scope.$parent.sRotate;
1007+
rot += sRotate;
10081008
return rot%360;
10091009
}
10101010
$scope.next = [];

public/templates/line_judge_modal.html

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
77
<tr style="height:100px;">
88
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;">
99
<img ng-src="/images/tiles/{{nineTile[0].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[0].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[0]) || isStart(nineTile[0])}">
10+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[0])}}" ng-if="nineTile[0].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
11+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[0])}}" ng-if="nineTile[0].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
1012
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[0].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
1113
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[0].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
1214
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[0])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -15,6 +17,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
1517
</td>
1618
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;" ng-click="toggle_scored(next.top)">
1719
<img ng-src="/images/tiles/{{nineTile[1].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[1].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[1]) || isStart(nineTile[1])}">
20+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[1])}}" ng-if="nineTile[1].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
21+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[1])}}" ng-if="nineTile[1].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
1822
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[1].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
1923
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[1].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
2024
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[1])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -37,6 +41,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
3741
</td>
3842
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;">
3943
<img ng-src="/images/tiles/{{nineTile[2].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[2].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[2]) || isStart(nineTile[2])}">
44+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[2])}}" ng-if="nineTile[2].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
45+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[2])}}" ng-if="nineTile[2].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
4046
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[2].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
4147
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[2].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
4248
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[2])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -47,6 +53,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
4753
<tr style="height:100px;">
4854
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;" ng-click="toggle_scored(next.left)">
4955
<img ng-src="/images/tiles/{{nineTile[3].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[3].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[3]) || isStart(nineTile[3])}">
56+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[3])}}" ng-if="nineTile[3].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
57+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[3])}}" ng-if="nineTile[3].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
5058
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[3].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
5159
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[3].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
5260
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[3])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -69,6 +77,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
6977
</td>
7078
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;">
7179
<img ng-src="/images/tiles/{{nineTile[4].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[4].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[4]) || isStart(nineTile[4])}">
80+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[4])}}" ng-if="nineTile[4].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
81+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[4])}}" ng-if="nineTile[4].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
7282
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[4].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
7383
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[4].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
7484
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[4])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -77,6 +87,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
7787
</td>
7888
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;" ng-click="toggle_scored(next.right)">
7989
<img ng-src="/images/tiles/{{nineTile[5].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[5].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[5]) || isStart(nineTile[5])}">
90+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[5])}}" ng-if="nineTile[5].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
91+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[5])}}" ng-if="nineTile[5].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
8092
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[5].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
8193
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[5].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
8294
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[5])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -101,6 +113,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
101113
<tr style="height:100px;">
102114
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;">
103115
<img ng-src="/images/tiles/{{nineTile[6].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[6].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[6]) || isStart(nineTile[6])}">
116+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[6])}}" ng-if="nineTile[6].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
117+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[6])}}" ng-if="nineTile[6].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
104118
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[6].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
105119
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[6].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
106120
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[6])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -109,6 +123,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
109123
</td>
110124
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;" ng-click="toggle_scored(next.bottom)">
111125
<img ng-src="/images/tiles/{{nineTile[7].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[7].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[7]) || isStart(nineTile[7])}">
126+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[7])}}" ng-if="nineTile[7].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
127+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[7])}}" ng-if="nineTile[7].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
112128
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[7].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
113129
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[7].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
114130
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[7])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>
@@ -131,6 +147,8 @@ <h3 class="modal-title">{{'line.judge.m_score' | translate}}</h3>
131147
</td>
132148
<td width="100px" style="padding: 0px;position: relative;background-color: #e6e6e6;">
133149
<img ng-src="/images/tiles/{{nineTile[8].tileType.image}}" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto" class="rot{{tilerotate(nineTile[8].rot)}}" ng-class="{'drop-tile': isDropTile(nineTile[8]) || isStart(nineTile[8])}">
150+
<img ng-src="/images/tiles/ev-entrance.png" class="rot{{evacTapeRot(nineTile[8])}}" ng-if="nineTile[8].evacEntrance>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
151+
<img ng-src="/images/tiles/ev-exit.png" class="rot{{evacTapeRot(nineTile[8])}}" ng-if="nineTile[8].evacExit>=0" style="position:absolute;left: 0px; top: 0px;" width="100%" height="auto">
134152
<i class="fa fa-cube fa-fw fa-2x" ng-show="nineTile[8].items.obstacles>0" style="text-align:right; padding:1px 2px; color:#6e2c00; opacity:0.9; position:absolute;top:0px;"></i>
135153
<i class="fa fa-bars fa-fw fa-rotate-270 fa-2x" ng-show="nineTile[8].items.speedbumps>0" style=" padding:1px 2px; color:#abb2b9; opacity:0.9; position:absolute;top:5px;left:0px"></i>
136154
<i class="fa fa-play-circle-o fa-fw fa-2x" ng-show="isStart(nineTile[8])" style="padding:1px 2px; color:#73e673; opacity:0.9; position:absolute;top:5px;left:0px"></i>

0 commit comments

Comments
 (0)