Skip to content

S
shuijf2
Commit cc9bcf75 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 27f7372f
Show whitespace changes
Inline Side-by-side
Showing with 8520 additions and 8521 deletions
assets/scenes/main.scene
View file @ cc9bcf75
......@@ -313,8 +313,8 @@
"script": "components/base/Transform",
"properties": {
"position": {
"x": 288.010101010101,
"y": -680.1464646464648,
"x": 333.4646464646464,
"y": -707.419191919192,
"_type_": "scilla/support/Vector2D"
}
}
......@@ -357,8 +357,8 @@
"script": "components/base/Transform",
"properties": {
"position": {
"x": 288.010101010101,
"y": -742.9747474747473,
"x": 333.4646464646464,
"y": -766.611111111111,
"_type_": "scilla/support/Vector2D"
}
}
......@@ -447,11 +447,9 @@
"script": "components/base/Transform",
"properties": {
"position": {
"_hashCode": 3405,
"_x": 0,
"_y": 299.651515151515,
"x": -317.14285714285717,
"y": -734.6341991341993
"x": -324.5974025974026,
"y": -763.7251082251084,
"_type_": "scilla/support/Vector2D"
}
}
},
......
assets/scripts/dialogs/ScoreDialogContent.ts
View file @ cc9bcf75
......@@ -43,6 +43,10 @@ export default class ScoreDialogContent extends DialogContent {
export const getRankURL = () => {
return `/customActivity/sjf/activity/recordIndex?weddingId=${window['CFG'].weddingId}&activityId=${window['CFG'].activityId}&brickType=7`
}
export const getURL = () => {
//`/customActivity/sjf/mainIndex?weddingId=2
return `/customActivity/sjf/mainIndex?weddingId=${window['CFG'].weddingId}`;
}
export const getRecordURL = () => {
return `/customActivity/sjf/activity/recordIndex?weddingId=${window['CFG'].weddingId}&activityId=${window['CFG'].activityId}&brickType=6`;
......
assets/scripts/scenes/SceneStart.ts
View file @ cc9bcf75
......@@ -8,7 +8,7 @@ import { dynamic, Entity } from "scilla/src";
import { alien } from "../navigator/StackNavigator";
import { INavigatorViewBase } from "../navigator/VirtualNavigator";
import { setText, setRotation, getRotation } from "../transformUtils";
import { getRankURL, getRecordURL } from "../dialogs/ScoreDialogContent";
import { getRankURL, getRecordURL, getURL } from "../dialogs/ScoreDialogContent";
export default class SceneStart extends ScillaComponent implements INavigatorViewBase {
doJoin: dynamic;
......@@ -185,15 +185,11 @@ export default class SceneStart extends ScillaComponent implements INavigatorVie
onClick_rankbtn() {
window.location.href = getRankURL();
// this.rankbtn.getComponent(Button).enabled = false;
// this.broadcast('callApi', 1, 'rankInfo', {
// weddingId: window['CFG'].weddingId,
// activityId: window['CFG'].activityId
// })
}
onClick_backbtn() {
console.log('onClick_backbtn');
window.location.href = getRankURL();
// console.log('onClick_backbtn');
window.location.href = getURL()
}
onResponse_rank() {
......
assets/sheets/start.sht/backbtn.png
View replaced file @ 27f7372f View file @ cc9bcf75
assets/sheets/start.sht/backbtn.png

5.73 KB | W: | H:

assets/sheets/start.sht/backbtn.png

3.89 KB | W: | H:

assets/sheets/start.sht/backbtn.png
assets/sheets/start.sht/backbtn.png
assets/sheets/start.sht/backbtn.png
assets/sheets/start.sht/backbtn.png
  • 2-up
  • Swipe
  • Onion skin
assets/sheets/start.sht/recordbtn.png
View replaced file @ 27f7372f View file @ cc9bcf75
assets/sheets/start.sht/recordbtn.png

5.12 KB | W: | H:

assets/sheets/start.sht/recordbtn.png

1.43 KB | W: | H:

assets/sheets/start.sht/recordbtn.png
assets/sheets/start.sht/recordbtn.png
assets/sheets/start.sht/recordbtn.png
assets/sheets/start.sht/recordbtn.png
  • 2-up
  • Swipe
  • Onion skin
assets/sheets/start.sht/rulebtn.png
View replaced file @ 27f7372f View file @ cc9bcf75
assets/sheets/start.sht/rulebtn.png

5.11 KB | W: | H:

assets/sheets/start.sht/rulebtn.png

1.34 KB | W: | H:

assets/sheets/start.sht/rulebtn.png
assets/sheets/start.sht/rulebtn.png
assets/sheets/start.sht/rulebtn.png
assets/sheets/start.sht/rulebtn.png
  • 2-up
  • Swipe
  • Onion skin
debug/bundle.js
View file @ cc9bcf75
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
typeof define === 'function' && define.amd ? define(['exports'], factory) :
(factory((global.shuijf = {})));
}(this, (function (exports) { 'use strict';
(global = global || self, factory(global.shuijf = {}));
}(this, function (exports) { 'use strict';
/*! *****************************************************************************
Copyright (c) Microsoft Corporation. All rights reserved.
......@@ -162,7 +162,7 @@
if (Array.isArray(valueConfig)) {
target[key] = {};
try {
for (var valueConfig_1 = (e_1 = void 0, __values(valueConfig)), valueConfig_1_1 = valueConfig_1.next(); !valueConfig_1_1.done; valueConfig_1_1 = valueConfig_1.next()) {
for (var valueConfig_1 = __values(valueConfig), valueConfig_1_1 = valueConfig_1.next(); !valueConfig_1_1.done; valueConfig_1_1 = valueConfig_1.next()) {
var field = valueConfig_1_1.value;
target[key][field] = data[key][field];
}
......@@ -1808,8 +1808,8 @@
var _animData = this._animData;
var texture, frameData;
if (_animData) {
var frames_1 = _animData.frames;
frameData = frames_1[frameIndex];
var frames = _animData.frames;
frameData = frames[frameIndex];
if (frameData) {
var res = frameData.res;
texture = textureMap[res];
......@@ -1936,7 +1936,7 @@
if (cache === void 0) { cache = true; }
if (options === void 0) { options = {}; }
if (type === void 0) { type = 'arraybuffer'; }
return __awaiter(this, void 0, void 0, function () {
return __awaiter(this, void 0, Promise, function () {
var response, result;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -1988,7 +1988,7 @@
};
AssetsManager.prototype.loadJson5 = function (url, uuid, cache, config) {
if (cache === void 0) { cache = true; }
return __awaiter(this, void 0, void 0, function () {
return __awaiter(this, void 0, Promise, function () {
var txt, jsonData;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -2006,7 +2006,7 @@
};
AssetsManager.prototype.loadPrefab = function (url, uuid, cache, config) {
if (cache === void 0) { cache = true; }
return __awaiter(this, void 0, void 0, function () {
return __awaiter(this, void 0, Promise, function () {
var data;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -2040,9 +2040,9 @@
try {
for (var _b = __values(config.textures), _c = _b.next(); !_c.done; _c = _b.next()) {
var textureConfig = _c.value;
var name_1 = textureConfig.name, uuid_1 = textureConfig.uuid;
var texture = sheet.getTexture(name_1);
_this.cacheRes(texture, name_1, uuid_1);
var name = textureConfig.name, uuid_1 = textureConfig.uuid;
var texture = sheet.getTexture(name);
_this.cacheRes(texture, name, uuid_1);
}
}
catch (e_1_1) { e_1 = { error: e_1_1 }; }
......@@ -2065,9 +2065,8 @@
};
AssetsManager.prototype.loadSheetDisperse = function (url, uuid, cache, config) {
if (cache === void 0) { cache = true; }
return __awaiter(this, void 0, void 0, function () {
var sheet, _a, _b, _c, name_2, uuid_2, subUrl, texture, e_2_1;
var e_2, _d;
return __awaiter(this, void 0, Promise, function () {
var e_2, _a, sheet, _b, _c, _d, name, uuid_2, subUrl, texture, e_2_1;
return __generator(this, function (_e) {
switch (_e.label) {
case 0:
......@@ -2075,19 +2074,19 @@
_e.label = 1;
case 1:
_e.trys.push([1, 6, 7, 8]);
_a = __values(config.textures), _b = _a.next();
_b = __values(config.textures), _c = _b.next();
_e.label = 2;
case 2:
if (!!_b.done) return [3, 5];
_c = _b.value, name_2 = _c.name, uuid_2 = _c.uuid;
subUrl = url.replace('-disperse', '') + '/' + name_2;
if (!!_c.done) return [3, 5];
_d = _c.value, name = _d.name, uuid_2 = _d.uuid;
subUrl = url.replace('-disperse', '') + '/' + name;
return [4, this.loadTexture(subUrl, uuid_2)];
case 3:
texture = _e.sent();
sheet.inputTexture(name_2, texture);
sheet.inputTexture(name, texture);
_e.label = 4;
case 4:
_b = _a.next();
_c = _b.next();
return [3, 2];
case 5: return [3, 8];
case 6:
......@@ -2096,7 +2095,7 @@
return [3, 8];
case 7:
try {
if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
}
finally { if (e_2) throw e_2.error; }
return [7];
......@@ -2141,17 +2140,17 @@
var img = result[1];
putFrameAnim(img, data);
var animations = {};
for (var name_3 in data.mc) {
var animation = getFrameAnimation(name_3);
for (var name in data.mc) {
var animation = getFrameAnimation(name);
if (cache) {
var uuid_3 = name_3;
var uuid_3 = name;
if (config) {
var cfg = _this.findAnimConfig(config.animations, name_3);
var cfg = _this.findAnimConfig(config.animations, name);
uuid_3 = cfg.uuid;
}
_this.cacheRes(animation, name_3, uuid_3);
_this.cacheRes(animation, name, uuid_3);
}
animations[name_3] = animation;
animations[name] = animation;
}
if (cache) {
_this.cacheRes(animations, url, uuid);
......@@ -2178,7 +2177,7 @@
};
AssetsManager.prototype.loadImageFromBlob = function (url, uuid, cache, config) {
if (cache === void 0) { cache = true; }
return __awaiter(this, void 0, void 0, function () {
return __awaiter(this, void 0, Promise, function () {
var imgBlob, e_3;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -2200,7 +2199,7 @@
};
AssetsManager.prototype.loadTexture = function (url, uuid, cache, config) {
if (cache === void 0) { cache = true; }
return __awaiter(this, void 0, void 0, function () {
return __awaiter(this, void 0, Promise, function () {
var img, texture;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -2218,7 +2217,7 @@
};
AssetsManager.prototype.loadTextureFromBlob = function (url, uuid, cache, config) {
if (cache === void 0) { cache = true; }
return __awaiter(this, void 0, void 0, function () {
return __awaiter(this, void 0, Promise, function () {
var img, texture;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -2748,9 +2747,9 @@
if (!isLocalPos) {
var doc = document.documentElement;
var left = box.left + window.pageXOffset - doc.clientLeft;
var top_1 = box.top + window.pageYOffset - doc.clientTop;
var top = box.top + window.pageYOffset - doc.clientTop;
x = pageX - left;
y = pageY - top_1;
y = pageY - top;
}
var newX = x;
var newY = y;
......@@ -2779,9 +2778,9 @@
var box = this._canvasElement.getBoundingClientRect();
var doc = document.documentElement;
var left = box.left + window.pageXOffset - doc.clientLeft;
var top_2 = box.top + window.pageYOffset - doc.clientTop;
var top = box.top + window.pageYOffset - doc.clientTop;
x += left;
y += top_2;
y += top;
}
return {
x: x, y: y,
......@@ -2830,11 +2829,11 @@
function setupEntity(config, root, pid) {
var entity = null;
if (config) {
var name_1 = config.name, uuid = config.uuid, children = config.children;
var name = config.name, uuid = config.uuid, children = config.children;
if (pid !== undefined && uuid !== undefined) {
uuid = pid + '_' + uuid;
}
entity = root || new Entity(name_1, uuid);
entity = root || new Entity(name, uuid);
entityMap[uuid] = entity;
if (children) {
for (var i = 0, li = children.length; i < li; i++) {
......@@ -4363,12 +4362,12 @@
});
var Scene = (function () {
function Scene(engine$$1) {
function Scene(engine) {
this._resourceGroups = {
preload: [],
delay: [],
};
this._engine = engine$$1;
this._engine = engine;
}
Object.defineProperty(Scene.prototype, "root", {
get: function () {
......@@ -4611,7 +4610,7 @@
this.transformToLocal();
this.render();
if (EngineConfig.drawRenderRect) {
var _a = this, context = _a.context, _debugDrawColor = _a._debugDrawColor, _b = _a.bounds, width = _b.width, height = _b.height, _c = _a._anchorOffset, x_1 = _c.x, y = _c.y, _d = _a.transform.pivot, px = _d.x, py = _d.y;
var _a = this, context = _a.context, _debugDrawColor = _a._debugDrawColor, _b = _a.bounds, width = _b.width, height = _b.height, _c = _a._anchorOffset, x = _c.x, y = _c.y, _d = _a.transform.pivot, px = _d.x, py = _d.y;
context.globalAlpha = 0.9;
context.strokeStyle = _debugDrawColor;
context.fillStyle = _debugDrawColor;
......@@ -5098,8 +5097,8 @@
style.color = this.color;
}
if (this.htmlText) {
var _a = this.transform, _b = _a.globalPosition, x_1 = _b.x, y = _b.y, width = _a.width, height = _a.height;
var _c = engine.canvasPosToPagePos(x_1, y), px = _c.x, py = _c.y;
var _a = this.transform, _b = _a.globalPosition, x = _b.x, y = _b.y, width = _a.width, height = _a.height;
var _c = engine.canvasPosToPagePos(x, y), px = _c.x, py = _c.y;
var _d = engine.canvasPosToPagePos(width, height), pWidth = _d.x, pHeight = _d.y;
if (style.left !== (px - pWidth / 2) + 'px') {
style.left = (px - pWidth / 2) + 'px';
......@@ -5587,9 +5586,9 @@
CameraController.prototype.updateViewport = function () {
if (this.viewportAnchor) {
var _a = this.stageSize, width = _a.width, height = _a.height;
var _b = this.viewportAnchor, x_1 = _b.x, y = _b.y;
var _b = this.viewportAnchor, x = _b.x, y = _b.y;
var _c = this.transform.scale, sx = _c.x, sy = _c.y;
this.transform.position.setXY(width * x_1 * sx, height * y * sy);
this.transform.position.setXY(width * x * sx, height * y * sy);
}
};
CameraController.prototype.followTarget = function () {
......@@ -5897,9 +5896,9 @@
var _a = this, currentCanvasContext = _a.currentCanvasContext, frameAnimation = _a.frameAnimation, _currentFrameIndex = _a._currentFrameIndex, bounds = _a.bounds;
var _b = frameAnimation.getFrame(_currentFrameIndex), texture = _b.texture, data = _b.data;
if (texture) {
var img = texture.img, _c = texture.bounds, x_1 = _c.x, y = _c.y, textureWidth = _c.width, textureHeight = _c.height;
var img = texture.img, _c = texture.bounds, x = _c.x, y = _c.y, textureWidth = _c.width, textureHeight = _c.height;
bounds.setTo(data.x, data.y, textureWidth, textureHeight);
currentCanvasContext.drawImage(img, x_1, y, textureWidth, textureHeight, data.x, data.y, textureWidth, textureHeight);
currentCanvasContext.drawImage(img, x, y, textureWidth, textureHeight, data.x, data.y, textureWidth, textureHeight);
}
};
return FrameAnimationRenderer;
......@@ -7088,7 +7087,7 @@
entity.getComponent(TextRenderer).text = text + '';
};
var getTween = function (context, val, obj, duration, ease$$1) {
var getTween = function (context, val, obj, duration, ease) {
return new Promise(function (r) {
var target;
if (val instanceof Transform) {
......@@ -7115,9 +7114,9 @@
delete obj[key];
}
}
createTween(context, target.position, true).to(postionObj, duration, ease$$1);
createTween(context, target.scale, true).to(scaleObj, duration, ease$$1);
createTween(context, target, true).to(obj, duration, ease$$1).call(r);
createTween(context, target.position, true).to(postionObj, duration, ease);
createTween(context, target.scale, true).to(scaleObj, duration, ease);
createTween(context, target, true).to(obj, duration, ease).call(r);
});
};
......@@ -7397,7 +7396,7 @@
img.src = url;
});
};
_this.loadTexture = function (url) { return __awaiter(_this, void 0, void 0, function () {
_this.loadTexture = function (url) { return __awaiter(_this, void 0, Promise, function () {
var img, texture;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -7515,6 +7514,9 @@
var getRankURL = function () {
return "/customActivity/sjf/activity/recordIndex?weddingId=" + window['CFG'].weddingId + "&activityId=" + window['CFG'].activityId + "&brickType=7";
};
var getURL = function () {
return "/customActivity/sjf/mainIndex?weddingId=" + window['CFG'].weddingId;
};
var getRecordURL = function () {
return "/customActivity/sjf/activity/recordIndex?weddingId=" + window['CFG'].weddingId + "&activityId=" + window['CFG'].activityId + "&brickType=6";
};
......@@ -7668,8 +7670,7 @@
window.location.href = getRankURL();
};
SceneStart.prototype.onClick_backbtn = function () {
console.log('onClick_backbtn');
window.location.href = getRankURL();
window.location.href = getURL();
};
SceneStart.prototype.onResponse_rank = function () {
this.bubbling('fuck', 'result');
......@@ -8003,7 +8004,7 @@
img.src = url;
});
};
_this.loadTexture = function (url) { return __awaiter(_this, void 0, void 0, function () {
_this.loadTexture = function (url) { return __awaiter(_this, void 0, Promise, function () {
var img, texture;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -8645,7 +8646,7 @@
img.src = url;
});
};
_this.loadTexture = function (url) { return __awaiter(_this, void 0, void 0, function () {
_this.loadTexture = function (url) { return __awaiter(_this, void 0, Promise, function () {
var img, texture;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -8801,5 +8802,5 @@
Object.defineProperty(exports, '__esModule', { value: true });
})));
}));
//# sourceMappingURL=bundle.js.map
debug/bundle.js.map
View file @ cc9bcf75
This source diff could not be displayed because it is too large. You can view the blob instead.
manifest.json
View file @ cc9bcf75
......@@ -16,8 +16,8 @@
"entryScene": "main"
},
"webServiceUrl-": "http://10.10.93.204:7555 http://localhost:3010",
"webServiceUrl": "http://localhost:4001",
"webServiceUrl1": ""
"webServiceUrl1": "http://localhost:4001",
"webServiceUrl": ""
},
"dataCenterConfig": {
"dataCenterRoot": [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment