From f068586f74b698fcb56ed3f46ec84c293e8fbf29 Mon Sep 17 00:00:00 2001 From: hide_d Date: Mon, 30 Jul 2018 02:00:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=8F=84=EB=A5=BC=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/js/map.js | 31 ------------------------------- hwe/js/map/theme_che.js | 17 +++++++++++++++++ hwe/js/map/theme_ludo_rathowm.js | 19 ++++++++++++++++++- hwe/js/map/theme_miniche.js | 17 +++++++++++++++++ hwe/sammo/ResetHelper.php | 6 +++++- hwe/templates/base_map.orig.js | 17 +++++++++++++++++ 6 files changed, 74 insertions(+), 33 deletions(-) diff --git a/hwe/js/map.js b/hwe/js/map.js index ef47e077..1e15b552 100644 --- a/hwe/js/map.js +++ b/hwe/js/map.js @@ -143,37 +143,6 @@ function reloadWorldMap(option){ var myCity = obj.myCity; var myNation = obj.myNation; - function formatCityInfo(city) { - var region_str = ''; - var level_str = ''; - switch(city.region) { - case 1: region_str = "【하북|"; break; - case 2: region_str = "【중원|"; break; - case 3: region_str = "【서북|"; break; - case 4: region_str = "【서촉|"; break; - case 5: region_str = "【남중|"; break; - case 6: region_str = "【　초|"; break; - case 7: region_str = "【오월|"; break; - case 8: region_str = "【동이|"; break; - } - - switch(city.level) { - case 1: level_str = "수】"; break; - case 2: level_str = "진】"; break; - case 3: level_str = "관】"; break; - case 4: level_str = "이】"; break; - case 5: level_str = "소】"; break; - case 6: level_str = "중】"; break; - case 7: level_str = "대】"; break; - case 8: level_str = "특】"; break; - } - - city.text = region_str + level_str + city.name; - city.region_str = region_str; - city.level_str = level_str; - - return city; - } function mergePositionInfo(city){ var id = city.id; diff --git a/hwe/js/map/theme_che.js b/hwe/js/map/theme_che.js index c02cb1a3..3b898639 100644 --- a/hwe/js/map/theme_che.js +++ b/hwe/js/map/theme_che.js @@ -2,4 +2,21 @@ function getCityPosition(){ return {"1":["업",345,130],"2":["허창",330,215],"3":["낙양",275,180],"4":["장안",145,165],"5":["성도",25,290],"6":["양양",255,290],"7":["건업",505,305],"8":["북평",465,65],"9":["남피",395,95],"10":["완",270,235],"11":["수춘",395,270],"12":["서주",440,250],"13":["강릉",245,335],"14":["장사",255,375],"15":["시상",360,360],"16":["위례",620,145],"17":["계",365,35],"18":["복양",410,170],"19":["진류",365,185],"20":["여남",330,260],"21":["하비",480,235],"22":["서량",25,50],"23":["하내",230,150],"24":["한중",135,205],"25":["상용",185,225],"26":["덕양",85,275],"27":["강주",70,310],"28":["건녕",80,400],"29":["남해",245,480],"30":["계양",230,400],"31":["오",510,345],"32":["평양",590,100],"33":["사비",605,205],"34":["계림",655,200],"35":["진양",295,60],"36":["평원",440,115],"37":["북해",470,155],"38":["초",365,230],"39":["패",430,220],"40":["천수",70,105],"41":["안정",95,145],"42":["홍농",210,175],"43":["하변",45,190],"44":["자동",75,245],"45":["영안",115,295],"46":["귀양",90,360],"47":["주시",30,345],"48":["운남",30,415],"49":["남영",135,405],"50":["교지",130,480],"51":["신야",250,260],"52":["강하",315,295],"53":["무릉",195,355],"54":["영릉",190,395],"55":["상동",210,435],"56":["여강",380,315],"57":["회계",480,395],"58":["고창",350,405],"59":["대",450,480],"60":["안평",530,80],"61":["졸본",570,65],"62":["이도",680,260],"63":["강",95,35],"64":["저",25,120],"65":["흉노",180,95],"66":["남만",80,455],"67":["산월",425,430],"68":["오환",610,20],"69":["왜",680,320],"70":["호관",285,140],"71":["호로",285,205],"72":["사곡",240,175],"73":["함곡",180,175],"74":["사수",310,185],"75":["양평",90,220],"76":["가맹",45,225],"77":["역경",410,65],"78":["계교",405,135],"79":["동황",515,145],"80":["관도",340,165],"81":["정도",400,210],"82":["합비",435,285],"83":["광릉",490,275],"84":["적도",130,75],"85":["가정",40,160],"86":["기산",110,180],"87":["면죽",35,255],"88":["이릉",215,295],"89":["장판",280,315],"90":["백랑",530,30],"91":["적벽",330,325],"92":["파양",430,350],"93":["탐라",605,260],"94":["유구",625,435]}; +} + +function formatCityInfo(city) { + + + var regionMap = {"하북":1,"1":"하북","중원":2,"2":"중원","서북":3,"3":"서북","서촉":4,"4":"서촉","남중":5,"5":"남중","초":6,"6":"초","오월":7,"7":"오월","동이":8,"8":"동이"}; + + var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"}; + + var region_str = regionMap[city.region]; + var level_str = levelMap[city.level]; + + city.text = region_str + level_str + city.name; + city.region_str = region_str; + city.level_str = level_str; + + return city; } \ No newline at end of file diff --git a/hwe/js/map/theme_ludo_rathowm.js b/hwe/js/map/theme_ludo_rathowm.js index 9e816dd2..339b636c 100644 --- a/hwe/js/map/theme_ludo_rathowm.js +++ b/hwe/js/map/theme_ludo_rathowm.js @@ -1,5 +1,22 @@ function getCityPosition(){ - return {"1":["구 마왕성",120,120],"2":["악의 탑",100,60],"3":["실키의 성",50,240],"4":["카스케도바우",140,300],"5":["붉은 집",115,335],"6":["케셀링크의 성",175,340],"7":["케이브리스의 성",90,385],"8":["푸른 집",125,450],"9":["한탄의 협곡",150,143],"10":["뼈의 숲",200,370],"11":["유황의 숲",140,220],"12":["카미라의 성",185,450],"13":["메이드의 묘지",140,375],"14":["갈라놓은 숲",230,450],"15":["죽음의 대지",30,350],"16":["녹의 마을",230,275],"17":["펜실 카우",305,265],"18":["샹그릴라",380,270],"19":["파리티라온",270,325],"20":["왕자의 탑",300,350],"21":["도약의 탑",290,380],"22":["일요일의 탑",345,350],"23":["탄창의 탑",350,390],"24":["라그나로크 아크",320,365],"25":["알텐누",300,430],"26":["마크",335,415],"27":["호박성",340,450],"28":["올드제스",375,420],"29":["테이브",390,385],"30":["이탈리아",375,350],"31":["나가르모르",335,310],"32":["사바사바",400,310],"33":["아담의탑",430,330],"34":["마지노 A",248,356],"35":["마지노 B",280,455],"36":["이코마",235,90],"37":["워크랜드",210,110],"38":["로렌그라드",230,160],"39":["파르나스",255,180],"40":["라보리",255,220],"41":["랑그바우",300,160],"42":["거대전함",320,75],"43":["세미타포",295,195],"44":["스도리 17",305,225],"45":["스도리 13",365,230],"46":["마이크로그라드",335,195],"47":["폰",370,200],"48":["파스",335,135],"49":["큐로브",370,135],"50":["스도리 10",360,160],"51":["소로토이",400,150],"52":["로제스그라드",415,175],"53":["코사크",420,210],"54":["아크그라드",450,190],"55":["야크트크",455,150],"56":["시베리아",410,100],"57":["바바로프스",430,125],"58":["호라가의 탑",545,50],"59":["고라크",475,175],"60":["블라디보스토크",495,125],"61":["보르고 Z",440,250],"62":["로그 A",510,190],"63":["로그 B",475,225],"64":["반리요새 A",195,35],"65":["반리요새 B",185,160],"66":["파라파라성채",455,310],"67":["릿치",480,285],"68":["푸아",520,285],"69":["마우네스",505,250],"70":["스케일",530,215],"71":["아란",575,170],"72":["떨어진 궁도",580,130],"73":["포나라",610,185],"74":["브리테리아",575,220],"75":["파란치",635,240],"76":["노스",550,260],"77":["오크",560,295],"78":["리자스성",590,250],"79":["사우스",590,290],"80":["이스",620,270],"81":["오크스",625,305],"82":["웨스",605,215],"83":["오슈",665,320],"84":["오와리",645,380],"85":["모로코",600,415],"86":["지오",555,325],"87":["한나",600,335],"88":["M랜드",575,360],"89":["포르투갈",585,390],"90":["투신도시",540,395],"91":["화성",490,450],"92":["커스텀",490,405],"93":["라지르",510,345],"94":["록아스",475,335],"95":["지브테리아",445,360],"96":["파란쵸 왕국",525,425],"97":["아이스",485,370],"98":["렛드",535,360],"99":["카이즈",435,390]}; + return {"1":["구 마왕성",120,120],"2":["악의 탑",100,60],"3":["실키의 성",50,240],"4":["카스케도바우",140,300],"5":["붉은 집",115,335],"6":["케셀링크의 성",175,340],"7":["케이브리스의 성",90,385],"8":["푸른 집",125,450],"9":["한탄의 협곡",150,143],"10":["뼈의 숲",200,370],"11":["유황의 숲",140,220],"12":["카미라의 성",185,450],"13":["메이드의 묘지",140,375],"14":["갈라놓은 숲",230,450],"15":["죽음의 대지",30,350],"16":["녹의 마을",230,275],"17":["펜실 카우",305,265],"18":["샹그릴라",380,270],"19":["파리티라온",270,325],"20":["왕자의 탑",300,350],"21":["도약의 탑",290,380],"22":["일요일의 탑",345,350],"23":["탄창의 탑",350,390],"24":["라그나로크 아크",320,365],"25":["알텐누",300,430],"26":["마크",335,415],"27":["호박성",340,450],"28":["올드제스",375,420],"29":["테이브",390,385],"30":["이탈리아",375,350],"31":["나가르모르",335,310],"32":["사바사바",400,310],"33":["아담의탑",430,330],"34":["마지노 A",248,356],"35":["마지노 B",280,455],"36":["이코마",345,90],"37":["워크랜드",210,120],"38":["로렌그라드",230,160],"39":["파르나스",255,180],"40":["라보리",255,220],"41":["랑그바우",300,160],"42":["거대전함",320,80],"43":["세미타포",295,195],"44":["스도리 17",305,225],"45":["스도리 13",365,230],"46":["마이크로그라드",335,195],"47":["폰",370,200],"48":["파스",335,135],"49":["큐로브",370,135],"50":["스도리 10",360,160],"51":["소로토이",400,150],"52":["로제스그라드",415,175],"53":["코사크",420,210],"54":["아크그라드",450,190],"55":["야크트크",455,150],"56":["시베리아",410,100],"57":["바바로프스",430,125],"58":["호라가의 탑",545,50],"59":["고라크",475,175],"60":["블라디보스토크",495,125],"61":["보르고 Z",440,250],"62":["로그 A",510,190],"63":["로그 B",475,225],"64":["반리요새 A",195,35],"65":["반리요새 B",185,160],"66":["파라파라성채",455,310],"67":["릿치",480,285],"68":["푸아",520,285],"69":["마우네스",505,250],"70":["스케일",530,215],"71":["아란",575,170],"72":["떨어진 궁도",580,130],"73":["포나라",610,185],"74":["브리테리아",575,220],"75":["파란치",635,240],"76":["노스",550,260],"77":["오크",560,295],"78":["리자스성",590,250],"79":["사우스",590,290],"80":["이스",620,270],"81":["오크스",625,305],"82":["웨스",605,215],"83":["오슈",665,320],"84":["오와리",645,380],"85":["모로코",600,415],"86":["지오",555,325],"87":["한나",600,335],"88":["M랜드",575,360],"89":["포르투갈",585,390],"90":["투신도시",540,395],"91":["화성",490,450],"92":["커스텀",490,405],"93":["라지르",510,345],"94":["록아스",475,335],"95":["지브테리아",445,360],"96":["파란쵸 왕국",525,425],"97":["아이스",485,370],"98":["렛드",535,360],"99":["카이즈",435,390]}; +} + +function formatCityInfo(city) { + + + var regionMap = {"호넷 마인령":1,"1":"호넷 마인령","케이브리스 마인령":2,"2":"케이브리스 마인령","카라의 숲":3,"3":"카라의 숲","샹그릴라":4,"4":"샹그릴라","제스 북부":5,"5":"제스 북부","제스 남부":6,"6":"제스 남부","헬만 서부":7,"7":"헬만 서부","헬만 동부":8,"8":"헬만 동부","리자스 남부":9,"9":"리자스 남부","리자스 북부":10,"10":"리자스 북부","JAPAN":11,"11":"JAPAN","자유도시 동부":12,"12":"자유도시 동부","자유도시 서부":13,"13":"자유도시 서부","AL교":14,"14":"AL교"}; + + var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"}; + + var region_str = regionMap[city.region]; + var level_str = levelMap[city.level]; + + city.text = region_str + level_str + city.name; + city.region_str = region_str; + city.level_str = level_str; + + return city; } \ No newline at end of file diff --git a/hwe/js/map/theme_miniche.js b/hwe/js/map/theme_miniche.js index eaaa0bd6..42ee1f02 100644 --- a/hwe/js/map/theme_miniche.js +++ b/hwe/js/map/theme_miniche.js @@ -2,4 +2,21 @@ function getCityPosition(){ return {"1":["낙양",285,176],"2":["성도",30,285],"3":["건업",507,303],"4":["업",355,135],"5":["장안",162,173],"6":["허창",325,218],"7":["양양",259,295],"8":["시상",357,357],"9":["수춘",385,270],"10":["한중",130,218],"11":["남피",410,93],"12":["위례",618,140],"13":["북평",442,53],"14":["강릉",245,330],"15":["완",275,235],"16":["장사",258,373],"17":["오",515,340],"18":["하비",460,240],"19":["복양",412,170],"20":["웅진",615,205],"21":["강주",75,305],"22":["무도",55,191],"23":["국내",596,48],"24":["진류",370,175],"25":["계양",242,408],"26":["계림",660,195],"27":["계",386,55],"28":["무위",56,76],"29":["제남",402,132],"30":["남해",270,474],"31":["덕양",73,276],"32":["하내",295,140],"33":["상용",190,220],"34":["초",375,225],"35":["운남",45,405],"36":["대",450,470],"37":["하동",240,140],"38":["무릉",195,352],"39":["교지",136,480],"40":["단양",440,350],"41":["영안",116,282],"42":["북해",470,150],"43":["합비",420,294],"44":["이릉",188,275],"45":["건녕",85,390],"46":["강하",320,299],"47":["진양",310,75],"48":["평원",445,110],"49":["회계",485,390],"50":["천수",76,140],"51":["평양",606,97],"52":["요동",549,26],"53":["거록",355,95],"54":["여강",392,325],"55":["패",425,210],"56":["자동",62,240],"57":["광릉",478,270],"58":["장가",136,395],"59":["영릉",197,390],"60":["월수",39,349],"61":["건안",440,420],"62":["신야",245,255],"63":["탐라",614,259],"64":["상동",285,405],"65":["안정",135,130],"66":["여남",335,255],"67":["홍농",220,170],"68":["주제",93,357],"69":["남만",90,454],"70":["산월",373,447],"71":["오환",628,19],"72":["강",154,70],"73":["왜",681,292],"74":["흉노",227,79],"75":["저",24,123],"76":["호로",317,182],"77":["오장원",104,175],"78":["적벽",335,330]}; +} + +function formatCityInfo(city) { + + + var regionMap = {"하북":1,"1":"하북","중원":2,"2":"중원","서북":3,"3":"서북","서촉":4,"4":"서촉","남중":5,"5":"남중","초":6,"6":"초","오월":7,"7":"오월","동이":8,"8":"동이"}; + + var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"}; + + var region_str = regionMap[city.region]; + var level_str = levelMap[city.level]; + + city.text = region_str + level_str + city.name; + city.region_str = region_str; + city.level_str = level_str; + + return city; } \ No newline at end of file diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php index 1fbe4cb1..8b38c7d1 100644 --- a/hwe/sammo/ResetHelper.php +++ b/hwe/sammo/ResetHelper.php @@ -154,7 +154,11 @@ class ResetHelper{ Util::generateFileUsingSimpleTemplate( __dir__.'/../templates/base_map.orig.js', __dir__.'/../d_shared/base_map.js', - ['cityPosition'=>Json::encode($cityPositions)], + [ + 'cityPosition'=>Json::encode($cityPositions), + 'regionMap'=>Json::encode(CityConst::$regionMap), + 'levelMap'=>Json::encode(CityConst::$levelMap), + ], true ); diff --git a/hwe/templates/base_map.orig.js b/hwe/templates/base_map.orig.js index 41bda963..18338f21 100644 --- a/hwe/templates/base_map.orig.js +++ b/hwe/templates/base_map.orig.js @@ -2,4 +2,21 @@ function getCityPosition(){ return _tK_cityPosition_; +} + +function formatCityInfo(city) { + + + var regionMap = _tK_regionMap_; + + var levelMap = _tK_levelMap_; + + var region_str = regionMap[city.region]; + var level_str = levelMap[city.level]; + + city.text = region_str + level_str + city.name; + city.region_str = region_str; + city.level_str = level_str; + + return city; } \ No newline at end of file