From 692b384cf1f468bf93767356b0ed0c290cdff1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=BD=E3=81=A0=E3=81=BE=E3=82=8A?= Date: Thu, 3 Jan 2019 17:09:14 +0900 Subject: [PATCH] =?UTF-8?q?=E8=AE=8A=E6=9B=B4=E7=82=BA=E8=87=AA=E8=A8=82?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=9C=96=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gbf.js | 18 ++++++++++++------ index.php | 10 ++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gbf.js b/gbf.js index 2ce72a3..28762d5 100644 --- a/gbf.js +++ b/gbf.js @@ -1,4 +1,5 @@ -var stage = null; +var jsVer = 201812280712 ; +var stage = null; var canvas = null; var stampList = []; if (typeof (localStorage.data) == "undefined") localStorage.data = "[]"; @@ -7,7 +8,8 @@ if (typeof (localStorage.data) == "undefined") localStorage.data = "[]"; // 定義基本資料 var stampImgList = [ { - id: 1, name: "GBF 2018四周年", image_data: [ + id: 1, name: "GBF 2018四周年", back:"main.png", width:742, height:581 + , image_data: [ { id: 10, name: "10.png", x: 53, y: 441, input: false }, { id: 20, name: "20.png", x: 153, y: 441, input: false }, { id: 30, name: "30.png", x: 253, y: 441, input: false }, @@ -31,7 +33,8 @@ var stampImgList = [ ] }, { - id: 2, name: "GBF 2018聖誕節", image_data: [ + id: 2, name: "GBF 2018聖誕節", back:"main.png", width:713, height:519 + , image_data: [ { id: "10", name: "10.png", x: 53, y: 420, input: false }, { id: "20", name: "20.png", x: 153, y: 420, input: false }, { id: "30", name: "30.png", x: 253, y: 420, input: false }, @@ -62,13 +65,16 @@ var stampImgList = [ function init() { var curEventId = $("select[name=EventList]").val(); var curPath = "./" + curEventId + "/" + var curEventData = Enumerable.from(stampImgList).where(function (obj) { return obj.id == curEventId; }).firstOrDefault(); + document.getElementById("gbfCanvas").width = curEventData.width ; + document.getElementById("gbfCanvas").height = curEventData.height ; canvas = document.querySelector('#gbfCanvas'); stage = new createjs.Stage("gbfCanvas"); stage.enableMouseOver(); // 背景圖片 - var stampCard = new createjs.Bitmap(curPath + "main.png"); + var stampCard = new createjs.Bitmap(curPath + curEventData.back + "?_=" + jsVer); stage.addChild(stampCard); // point @@ -79,7 +85,7 @@ function init() { var stampData = new baseData(); stampData.Id = stamp.id; - stampData.ImageName = curPath + stamp.name; + stampData.ImageName = curPath + stamp.name + "?_=" + jsVer; stampData.input = stamp.input; stampData.text = stamp.text; stampData.ImageX = stamp.x; @@ -160,7 +166,7 @@ function baseData() { _Func.Obj.addEventListener("pressmove", handleMove); _Func.Obj.addEventListener("pressup", handleUp); } else { - _Func.Obj.addEventListener("click", function () { console.info(_Func.Obj); }); + // _Func.Obj.addEventListener("click", function () { console.info(_Func.Obj); }); _Func.Obj.addEventListener("dblclick", deleteSelf); } _Func.Obj.cursor = 'pointer'; diff --git a/index.php b/index.php index 93c0c06..2eb094c 100644 --- a/index.php +++ b/index.php @@ -1,19 +1,17 @@  - - + GBF Stamp帳 - 活動選擇：