mirror of
https://github.com/EmulatorJS/EmulatorJS.git
synced 2024-09-20 10:56:30 +00:00
Fix virtual gamepad bug
This commit is contained in:
parent
0fd6d58e20
commit
e9e017435f
5 changed files with 40 additions and 8 deletions
|
@ -3428,10 +3428,10 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
|
|||
} else if (!set[i].type) {
|
||||
console.warn("Missing type value for button "+set[i].text+"! Using default gamepad settings");
|
||||
return false;
|
||||
} else if (!set[i].id) {
|
||||
} else if (!set[i].id.toString()) {
|
||||
console.warn("Missing id value for button "+set[i].text+"! Using default gamepad settings");
|
||||
return false;
|
||||
} else if (!set[i].input_value) {
|
||||
} else if (!set[i].input_value.toString()) {
|
||||
console.warn("Missing input_value for button "+set[i].text+"! Using default gamepad settings");
|
||||
return false;
|
||||
}
|
||||
|
@ -3839,7 +3839,7 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
|
|||
}
|
||||
if (zone) {
|
||||
let opts = {};
|
||||
opts[info[i].location.toLowerCase()] = true;
|
||||
opts[zone.location.toLowerCase()] = true;
|
||||
let _0x17edbf = _0x3a58c8.a.create({
|
||||
'zone': _0x530042.call(this, '.' .concat(_0x449eac({
|
||||
'ejs-virtual-gamepad': true
|
||||
|
@ -6278,7 +6278,7 @@ window.EJS_main = function(_0xa88a13, _0x17edbf, _0x2c1832) {
|
|||
}
|
||||
return path
|
||||
}
|
||||
this.version = '2.3.1';
|
||||
this.version = '2.3.2';
|
||||
this.system = '';
|
||||
this.adUrl = null;
|
||||
this.gameName = null;
|
||||
|
|
2
data/emulator.min.js
vendored
2
data/emulator.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,5 @@
|
|||
(async function() {
|
||||
let VERSION = 3.1;
|
||||
let VERSION = 3.11;
|
||||
if ((window.location && ['localhost', '127.0.0.1'].includes(location.hostname)) ||
|
||||
'undefined' != typeof EJS_DEBUG_XX && true === EJS_DEBUG_XX) {
|
||||
fetch('https://raw.githack.com/ethanaobrien/emulatorjs/main/data/version.json').then(response => {
|
||||
|
|
34
data/minify/package-lock.json
generated
34
data/minify/package-lock.json
generated
|
@ -1,8 +1,40 @@
|
|||
{
|
||||
"name": "emulatorjs-minify",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 1,
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "emulatorjs-minify",
|
||||
"version": "1.0.0",
|
||||
"dependencies": {
|
||||
"uglify-js": "^3.15.3",
|
||||
"uglifycss": "0.0.29"
|
||||
}
|
||||
},
|
||||
"node_modules/uglify-js": {
|
||||
"version": "3.15.4",
|
||||
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz",
|
||||
"integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==",
|
||||
"bin": {
|
||||
"uglifyjs": "bin/uglifyjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/uglifycss": {
|
||||
"version": "0.0.29",
|
||||
"resolved": "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz",
|
||||
"integrity": "sha512-J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ==",
|
||||
"bin": {
|
||||
"uglifycss": "uglifycss"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=6.4.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"dependencies": {
|
||||
"uglify-js": {
|
||||
"version": "3.15.4",
|
||||
|
|
|
@ -1 +1 @@
|
|||
{ "current_version": 3.1 }
|
||||
{ "current_version": 3.11 }
|
||||
|
|
Loading…
Reference in a new issue