new-combats/game
3
0
Fork 0
Code Issues 23 Pull Requests Releases Wiki Activity

Отказ от абсолютных ссылок https://new-combats.com/* к относительным /*. Замена https://img.new-combats.com на //img.new-combats.tech.

Browse Source
This commit is contained in:
Ivor Barhansky
2023-03-31 21:30:14 +03:00
parent 1b5bf26294
commit 01b504e677
346 changed files with 3507 additions and 4221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/btl_info.js
+1 -1
View File
@@ -36,7 +36,7 @@ function info_reflesh(id_info,uid,up_info,obraz,hp,hpAll,mp,mpAll,invis,sex,eff,
zggg3 = 'position:absolute;top:3px;left:3px;z-index:102;';
zggg4 = 'display:none;';
zaggg += '<style> .inf2s { position:relative; filter: alpha(opacity=10); -moz-opacity: 0.10; -khtml-opacity: 0.10; opacity: 0.10; } .inf2s:hover { background-color:#e2e0e0;filter: alpha(opacity=70); -moz-opacity: 0.70; -khtml-opacity: 0.70; opacity: 0.70; } </style>';
zaggg += `<img style="position:absolute;top:1px;left:1px;z-index:100;" src="https://img.new-combats.com/i/zag/${zag}">`;
zaggg += `<img style="position:absolute;top:1px;left:1px;z-index:100;" src="//img.new-combats.tech/i/zag/${zag}">`;
}
document.getElementById(`player${id_info}_login`).innerHTML = up_info;
d.innerHTML = `<div align="left">
js/btl_mini.js
+2 -2
View File
@@ -416,10 +416,10 @@ function mainstatus(id) {
}
function rand_img() {
if (level < 4) {
img_battle = `<img src='https://img.new-combats.com/i/battle/${(Math.floor(Math.random(2) * 2))}.gif'>`;
img_battle = `<img src='//img.new-combats.tech/i/battle/${(Math.floor(Math.random(2) * 2))}.gif'>`;
return
}
img_battle = `<img src='https://img.new-combats.com/i/battle/${(Math.floor(Math.random(29) * 29))}.jpg'>`;
img_battle = `<img src='//img.new-combats.tech/i/battle/${(Math.floor(Math.random(29) * 29))}.jpg'>`;
}
var fstlh = 0;
js/gameEngine.js
+11 -11
View File
@@ -33,12 +33,12 @@ var act = '';
// var r = '';
var r = `<img onclick="petbuySet(1);" id="apet1" title="Кот. Добавляет владельцу ловкость" style="cursor:pointer;padding:3px;" src="https://img.new-combats.com/i/items/summon_pet_cat.gif">
<img onclick="petbuySet(2);" id="apet2" title="Сова. Добавляет владельцу интуицию" style="cursor:pointer;padding:3px;" src="https://img.new-combats.com/i/items/summon_pet_owl.gif">
<img onclick="petbuySet(3);" id="apet3" title="Светляк. Добавляет владельцу мощность магии" style="cursor:pointer;padding:3px;" src="https://img.new-combats.com/i/items/summon_pet_wisp.gif">
<img onclick="petbuySet(4);" id="apet4" title="Чертяка. Добавляет владельцу силу" style="cursor:pointer;padding:3px;" src="https://img.new-combats.com/i/items/summon_pet_demon.gif">
<img onclick="petbuySet(6);" id="apet6" title="Свин. Добавляет владельцу защиту" style="cursor:pointer;padding:3px;" src="https://img.new-combats.com/i/items/summon_pet_pig.gif">
<img onclick="petbuySet(5);" id="apet5" title="Пёс. Добавляет владельцу НР" style="cursor:pointer;padding:3px;" src="https://img.new-combats.com/i/items/summon_pet_dog.gif">
var r = `<img onclick="petbuySet(1);" id="apet1" title="Кот. Добавляет владельцу ловкость" style="cursor:pointer;padding:3px;" src="//img.new-combats.tech/i/items/summon_pet_cat.gif">
<img onclick="petbuySet(2);" id="apet2" title="Сова. Добавляет владельцу интуицию" style="cursor:pointer;padding:3px;" src="//img.new-combats.tech/i/items/summon_pet_owl.gif">
<img onclick="petbuySet(3);" id="apet3" title="Светляк. Добавляет владельцу мощность магии" style="cursor:pointer;padding:3px;" src="//img.new-combats.tech/i/items/summon_pet_wisp.gif">
<img onclick="petbuySet(4);" id="apet4" title="Чертяка. Добавляет владельцу силу" style="cursor:pointer;padding:3px;" src="//img.new-combats.tech/i/items/summon_pet_demon.gif">
<img onclick="petbuySet(6);" id="apet6" title="Свин. Добавляет владельцу защиту" style="cursor:pointer;padding:3px;" src="//img.new-combats.tech/i/items/summon_pet_pig.gif">
<img onclick="petbuySet(5);" id="apet5" title="Пёс. Добавляет владельцу НР" style="cursor:pointer;padding:3px;" src="//img.new-combats.tech/i/items/summon_pet_dog.gif">
`
petsel = 0;
@@ -143,7 +143,7 @@ function inclanNew(id, align, clan_img, name, login) {
win.add(
`inclan${id}New`,
`Приглашение вступить в клан &quot;${name}&quot; &nbsp;`,
`<center><br><img src="https://img.new-combats.com/i/align/align${align}.gif"><img src="https://img.new-combats.com/i/clan/${clan_img}.gif"><b>${login}</b> предлагает вам вступить в клан <span style="display:inline-block"><img src="https://img.new-combats.com/i/align/align${align}.gif">&nbsp;<b>${name}</b></span>. Вы согласны?<br><br></center>`, {
`<center><br><img src="//img.new-combats.tech/i/align/align${align}.gif"><img src="//img.new-combats.tech/i/clan/${clan_img}.gif"><b>${login}</b> предлагает вам вступить в клан <span style="display:inline-block"><img src="//img.new-combats.tech/i/align/align${align}.gif">&nbsp;<b>${name}</b></span>. Вы согласны?<br><br></center>`, {
'a1': `top.inclanNewsave(${id},1);`,
'a2': `top.inclanNewsave(${id},2);`,
'a3': `top.inclanNewsave(${id},2);`
@@ -249,14 +249,14 @@ function add_cb(id, name, nodel, main, indata) {
}
function create_radio(id, act, clss) {
var r = `<div class="crop"><img onclick="${act}; return false;" id="cr_rach_${id}" src="https://img.new-combats.com/i/misc/radio.gif" radio_check="1" class="radio_gl${clss}"></div>`;
var r = `<div class="crop"><img onclick="${act}; return false;" id="cr_rach_${id}" src="//img.new-combats.tech/i/misc/radio.gif" radio_check="1" class="radio_gl${clss}"></div>`;
return r;
}
// 1
function create_check(id, act, clss) {
var r = `<div class="crop2"><img onclick="${act}; return false;" id="cr_rach_${id}" src="https://img.new-combats.com/i/misc/check.gif" radio_check="2" class="check_gl${clss}"></div>`;
var r = `<div class="crop2"><img onclick="${act}; return false;" id="cr_rach_${id}" src="//img.new-combats.tech/i/misc/check.gif" radio_check="2" class="check_gl${clss}"></div>`;
return r;
}
@@ -793,7 +793,7 @@ function un_gravas(id) {
function fartgame(id,img,name,x,date) {
if(id>0) {
//Принять участие в розыгрыше &quot;&quot;?
date = `<table border=\'0\' cellspacing=\'0\' cellpadding=\'5\'><tr><td><img src=\'https://img.new-combats.com/i/items/${img}\'></td><td align=\'left\'>Принять участие в розыгрыше предмета &quot;<b>${name}</b>&quot; ?</td></tr></table>`;
date = `<table border=\'0\' cellspacing=\'0\' cellpadding=\'5\'><tr><td><img src=\'//img.new-combats.tech/i/items/${img}\'></td><td align=\'left\'>Принять участие в розыгрыше предмета &quot;<b>${name}</b>&quot; ?</td></tr></table>`;
win.add(`idfart${id}`,'Розыгрыш предмета',date,{'a1':`top.fartok(${id});`,'a2':`top.fartcancel(${id});`,'n':''},2,1,'width:300px;');
}
}
@@ -873,7 +873,7 @@ function useMagicBattle(name,id,img,type,type_use,text,team) {
}else if(type_use == 2) {
var txxt = '';
var onEnLogin = top.c.login;
txxt += `<table width='100%' border='0' cellspacing='0' cellpadding='0'><tr><td width='80' valign='middle'><div align='center'><img src='https://img.new-combats.com/i/eff/${img}'></div></td><td valign='middle' align='left'>&quot;<b>${name}</b>&quot;<br>Использовать сейчас?</td></tr></table>`;
txxt += `<table width='100%' border='0' cellspacing='0' cellpadding='0'><tr><td width='80' valign='middle'><div align='center'><img src='//img.new-combats.tech/i/eff/${img}'></div></td><td valign='middle' align='left'>&quot;<b>${name}</b>&quot;<br>Использовать сейчас?</td></tr></table>`;
win.add(`iusemg${id}`,`Используем &quot;${name}&quot; &nbsp;`,txxt,{'a1':`top.useMagicGoGoBattle(\'${onEnLogin}\',\'${id}\',\'${type_use}\');`},2,1,'width:300px;');
}
}
js/interface.js
+4 -4
View File
@@ -601,9 +601,9 @@ var win = {
//Собираем каркас
nw = `<table onclick="top.win.addaction(0,\'${kyps[0]}\')" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="wi${style}s0"><div><img src="https://img.new-combats.com/1x1.gif" width="1" height="1"></div></td>
<td class="wi${style}s0"><div><img src="//img.new-combats.tech/1x1.gif" width="1" height="1"></div></td>
<td class="wi${style}s1"></td>
<td class="wi${style}s2"><div><img src="https://img.new-combats.com/1x1.gif" width="1" height="1"></div></td>
<td class="wi${style}s2"><div><img src="//img.new-combats.tech/1x1.gif" width="1" height="1"></div></td>
</tr>
<tr>
<td class="wi${style}s3"><img src="https://${c.img}/1x1.gif" width="5" height="1"></td>
@@ -611,9 +611,9 @@ var win = {
<td class="wi${style}s4"><img src="https://${c.img}/1x1.gif" width="5" height="1"></td>
</tr>
<tr>
<td class="wi${style}s5"><div><img src="https://img.new-combats.com/1x1.gif" width="1" height="1"></div></td>
<td class="wi${style}s5"><div><img src="//img.new-combats.tech/1x1.gif" width="1" height="1"></div></td>
<td class="wi${style}s6"></td>
<td class="wi${style}s8"><div><img src="https://img.new-combats.com/1x1.gif" width="1" height="1"></div><div id="win_a_${id}" class="wi${style}s9"></div></td>
<td class="wi${style}s8"><div><img src="//img.new-combats.tech/1x1.gif" width="1" height="1"></div><div id="win_a_${id}" class="wi${style}s9"></div></td>
</tr>
</table>`;
js/jquery.locations.js
+1 -1
View File
@@ -96,7 +96,7 @@ function ViewLocation(json){
}
html += '></div>';
}
html += '<div style="position:absolute;top:0px;z-index:101;right:12px;width:80px;"><table height="15" border="0" cellspacing="0" cellpadding="0"><tr><td id="locobobr" rowspan="3" valign="bottom"><a href="main.php?rnd="><img style="display:block;" src="https://img.new-combats.com/i/move/rel_1.gif" width="15" height="16" title="Обновить" border="0" /></a></td><td colspan="3"><img style="display:block;" src="https://img.new-combats.com/i/move/navigatin_462s.gif" width="80" height="4" /></td></tr><tr><td><img style="display:block;" src="https://img.new-combats.com/i/move/navigatin_481.gif" width="9" height="8" /></td><td width="64" bgcolor="black"><img src="https://img.new-combats.com/1x1.gif" style="display:block;width:33px;" id="MoveLine" height="8" class="MoveLine" /></td><td><img style="display:block;" src="https://img.new-combats.com/i/move/navigatin_50.gif" width="7" height="8" /></td></tr><tr><td colspan="3"><img style="display:block;" src="https://img.new-combats.com/i/move/navigatin_tt1_532.gif" width="80" height="4" /></td></tr></table><div id="test"></div></div>';
html += '<div style="position:absolute;top:0px;z-index:101;right:12px;width:80px;"><table height="15" border="0" cellspacing="0" cellpadding="0"><tr><td id="locobobr" rowspan="3" valign="bottom"><a href="main.php?rnd="><img style="display:block;" src="//img.new-combats.tech/i/move/rel_1.gif" width="15" height="16" title="Обновить" border="0" /></a></td><td colspan="3"><img style="display:block;" src="//img.new-combats.tech/i/move/navigatin_462s.gif" width="80" height="4" /></td></tr><tr><td><img style="display:block;" src="//img.new-combats.tech/i/move/navigatin_481.gif" width="9" height="8" /></td><td width="64" bgcolor="black"><img src="//img.new-combats.tech/1x1.gif" style="display:block;width:33px;" id="MoveLine" height="8" class="MoveLine" /></td><td><img style="display:block;" src="//img.new-combats.tech/i/move/navigatin_50.gif" width="7" height="8" /></td></tr><tr><td colspan="3"><img style="display:block;" src="//img.new-combats.tech/i/move/navigatin_tt1_532.gif" width="80" height="4" /></td></tr></table><div id="test"></div></div>';
html += '</div>';
$('#ViewLocation').html(html);
// $('#ViewLocation').html(tmpl("vLocation", json));
js/onlineList.js
+4 -33
View File
@@ -64,7 +64,7 @@ var chat = {
this.ignoreList.nms[this.ignoreList.x] = login;
if ($('#ignr_alu').attr('id') != undefined) {
$('#ignr_alu').html(`${$('#ignr_alu').html()}<div id="ignr_u_${this.ignoreList.x}"> <b>${login}</b> <a target="_blank" href="https://new-combats.com/info/${login}"><img src="https://${c.img}/i/inf_capitalcity.gif" onMouseOver="top.hi(this,\'<b>Инф. о ${login}</b>\',event,5,-2,2,2,\'\');" onMouseOut="top.hic();" onMouseDown="top.hic();"></a> <small><a href="javascript:void(0)" onclick="chat.ignorUn(${this.ignoreList.x})">Clear</a></small> </div>`);
$('#ignr_alu').html(`${$('#ignr_alu').html()}<div id="ignr_u_${this.ignoreList.x}"> <b>${login}</b> <a target="_blank" href="/info/${login}"><img src="https://${c.img}/i/inf_capitalcity.gif" onMouseOver="top.hi(this,\'<b>Инф. о ${login}</b>\',event,5,-2,2,2,\'\');" onMouseOut="top.hic();" onMouseDown="top.hic();"></a> <small><a href="javascript:void(0)" onclick="chat.ignorUn(${this.ignoreList.x})">Clear</a></small> </div>`);
}
return
},
@@ -94,7 +94,7 @@ var chat = {
var newhtml = '';
var i = 1;
while( i <= frc.x ) {
newhtml += `<img style="display:none" id="frvanim_${this.feerverk_id}_img${i}" width="${frc.width}" height="${frc.height}" src="https://img.new-combats.com/fw/${frc.name}/${i}.gif">`;
newhtml += `<img style="display:none" id="frvanim_${this.feerverk_id}_img${i}" width="${frc.width}" height="${frc.height}" src="//img.new-combats.tech/fw/${frc.name}/${i}.gif">`;
i++;
}
newhtml = `<div id="frvanim_${this.feerverk_id}" style="z-index:5000;position:absolute;width:${frc.width}px;height:${frc.height}px;left:${frc.left}px;top:${frc.top}px;">${newhtml}</div>`;
@@ -128,7 +128,7 @@ var chat = {
var j = 1;
while (j <= this.ignoreList.x) {
if (this.ignoreList[this.ignoreList.nms[j]] != undefined) {
date += `<div id="ignr_u_${j}"> <b>${this.ignoreList.nms[j]}</b> <a target="_blank" href="https://new-combats.com/info/${this.ignoreList.nms[j]}"><img src="https://${c.img}/i/inf_capitalcity.gif" onMouseOver="top.hi(this,\'<b>Инф. о ${this.ignoreList.nms[j]}</b>\',event,5,-2,2,2,\'\');" onMouseOut="top.hic();" onMouseDown="top.hic();"></a> <small><a href="javascript:void(0)" onclick="chat.ignorUn(${j})">Clear</a></small> </div>`;
date += `<div id="ignr_u_${j}"> <b>${this.ignoreList.nms[j]}</b> <a target="_blank" href="/info/${this.ignoreList.nms[j]}"><img src="https://${c.img}/i/inf_capitalcity.gif" onMouseOver="top.hi(this,\'<b>Инф. о ${this.ignoreList.nms[j]}</b>\',event,5,-2,2,2,\'\');" onMouseOut="top.hic();" onMouseDown="top.hic();"></a> <small><a href="javascript:void(0)" onclick="chat.ignorUn(${j})">Clear</a></small> </div>`;
}
j++;
}
@@ -682,40 +682,12 @@ var chat = {
msg += `<font color="${data[6]}">${data[5]}</font>`;
}
else {
// https://img.new-combats.com/i/inf_capitalcity.gif
// inf.php?89489
// console.log(chat.regexpURL_true(data[5]))
// console.log(`Ссылка: ${data[6]} Текст: ${data[5]}` )
msg += `<font color="${data[6]}">${chat.regexpURL_true(data[5])}</font>`
// console.log("обычное, цветное сообщение")
}
// msg += `<font color="${data[6]}">${data[5]}</font>`;
// https://new-combats.com/n/1070/ - ЧИТАТЬ
// https://new-combats.com/inf.php?903093 - ИНФА МОБОВ
// https://img.new-combats.com/i/inf_capitalcity.gif" - ИНФА МОБОВ
// console.log(chat.regexpURL_true(data[5]))
// msg += `<font color="${data[6]}">${chat.regexpURL_true(data[5])}</font>`
}
} else {
// var regexpURL = /[-a-zA-Z0-9@:%_\+.~#?&\/=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&\/=]*)?/gi
// var adressURL = data[5].match(regexpURL)
// if (adressURL !== null) {
// msg += `<a href="${adressURL}">${adressURL}</a>`
// }
var voiceMessageReg = data[5].match(/audio_[0-9]{10}[.]mp3/g)
if (voiceMessageReg !== null) {
msg += `<audio id="audioPlayerChat" controls style="width:300px;max-width:400px;" height="20px";>
@@ -725,7 +697,6 @@ var chat = {
}
else {
msg += chat.regexpURL_true(data[5])
// msg += data[5];
}
}
@@ -1269,7 +1240,7 @@ var chat = {
var $inputWindow = document.getElementById("textmsg")
var arrayBuffer = fileReader.result
var response = await fetch("https://new-combats.com/audio.php", {
var response = await fetch("/audio.php", {
method: "POST",
body: arrayBuffer
})