김환

conflict 해결

...@@ -4,6 +4,7 @@ var request = require("request"); ...@@ -4,6 +4,7 @@ var request = require("request");
4 var urlenconde = require('urlencode'); 4 var urlenconde = require('urlencode');
5 var apikey = "RGAPI-e4aabf85-2067-48cb-82ab-39bdf7c07325"//api 5 var apikey = "RGAPI-e4aabf85-2067-48cb-82ab-39bdf7c07325"//api
6 6
7 +
7 var profileIconId; //아이콘 번호 8 var profileIconId; //아이콘 번호
8 var revisionDate; //수정날짜 9 var revisionDate; //수정날짜
9 var id; //소환사ID 10 var id; //소환사ID
...@@ -149,7 +150,7 @@ var rotation_champ = new Array(); ...@@ -149,7 +150,7 @@ var rotation_champ = new Array();
149 var temp_name; 150 var temp_name;
150 var temp_point; 151 var temp_point;
151 var temp_pic; 152 var temp_pic;
152 - for(var i=0; i < champ_id.length-1; i++){ 153 + for(var i=0; i < champ_id.length-1; i++){//챔피언 포인트 순으로 sorting
153 for(var j=i+1;j <champ_id.length-1; j++) 154 for(var j=i+1;j <champ_id.length-1; j++)
154 if(champ_point[i] < champ_point[j]){ 155 if(champ_point[i] < champ_point[j]){
155 temp_id = champ_id[i]; 156 temp_id = champ_id[i];
...@@ -197,7 +198,7 @@ var rotation_champ = new Array(); ...@@ -197,7 +198,7 @@ var rotation_champ = new Array();
197 198
198 199
199 200
200 - res.render('index', { title: req.params.username , 201 + res.render('index', { title: req.params.username ,//데이터를 ejs로 넘길 때 사용
201 c_id: champ_id, 202 c_id: champ_id,
202 c_name: champ_name, 203 c_name: champ_name,
203 c_point: champ_point, 204 c_point: champ_point,
......
...@@ -2,7 +2,7 @@ module.exports = function(app){ ...@@ -2,7 +2,7 @@ module.exports = function(app){
2 2
3 var request = require("request"); 3 var request = require("request");
4 var urlenconde = require('urlencode'); 4 var urlenconde = require('urlencode');
5 -var apikey = "RGAPI-df870784-f399-4104-bfbb-1b209aeb597f"//api 5 +var apikey = "RGAPI-4591bbaf-8e3f-4afa-91c2-359b66a402b7"//api
6 6
7 var profileIconId; //아이콘 번호 7 var profileIconId; //아이콘 번호
8 var revisionDate; //수정날짜 8 var revisionDate; //수정날짜
...@@ -45,7 +45,7 @@ var matches; //경기정보 ...@@ -45,7 +45,7 @@ var matches; //경기정보
45 var champ_pic = new Array(); 45 var champ_pic = new Array();
46 var champions_length = Object.keys(champions).length; 46 var champions_length = Object.keys(champions).length;
47 47
48 - for(var i=0; i < champions_length; i++){ 48 + for(var i=0; i < champions_length; i++){//챔피언 포인트 계산 식
49 champ_point[i] = (champions[i]["stats"]["totalSessionsWon"]/champions[i]["stats"]["totalSessionsPlayed"]*200) 49 champ_point[i] = (champions[i]["stats"]["totalSessionsWon"]/champions[i]["stats"]["totalSessionsPlayed"]*200)
50 + ((champions[i]["stats"]["totalAssists"]+champions[i]["stats"]["totalChampionKills"])/champions[i]["stats"]["totalDeathsPerSession"]*100) 50 + ((champions[i]["stats"]["totalAssists"]+champions[i]["stats"]["totalChampionKills"])/champions[i]["stats"]["totalDeathsPerSession"]*100)
51 + (champions[i]["stats"]["totalSessionsPlayed"]*3); 51 + (champions[i]["stats"]["totalSessionsPlayed"]*3);
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 <div class="center"> 101 <div class="center">
102 <img src= <%=c_pic[i]%> width=50, height=50> 102 <img src= <%=c_pic[i]%> width=50, height=50>
103 <%= c_name[i] %> 103 <%= c_name[i] %>
104 - <%= "point: " + (1000000/c_point[i]).toFixed(2) %> 104 + <%= "point: " + c_point[i] %>
105 <% } %> 105 <% } %>
106 </div> 106 </div>
107 107
......