새지도 이벤트 표시 추가

This commit is contained in:
2018-01-31 03:02:32 +09:00
parent ce0fab873b
commit e9828cd38e
4 changed files with 61 additions and 52 deletions
+6
View File
@@ -272,4 +272,10 @@
height:24px; height:24px;
left:4px; left:4px;
top:3px; top:3px;
}
.city_base .city_state{
position: absolute;
top:5px; /*TODO:도시 레벨 별로 다르게 위치 설정해볼 것*/
left:0;
} }
-1
View File
@@ -15,7 +15,6 @@
<div class="world_map map_detail"> <div class="world_map map_detail">
<div class="map_title"> <div class="map_title">
<span class="map_title_text"> <span class="map_title_text">
217年 2月
</span> </span>
</div> </div>
<div class="map_body"> <div class="map_body">
+39 -35
View File
@@ -6,7 +6,11 @@ String.prototype.format = function() {
}); });
}; };
function reloadWorldMap(isDetailMap, clickableAll, selectCallback){ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate){
if(!hrefTemplate){
hrefTemplate = '#';
}
var cityPosition = getCityPosition(); var cityPosition = getCityPosition();
@@ -202,31 +206,13 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){
var myCity = obj.myCity; var myCity = obj.myCity;
cityList.forEach(function(city){ cityList.forEach(function(city){
console.log(city);
var id = city.id; var id = city.id;
$('.city_base_{0}'.format(id)).detach(); $('.city_base_{0}'.format(id)).detach();
var flagTemplate = '<div class="map_flag"><div class="map_flag_capital"></div></div>'; //이전 도시는 지운다.
var stateTemplate = '<div class="map_state"></div>';
var backgroundTemplate = '<div class="map_background"></div>';
//TODO: 도시를 그린다.........
//
//도시 선택 크기는 동일하게 가고 도시 이미지는 div로 설정.
var $cityObj = $('<div class="city_base city_base_{0}"></div>'.format(id)); var $cityObj = $('<div class="city_base city_base_{0}"></div>'.format(id));
$cityObj.addClass('city_level_{0}'.format(city.level)); $cityObj.addClass('city_level_{0}'.format(city.level));
$cityObj.data('obj', city).css({'left':city.x-20,'top':city.y-15});
$cityObj.css({'left':city.x-20,'top':city.y-15});
var $linkObj = $('<a class="city_link" href="#"></a>');
$linkObj.data({'text':city.text,'nation':city.nation});
var $imgObj = $('<div class="city_img"><img src="/images/cast_{0}.gif"></div>'.format(city.level));
$cityObj.data('obj', city);
//$cityObj.append($bgObj);
//$cityObj.append($linkObj);
if('color' in city && city.color !== null){ if('color' in city && city.color !== null){
var $bgObj = $('<div class="city_bg"></div>'); var $bgObj = $('<div class="city_bg"></div>');
@@ -234,21 +220,23 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){
$bgObj.css({'background-image':'url(/images/b{0}.png)'.format(convColorValue(city.color))}); $bgObj.css({'background-image':'url(/images/b{0}.png)'.format(convColorValue(city.color))});
} }
if(city.state > 0){ var $linkObj = $('<a class="city_link"></a>');
var $imgObj = $('<img class="city_state" src="/images/state_{0}.gif">'.format(city.state)); $linkObj.data({'text':city.text,'nation':city.nation,'id':city.id});
}
$cityObj.append($linkObj); $cityObj.append($linkObj);
var $imgObj = $('<div class="city_img"><img src="/images/cast_{0}.gif"></div>'.format(city.level));
$linkObj.append($imgObj); $linkObj.append($imgObj);
$map_body.append($cityObj);
if(selectCallback){ if(city.state > 0){
$linkObj.click(function(){ var $stateObj = $('<div class="city_state"><img src="/images/event{0}.gif"></div>'.format(city.state));
selectCallback($cityObj); $linkObj.append($stateObj);
return false;
});
} }
$map_body.append($cityObj);
}); });
@@ -257,9 +245,6 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){
} }
function drawBasicWorldMap(obj){ function drawBasicWorldMap(obj){
return obj; return obj;
} }
@@ -294,6 +279,21 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback){
} }
function setCityClickable(obj){ function setCityClickable(obj){
obj.cityList.forEach(function(city){
var $cityLink = $world_map.find('.city_base_{0} .city_link'.format(city.id));
if('clickable' in city && city.clickable > 0){
$cityLink.attr('href',hrefTemplate.format(city.id));
}
if(selectCallback){
$cityLink.click(function(){
return selectCallback(city);
});
}
});
return obj; return obj;
} }
@@ -324,6 +324,10 @@ $(function(){
var isDetailMap = true; var isDetailMap = true;
var clickableAll = false; var clickableAll = false;
reloadWorldMap(isDetailMap, clickableAll, console.log); function tmp(a){
console.log(a);
return false;
}
reloadWorldMap(isDetailMap, clickableAll, tmp, 'goCity.php?id={0}');
}); });
+16 -16
View File
@@ -4,9 +4,9 @@
"year":217, "year":217,
"month":10, "month":10,
"cityList":[ "cityList":[
[1, 8, 0, 1, 1, 1], [1, 8, 41, 1, 1, 1],
[2, 8, 0, 2, 2, 1], [2, 8, 0, 2, 2, 1],
[3, 8, 0, 3, 2, 1], [3, 8, 42, 3, 2, 1],
[4, 8, 0, 0, 3, 1], [4, 8, 0, 0, 3, 1],
[5, 8, 0, 0, 4, 1], [5, 8, 0, 0, 4, 1],
[6, 8, 0, 0, 6, 1], [6, 8, 0, 0, 6, 1],
@@ -25,8 +25,8 @@
[19, 6, 0, 1, 2, 1], [19, 6, 0, 1, 2, 1],
[20, 6, 0, 2, 2, 1], [20, 6, 0, 2, 2, 1],
[21, 6, 0, 3, 2, 1], [21, 6, 0, 3, 2, 1],
[22, 6, 0, 0, 3, 1], [22, 6, 41, 0, 3, 1],
[23, 6, 0, 0, 3, 1], [23, 6, 42, 0, 3, 1],
[24, 6, 0, 0, 4, 1], [24, 6, 0, 0, 4, 1],
[25, 6, 0, 0, 4, 1], [25, 6, 0, 0, 4, 1],
[26, 6, 0, 0, 4, 1], [26, 6, 0, 0, 4, 1],
@@ -42,8 +42,8 @@
[36, 5, 0, 0, 1, 1], [36, 5, 0, 0, 1, 1],
[37, 5, 0, 1, 1, 1], [37, 5, 0, 1, 1, 1],
[38, 5, 0, 2, 2, 1], [38, 5, 0, 2, 2, 1],
[39, 5, 0, 3, 2, 1], [39, 5, 8, 3, 2, 1],
[40, 5, 0, 0, 3, 1], [40, 5, 34, 0, 3, 1],
[41, 5, 0, 0, 3, 1], [41, 5, 0, 0, 3, 1],
[42, 5, 0, 0, 3, 1], [42, 5, 0, 0, 3, 1],
[43, 5, 0, 0, 4, 1], [43, 5, 0, 0, 4, 1],
@@ -57,8 +57,8 @@
[51, 5, 0, 0, 6, 1], [51, 5, 0, 0, 6, 1],
[52, 5, 0, 0, 6, 1], [52, 5, 0, 0, 6, 1],
[53, 5, 0, 0, 6, 1], [53, 5, 0, 0, 6, 1],
[54, 5, 0, 0, 6, 1], [54, 5, 8, 0, 6, 1],
[55, 5, 0, 0, 6, 1], [55, 5, 34, 0, 6, 1],
[56, 5, 0, 0, 7, 1], [56, 5, 0, 0, 7, 1],
[57, 5, 0, 0, 7, 1], [57, 5, 0, 0, 7, 1],
[58, 5, 0, 0, 7, 1], [58, 5, 0, 0, 7, 1],
@@ -66,15 +66,15 @@
[60, 5, 0, 0, 8, 1], [60, 5, 0, 0, 8, 1],
[61, 5, 0, 0, 8, 1], [61, 5, 0, 0, 8, 1],
[62, 5, 0, 0, 8, 1], [62, 5, 0, 0, 8, 1],
[63, 4, 0, 0, 3, 1], [63, 4, 8, 0, 3, 1],
[64, 4, 0, 0, 3, 1], [64, 4, 34, 0, 3, 1],
[65, 4, 0, 1, 3, 1], [65, 4, 0, 1, 3, 1],
[66, 4, 0, 2, 5, 1], [66, 4, 0, 2, 5, 1],
[67, 4, 0, 3, 7, 1], [67, 4, 0, 3, 7, 1],
[68, 4, 0, 0, 8, 1], [68, 4, 0, 0, 8, 1],
[69, 4, 0, 0, 8, 1], [69, 4, 0, 0, 8, 1],
[70, 3, 0, 0, 1, 1], [70, 3, 8, 0, 1, 1],
[71, 3, 0, 1, 2, 1], [71, 3, 34, 1, 2, 1],
[72, 3, 0, 2, 3, 1], [72, 3, 0, 2, 3, 1],
[73, 3, 0, 3, 3, 1], [73, 3, 0, 3, 3, 1],
[74, 3, 0, 0, 2, 1], [74, 3, 0, 0, 2, 1],
@@ -91,12 +91,12 @@
[85, 2, 0, 0, 3, 1], [85, 2, 0, 0, 3, 1],
[86, 2, 0, 3, 4, 1], [86, 2, 0, 3, 4, 1],
[87, 3, 0, 3, 4, 1], [87, 3, 0, 3, 4, 1],
[88, 2, 0, 3, 6, 1], [88, 2, 8, 3, 6, 1],
[89, 2, 0, 3, 6, 1], [89, 2, 34, 3, 6, 1],
[90, 2, 0, 0, 8, 1], [90, 2, 0, 0, 8, 1],
[91, 1, 0, 0, 7, 1], [91, 1, 0, 0, 7, 1],
[92, 1, 0, 1, 7, 1], [92, 1, 8, 1, 7, 1],
[93, 1, 0, 2, 8, 1], [93, 1, 34, 2, 8, 1],
[94, 1, 0, 3, 8, 1] [94, 1, 0, 3, 8, 1]
], ],
"nationList":[ "nationList":[