Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix applying textures to player

Browse Source
This commit is contained in:
gplane 2017-04-26 17:05:15 +08:00
parent 12bdac3bb4
commit 8abed82899
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/assets/src/scripts/user.js
View File

@ -2,7 +2,7 @@
* @Author: printempw * @Author: printempw
* @Date: 2016-07-16 10:02:24 * @Date: 2016-07-16 10:02:24
* @Last Modified by: g-plane * @Last Modified by: g-plane
* @Last Modified time: 2017-04-26 15:53:54 * @Last Modified time: 2017-04-26 17:02:57
*/ */
'use strict'; 'use strict';
@ -18,13 +18,13 @@ $('body').on('click', '#preview-switch', () => {
TexturePreview.previewType == '3D' ? TexturePreview.show2dPreview() : TexturePreview.show3dPreview(); TexturePreview.previewType == '3D' ? TexturePreview.show2dPreview() : TexturePreview.show3dPreview();
}); });
let skinSelected = false, capeSelected = false; let selectedTextures = [];
$('body').on('click', '.item-body', function () { $('body').on('click', '.item-body', function () {
$('.item-selected').parent().removeClass('item-selected'); $('.item-selected').parent().removeClass('item-selected');
$(this).parent().addClass('item-selected'); $(this).parent().addClass('item-selected');
const tid = $(this).parent().attr('tid'); const tid = parseInt($(this).parent().attr('tid'));
$.ajax({ $.ajax({
type: "POST", type: "POST",
@ -33,17 +33,17 @@ $('body').on('click', '.item-body', function () {
success: (json) => { success: (json) => {
if (json.type == "cape") { if (json.type == "cape") {
MSP.changeCape('../textures/' + json.hash); MSP.changeCape('../textures/' + json.hash);
capeSelected = true; selectedTextures['cape'] = tid;
} else { } else {
MSP.changeSkin('../textures/' + json.hash); MSP.changeSkin('../textures/' + json.hash);
skinSelected = true; selectedTextures['skin'] = tid;
} }
if (skinSelected && capeSelected) if (selectedTextures['skin'] !== undefined && selectedTextures['cape'] !== undefined)
$('#textures-indicator').text(`${trans('general.skin')} & ${trans('general.cape')}`); $('#textures-indicator').text(`${trans('general.skin')} & ${trans('general.cape')}`);
else if (skinSelected) else if (selectedTextures['skin'] != undefined)
$('#textures-indicator').text(trans('general.skin')); $('#textures-indicator').text(trans('general.skin'));
else if (capeSelected) else if (selectedTextures['cape'] != undefined)
$('#textures-indicator').text(trans('general.cape')); $('#textures-indicator').text(trans('general.cape'));
}, },
error: showAjaxError error: showAjaxError
@ -298,7 +298,7 @@ function setTexture() {
if (!pid) { if (!pid) {
toastr.info(trans('user.emptySelectedPlayer')); toastr.info(trans('user.emptySelectedPlayer'));
} else if (selected.length == 0) { } else if (selectedTextures['skin'] == undefined && selectedTextures['cape'] == undefined) {
toastr.info(trans('user.emptySelectedTexture')); toastr.info(trans('user.emptySelectedTexture'));
} else { } else {
$.ajax({ $.ajax({
@ -307,8 +307,8 @@ function setTexture() {
dataType: "json", dataType: "json",
data: { data: {
'pid': pid, 'pid': pid,
'tid[skin]': selected['skin'], 'tid[skin]': selectedTextures['skin'],
'tid[cape]': selected['cape'] 'tid[cape]': selectedTextures['cape']
}, },
success: function(json) { success: function(json) {
if (json.errno == 0) { if (json.errno == 0) {