From 6052b3c577b457d13059f6fc799fa9bfd4e1c58e Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 10 Feb 2018 23:49:43 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=98=88?= =?UTF-8?q?=EC=A0=9C=20=EC=B4=88=EA=B8=B0=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A4=80=EB=B9=84=20=EC=98=88=EC=A0=9C=EC=9A=A9=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80=20fresh=5Fresult.json?= =?UTF-8?q?=EC=97=90=20=EA=B0=A0=EB=A9=94,=20=EC=A0=84=EB=A9=94,=20?= =?UTF-8?q?=EA=B5=AD=EB=A9=94,=20=EC=99=B8=EA=B5=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tmp_map/default.jpg | Bin 0 -> 1412 bytes tmp_map/pic_1.jpg | Bin 0 -> 5541 bytes tmp_map/pic_781.jpg | Bin 0 -> 6972 bytes tmp_msg/fresh_result.json | 378 +++++++++++++++++++++++++++- tmp_msg/msg.js | 6 +- tmp_msg/tmp_template.html | 6 +- tmp_msg/update_national_result.json | 2 +- tmp_msg/update_private_result.json | 2 +- tmp_msg/update_public_result.json | 5 +- 9 files changed, 387 insertions(+), 12 deletions(-) create mode 100644 tmp_map/default.jpg create mode 100644 tmp_map/pic_1.jpg create mode 100644 tmp_map/pic_781.jpg diff --git a/tmp_map/default.jpg b/tmp_map/default.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c7f7631cf8fc810b30d9c93a2c70510b5a2aa42f GIT binary patch literal 1412 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 z zPTpL+TT8N(UQ?4|a{Bi9bCtVO;&*R@J?taVH+F(o@kD7Zzi*fZ<(r!ddwT}TrZrU* z?NIlfghs-wYS4&KRfEco(b@33EQn1u-Zx&is2!DwW&87dnY~XOs4NQGe(vQ@ zRr6Ykl@f?CSuVY4`)+cbx@LVf%1aNoUDzrKsNv*Ac)e$`KBTEin7TEf@7uDY$0vuY z>l=znOU1ITbiSX;x)EuU5mT!nhCKr!gu^r%S%*gmB03`N`T_GFeZEY91qiuCO;(6d zd-W~y_cWWCXh-RiN~7cYhC0HQDh1Xi1MaCV6BbvIMP z*OFL%`~nVcyo$L^1@KWU-bVg|!q)Gyn66&yLcBhq@J{c1Mg7zSkoa0kbZAh&^7cW3 zI(w&=tXYsArF~^hIR?&sy4grn?f&Bzk*9PUYx%A{IP$dX&}z2aFE`7%b55gm=ttzL zoVL-MpTh#5kTvBDH_c2-UTg6^dUG^B^48l1;)(RsJ=!+CHb1UaoRmz=b?nvlug5j% zJS8mbb-Ez&JY?0@{xi=NaJSF2UerRhgn4d2%fP_{cjp`HRt**E_3bpis%0Jifrk_4 z-r4A_oX#dhS_kP?uLTx7rFOL~v|btx*Z0ndRc7bPfw)gIpH_+Hz2lV``+R;CDDLa% ziMsbBzk7s5X28r~Y;t~hY68^TF{;gXDnsrM**(h7;j!HjU*o>;RdHR`my|O7gR;O| z#FNr}BW7B$7(2`y6{0!WFY5M?lhb7iJd+z3g<4s&$$7`ATzD?ee>m}6w~9r1qE^>e z_6@vX0`GiaqJdqQV5d#s>M z|9DgZ_w~xKhIQd)-`(IGh)yn{!R_WeiPvWpMp0_J2j<;UI_`! zo;af}F|P=U+o$IpaSA&Bbag;J%u#z*-e6}FZDy16rJ$dZ{K>%V)t*6WPoM$pn+9aU z_nt_HZRsVzbga&UK#1l}WeHS_x$AtYSt~Vg`m0bG-l^Cl@D+te=A!6_zWMDNh=2{$ z7IyDmDUDkJRGCA>?*^8nUdSF@z+3W*FaquKWNv z5Jn95SlwYdEO)eNO5-NeuuAt}ZtL`kdGnu6$ppoPwzF=Eil5897yih~5%GTFtJxgC zqn~sH{a`bO3Mk!~CWRFAS*_m9ZTFa~Ks8UFigsz{(SGs}YC7)IEUcouF48h)Wn}uc zDS|XATVHy8?;dlf#bB$j3P)R|qc+V1Wq6>GPh46&wKwp{yvYple75P-K}Ej!wAkV( zmJ~;%`i@Ocu-_Ru*Yp_Iz3>F6NmH?ZEzs^;0(mycH1qS$1ekv=6O2W()p+LLV~G;& z;-8C)y%hCJfo&0=Jv|k=Uq)U8H+D>L94~XnJWkF>KmdB~kA@#OLyb{Et4B_Mq&p3w zU#~w9&~??b&YzD9mb@4=+c#!dWDVa|RdOr&dNUaDaCJ$)uBg;sY0tU)PZSB6L5Ppf zOqE>_CjF!X64|^5S42OFs5kldc8CpV3f3Fj=fzlMeKZ+PaHo_F{)#PekfJ9IP2Ldzq5Vq2S<^ zC@Z-N9&WE{tQ%c^zerxRSY4^^nLed|pnUsI#c}HbceB{HW@<<|wS=o~JkRpq#B-F-x(O1_a++FqJxxModr}@w`d8X` MMBivw?4%C<7h94-r2qf` literal 0 HcmV?d00001 diff --git a/tmp_map/pic_781.jpg b/tmp_map/pic_781.jpg new file mode 100644 index 0000000000000000000000000000000000000000..da02ef4041c55de1a38031906d1459d168851a8d GIT binary patch literal 6972 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재야" + },{ + "id":1005, + "time":"2018-02-10 22:05:05", + "isSender":true, + "src":{ + "id":11, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":9002, + "nation_id":2, + "nation":"연구소2", + "color":"#ff0000" + }, + "text":"아국->타국" + },{ + "id":1004, + "time":"2018-02-10 22:05:04", + "isSender":false, + "src":{ + "id":21, + "nation_id":2, + "name":"Hide_Dx2", + "nation":"연구소2", + "color":"#ff0000" + }, + "dest":{ + "id":9001, + "nation_id":1, + "nation":"연구소", + "color":"#ffd700" + }, + "text":"타국->아국" + },{ + "id":1003, + "time":"2018-02-10 22:05:03", + "isSender":false, + "src":{ + "id":12, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":9001, + "nation_id":1, + "nation":"연구소", + "color":"#ffd700" + }, + "text":"에붸붸붸3" + },{ + "id":1002, + "time":"2018-02-10 22:05:02", + "isSender":false, + "src":{ + "id":12, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":9001, + "nation_id":1, + "nation":"연구소", + "color":"#ffd700" + }, + "text":"에붸붸붸2" + },{ + "id":1001, + "time":"2018-02-10 22:05:01", + "isSender":false, + "src":{ + "id":12, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":9001, + "nation_id":1, + "nation":"연구소", + "color":"#ffd700" + }, + "text":"에붸붸붸1" + }, + { + "id":1000, + "time":"2018-02-10 22:04:00", + "isSender":false, + "src":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":9001, + "nation_id":1, + "nation":"연구소", + "color":"#ffd700" + }, + "text":"에붸붸붸0" + } ], "public":[ - + + { + "id":1012, + "time":"2018-02-10 22:05:01", + "isSender":false, + "src":{ + "id":21, + "nation_id":0, + "name":"Hide_Dy" + }, + "dest":{ + "id":9999 + }, + "text":"전메놀이2, 재야" + },{ + "id":1011, + "time":"2018-02-10 22:05:01", + "isSender":false, + "src":{ + "id":21, + "nation_id":2, + "name":"Hide_Dx2", + "nation":"연구소2", + "color":"#ff0000", + "icon":"pic_781.jpg" + }, + "dest":{ + "id":9999 + }, + "text":"전메놀이1" + },{ + "id":1010, + "time":"2018-02-10 22:05:00", + "isSender":false, + "src":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":9999 + }, + "text":"전메놀이0" + } ], "private":[ - + { + "id":1025, + "time":"2018-02-10 22:04:04", + "isSender":false, + "src":{ + "id":21, + "nation_id":2, + "name":"Hide_Dx2", + "nation":"연구소2", + "color":"#ff0000" + }, + "dest":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "text":"연구소2로 망명 권유 서신", + "option":{ + "used":false, + "action":"scout" + } + },{ + "id":1024, + "time":"2018-02-10 22:04:04", + "isSender":false, + "src":{ + "id":12, + "nation_id":0, + "name":"Hide_Dy" + }, + "dest":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "text":"재야로부터 갠메(수신)" + },{ + "id":1023, + "time":"2018-02-10 22:04:03", + "isSender":true, + "src":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":21, + "nation_id":2, + "name":"Hide_Dx2", + "nation":"연구소2", + "color":"#ff0000" + }, + "text":"타국 갠메(송신)" + },{ + "id":1022, + "time":"2018-02-10 22:04:02", + "isSender":true, + "src":{ + "id":12, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "text":"아국 갠메(수신)" + },{ + "id":1021, + "time":"2018-02-10 22:04:01", + "isSender":true, + "src":{ + "id":12, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "text":"아국 갠메(수신)" + },{ + "id":1020, + "time":"2018-02-10 22:04:00", + "isSender":true, + "src":{ + "id":11, + "nation_id":1, + "name":"Hide_D", + "nation":"연구소", + "color":"#ffd700" + }, + "dest":{ + "id":12, + "nation_id":1, + "name":"Hide_D2", + "nation":"연구소", + "color":"#ffd700" + }, + "text":"아국 갠메" + } ], "diplomacy":[ - + { + "id":1030, + "time":"2018-02-10 22:05:04", + "isSender":false, + "src":{ + "id":21, + "nation_id":2, + "name":"Hide_Dx2", + "nation":"연구소2", + "color":"#ff0000", + "icon":"pic_1.jpg" + }, + "dest":{ + "id":9001, + "nation_id":1, + "nation":"연구소", + "color":"#ffd700" + }, + "text":"타국->아국", + "option":{ + "used":false, + "result":false, + "until":[210, 9], + "action":"ally", + "allyYear":20, + "allyText":"메롱" + } + } ] } \ No newline at end of file diff --git a/tmp_msg/msg.js b/tmp_msg/msg.js index 9ea064cb..58098c23 100644 --- a/tmp_msg/msg.js +++ b/tmp_msg/msg.js @@ -34,7 +34,11 @@ var messageTemplate = ` ▶ <%e(dest.name)%>:<%e(dest.nation)%> ] - <%} else if(msgType == 'national') {%> + <%} else if(msgType == 'national' && src.nation_id == dest.nation_id){%> + [ + <%e(src.name)%>:<%e(src.nation)%> + ] + <%} else if(msgType == 'national' || msgType == 'diplomacy'){%> [ <%e(src.name)%>:<%e(src.nation)%> ▶ diff --git a/tmp_msg/tmp_template.html b/tmp_msg/tmp_template.html index dded576a..0608ca6f 100644 --- a/tmp_msg/tmp_template.html +++ b/tmp_msg/tmp_template.html @@ -30,7 +30,11 @@ ▶ <%e(dest.name)%>:<%e(dest.nation)%> ] - <%} else if(msgType == 'national') {%> + <%} else if(msgType == 'national' && src.nation_id == dest.nation_id){%> + [ + <%e(src.name)%>:<%e(src.nation)%> + ] + <%} else if(msgType == 'national' || msgType == 'diplomacy'){%> [ <%e(src.name)%>:<%e(src.nation)%> ▶ diff --git a/tmp_msg/update_national_result.json b/tmp_msg/update_national_result.json index e4c19b01..1547750c 100644 --- a/tmp_msg/update_national_result.json +++ b/tmp_msg/update_national_result.json @@ -1,6 +1,6 @@ { "result":true, - "server-uuid":"twe-d1af658a-f094-4303-9496-9a27a8180b0b", + "server":"d1af658a-f094-4303-9496-9a27a8180b0b", "sequence":1357, "national":[ diff --git a/tmp_msg/update_private_result.json b/tmp_msg/update_private_result.json index fc6906fb..29182742 100644 --- a/tmp_msg/update_private_result.json +++ b/tmp_msg/update_private_result.json @@ -1,6 +1,6 @@ { "result":true, - "server-uuid":"twe-d1af658a-f094-4303-9496-9a27a8180b0b", + "server":"d1af658a-f094-4303-9496-9a27a8180b0b", "sequence":1366, "national":[ diff --git a/tmp_msg/update_public_result.json b/tmp_msg/update_public_result.json index c50cf395..7ab665be 100644 --- a/tmp_msg/update_public_result.json +++ b/tmp_msg/update_public_result.json @@ -1,12 +1,11 @@ { "result":true, - "server-uuid":"twe-d1af658a-f094-4303-9496-9a27a8180b0b", + "server":"d1af658a-f094-4303-9496-9a27a8180b0b", "sequence":1811, "national":[ - + ], "public":[ - ], "private":[