Commit 262eaeb5 authored by rockyl's avatar rockyl

修改上传

parent 98488ec1
...@@ -19,7 +19,11 @@ ...@@ -19,7 +19,11 @@
{ {
"script": "components/renderer/TextureRenderer", "script": "components/renderer/TextureRenderer",
"properties": { "properties": {
"texture": "res|e9d32c40-aa0e-4929-aa5f-80c4c69631ce" "texture": "res|e9d32c40-aa0e-4929-aa5f-80c4c69631ce",
"anchor": {
"x": 0.47,
"_type_": "scilla/support/Vector2D"
}
} }
}, },
{ {
......
...@@ -134,13 +134,13 @@ ...@@ -134,13 +134,13 @@
], ],
"onError": [ "onError": [
{ {
"entity": "entity|3e40e379-b006-46e8-89e2-899e07e18dda", "entity": "entity|dc988853-0218-4b1e-ba58-288f2ec7c0b4",
"component": 1, "component": 3,
"method": "showDialog", "method": "onError"
"param": "Network"
} }
], ],
"method": "GET" "method": "GET",
"credentials": "include"
} }
} }
], ],
...@@ -462,14 +462,15 @@ ...@@ -462,14 +462,15 @@
"left": 0, "left": 0,
"right": 0, "right": 0,
"top": 80, "top": 80,
"bottom": 250 "bottom": 300
} }
}, },
{ {
"script": "components/renderer/RectRenderer", "script": "components/renderer/RectRenderer",
"properties": { "properties": {
"fillColor": "rgba(255, 255, 255, 0)" "fillColor": "rgba(255, 255, 255, 1)"
} },
"disabled": true
} }
], ],
"uuid": "424c571b-8c8b-4733-8853-9dc974d60a47", "uuid": "424c571b-8c8b-4733-8853-9dc974d60a47",
...@@ -542,7 +543,8 @@ ...@@ -542,7 +543,8 @@
"component": 3, "component": 3,
"method": "reset" "method": "reset"
} }
] ],
"credentials": "include"
} }
}, },
{ {
...@@ -574,7 +576,8 @@ ...@@ -574,7 +576,8 @@
"component": 3, "component": 3,
"method": "onGetOrderResponse" "method": "onGetOrderResponse"
} }
] ],
"credentials": "include"
} }
} }
], ],
...@@ -853,7 +856,8 @@ ...@@ -853,7 +856,8 @@
"component": 3, "component": 3,
"method": "onError" "method": "onError"
} }
] ],
"credentials": "include"
} }
}, },
{ {
...@@ -886,7 +890,8 @@ ...@@ -886,7 +890,8 @@
"method": "onError" "method": "onError"
} }
], ],
"method": "GET" "method": "GET",
"credentials": "include"
} }
}, },
{ {
...@@ -1056,7 +1061,8 @@ ...@@ -1056,7 +1061,8 @@
"script": "components/renderer/RectRenderer", "script": "components/renderer/RectRenderer",
"properties": { "properties": {
"fillColor": "rgba(0, 0, 0, 0.7)" "fillColor": "rgba(0, 0, 0, 0.7)"
} },
"disabled": true
}, },
{ {
"script": "components/base/TouchInterrupt", "script": "components/base/TouchInterrupt",
......
import InteractComponent from 'components/base/InteractComponent' import InteractComponent from 'components/base/InteractComponent'
import { countDown, } from '../utils/index'; import {countDown,} from '../utils/index';
import { Entity, engine, resource, createTween, ease, dynamic, Texture, killTweens, dataCenter } from 'scilla'; import {Entity, engine, resource, createTween, ease, dynamic, Texture, killTweens, dataCenter} from 'scilla';
import TextRenderer from 'components/renderer/TextRenderer'; import TextRenderer from 'components/renderer/TextRenderer';
import ToolAnimateRotate, { Tick } from './ToolAnimate'; import ToolAnimateRotate, {Tick} from './ToolAnimate';
import Transform from 'components/base/Transform'; import Transform from 'components/base/Transform';
import { createTreasure } from './Treasure'; import {createTreasure} from './Treasure';
import RelativeLayout from 'components/other/RelativeLayout'; import RelativeLayout from 'components/other/RelativeLayout';
import { createStone } from './Stone'; import {createStone} from './Stone';
import Treasure from './Treasure'; import Treasure from './Treasure';
import TextureRenderer from 'components/renderer/TextureRenderer'; import TextureRenderer from 'components/renderer/TextureRenderer';
import RectRenderer from 'components/renderer/RectRenderer'; import RectRenderer from 'components/renderer/RectRenderer';
import start, { setTexture, setButton } from '../scenes/start'; import start, {setTexture, setButton} from '../scenes/start';
import SampleApi from 'components/net/SampleApi'; import SampleApi from 'components/net/SampleApi';
import {md5} from 'components/utils/Crypto' import {md5} from 'components/utils/Crypto'
import Popup from 'components/other/Popup'; import Popup from 'components/other/Popup';
...@@ -29,6 +29,8 @@ const commonSpeedBefore = 280 ...@@ -29,6 +29,8 @@ const commonSpeedBefore = 280
const commonSpeedAfter = 420 const commonSpeedAfter = 420
const slowSpeed = 350 const slowSpeed = 350
const needToastErr = ['0100017', '0100003', '0100007', '0100015'];
const startPoint = { const startPoint = {
dpm: 'app_id.248.2.1', dpm: 'app_id.248.2.1',
dcm: '252.oaid.0.0', dcm: '252.oaid.0.0',
...@@ -39,7 +41,7 @@ const waPoint = { ...@@ -39,7 +41,7 @@ const waPoint = {
dcm: '252.oaid.0.0', dcm: '252.oaid.0.0',
} }
export default class Game extends InteractComponent{ export default class Game extends InteractComponent {
CountDown: Entity CountDown: Entity
Detail: Entity Detail: Entity
Target: Entity Target: Entity
...@@ -85,16 +87,8 @@ export default class Game extends InteractComponent{ ...@@ -85,16 +87,8 @@ export default class Game extends InteractComponent{
TakeFailed: Entity TakeFailed: Entity
CurrencyNotEnough: Entity CurrencyNotEnough: Entity
onAwake(){ onCreate() {
super.onAwake(); super.onCreate();
}
constructor() {
super()
}
init() {
this.toolTs = this.Tool.getComponent(Transform) this.toolTs = this.Tool.getComponent(Transform)
this.toolTr = this.Tool.getComponent(TextureRenderer) this.toolTr = this.Tool.getComponent(TextureRenderer)
this.toolTrAnchorY = this.toolTr.anchor.y this.toolTrAnchorY = this.toolTr.anchor.y
...@@ -103,6 +97,9 @@ export default class Game extends InteractComponent{ ...@@ -103,6 +97,9 @@ export default class Game extends InteractComponent{
this.rotateTick = new ToolAnimateRotate(this.toolTs) this.rotateTick = new ToolAnimateRotate(this.toolTs)
}
init() {
this.startRotate() this.startRotate()
this.initBox() this.initBox()
...@@ -114,13 +111,14 @@ export default class Game extends InteractComponent{ ...@@ -114,13 +111,14 @@ export default class Game extends InteractComponent{
this.setBtnActionBg(false) this.setBtnActionBg(false)
} }
onUpdate(t){ onUpdate(t) {
super.onUpdate(t); super.onUpdate(t);
this.ticks.forEach(tick => tick.onTick(t)) this.ticks.forEach(tick => tick.onTick(t))
} }
private clearCountDown: Function private clearCountDown: Function
countDown(from, to = 0, cb) { countDown(from, to = 0, cb) {
this.clearCountDown = countDown(from, to, target => { this.clearCountDown = countDown(from, to, target => {
this.CountDown.getComponent(TextRenderer).text = target + 's' this.CountDown.getComponent(TextRenderer).text = target + 's'
...@@ -128,6 +126,7 @@ export default class Game extends InteractComponent{ ...@@ -128,6 +126,7 @@ export default class Game extends InteractComponent{
} }
private _parent: number private _parent: number
setDetail(child, isActive = false, cb, parent?) { setDetail(child, isActive = false, cb, parent?) {
if (this._parent) parent = this._parent if (this._parent) parent = this._parent
else this._parent = parent else this._parent = parent
...@@ -143,6 +142,7 @@ export default class Game extends InteractComponent{ ...@@ -143,6 +142,7 @@ export default class Game extends InteractComponent{
private _per: number private _per: number
private _freeTimes: number private _freeTimes: number
private _unit: string private _unit: string
setTitle(visible, isDecrease = false, per?, unit?, freeTimes?) { setTitle(visible, isDecrease = false, per?, unit?, freeTimes?) {
if (!visible) return this.Title.enabled = false if (!visible) return this.Title.enabled = false
...@@ -193,11 +193,11 @@ export default class Game extends InteractComponent{ ...@@ -193,11 +193,11 @@ export default class Game extends InteractComponent{
return randomIsTreasure - Math.random() > 0 return randomIsTreasure - Math.random() > 0
} }
let {width, height} = this.BoxContainer.getComponent(Transform) let {width: containerWidth, height: containerHeight} = this.BoxContainer.getComponent(Transform)
width -= 20 //containerWidth -= 20
const list = this.initList(box) const list = this.initList(box)
const itemHeight = height / list.length const itemHeight = containerHeight / list.length
let treasureNum = box let treasureNum = box
let stoneNum = Math.ceil(box * 0.6) let stoneNum = Math.ceil(box * 0.6)
...@@ -205,17 +205,17 @@ export default class Game extends InteractComponent{ ...@@ -205,17 +205,17 @@ export default class Game extends InteractComponent{
const generateEle = (create, box, img, num, left, top, width, height) => { const generateEle = (create, box, img, num, left, top, width, height) => {
const entity = create(box, this.config.getTexture(img), num) const entity = create(box, this.config.getTexture(img), num)
const element = this.initElement(entity, left, top, width, height) const element = this.initElement(entity, left - containerWidth / 2, top - containerHeight / 2, width, height)
this.elementList.push(element) this.elementList.push(element)
} }
list.forEach((row, index) => { list.forEach((row, index) => {
const rowNum = (typeof row === 'number' ? row : row.iterater) const rowNum = (typeof row === 'number' ? row : row.iterater)
const itemWidth = Math.floor(width / rowNum) const itemWidth = Math.floor(containerWidth / rowNum)
for (let i = 0; i < rowNum; i++) { for (let i = 0; i < rowNum; i++) {
let left = i * itemWidth let left = i * itemWidth + 50
let top = index * itemHeight let top = index * itemHeight + 50
let width = itemWidth let width = itemWidth
let height = itemHeight let height = itemHeight
if (index === 1) { if (index === 1) {
...@@ -255,6 +255,48 @@ export default class Game extends InteractComponent{ ...@@ -255,6 +255,48 @@ export default class Game extends InteractComponent{
}) })
} }
private initElement(entity, left, top, width, height) {
//const tl = entity.getComponent(RelativeLayout)
const ts = entity.getComponent(Transform)
let thisWidth = Math.floor(ts.width * ts.scale.x)
let thisHeight = Math.floor(ts.height * ts.scale.y)
const padding = 0
let scale;
if (height <= 0) {
scale = entity.min;
}else{
scale = ts.scale.x * Math.min(height / thisHeight + 0.1, 0.8);
}
ts.scale.x = scale
ts.scale.y = scale
thisWidth = Math.floor(ts.width * scale)
thisHeight = Math.floor(ts.height * scale)
let thisLeft = generateRandomDistance(left, width - thisWidth - padding)
let thisTop = generateRandomDistance(top, height - thisHeight - padding)
if (width <= 0) {
thisLeft = left
}
ts.position.x = thisLeft
ts.position.y = thisTop
return {
left: thisLeft,
top: thisTop,
width: thisWidth,
height: thisHeight,
sx: ts.scale.x,
sy: ts.scale.y,
entity,
type: !!entity.getComponent(Treasure) ? ElementType.Treasure : ElementType.Stone,
index: this.elementList.length
}
}
private stopRotate() { private stopRotate() {
const index = this.ticks.findIndex(item => item === this.rotateTick) const index = this.ticks.findIndex(item => item === this.rotateTick)
this.ticks[index].removeOnTick() this.ticks[index].removeOnTick()
...@@ -269,17 +311,19 @@ export default class Game extends InteractComponent{ ...@@ -269,17 +311,19 @@ export default class Game extends InteractComponent{
private doJoinStatus: boolean = false private doJoinStatus: boolean = false
private doJoinRunning: boolean = false private doJoinRunning: boolean = false
async doJoin() { async doJoin() {
this.doJoinRunning = true this.doJoinRunning = true
const sampleApi = this.Button.getComponent(SampleApi) const sampleApi = this.Button.getComponent(SampleApi)
await sampleApi.execute() await sampleApi.execute()
} }
onError(code) { onError(e) {
if (e.name == 'CALL_FAILED') {
const c = this.entity.getComponent(start) const c = this.entity.getComponent(start)
this.popup = this.DialogContainer.getComponent(Popup) this.popup = this.DialogContainer.getComponent(Popup)
const s = this.entity.getComponent(start) const s = this.entity.getComponent(start)
switch (code) { switch (e.code) {
case '0100000': case '0100000':
c.initLoginProcess(true) c.initLoginProcess(true)
break break
...@@ -317,6 +361,10 @@ export default class Game extends InteractComponent{ ...@@ -317,6 +361,10 @@ export default class Game extends InteractComponent{
default: default:
this.popup.showDialog('Network') this.popup.showDialog('Network')
} }
} else {
this.popup.showDialog('Network')
}
this.doJoinRunning = false this.doJoinRunning = false
} }
...@@ -380,7 +428,8 @@ export default class Game extends InteractComponent{ ...@@ -380,7 +428,8 @@ export default class Game extends InteractComponent{
this.doJoinStatus = false this.doJoinStatus = false
this.setBtnActionBg(false) this.setBtnActionBg(false)
this.setTitle(true, true) this.setTitle(true, true)
this.countDown(this.homeInfo.continueTime, this.homeInfo.continueTime, () => {}) this.countDown(this.homeInfo.continueTime, this.homeInfo.continueTime, () => {
})
this.initBox() this.initBox()
this.score = 0 this.score = 0
this.setDetail(this.score, false, this.submit.bind(this)); this.setDetail(this.score, false, this.submit.bind(this));
...@@ -466,7 +515,8 @@ export default class Game extends InteractComponent{ ...@@ -466,7 +515,8 @@ export default class Game extends InteractComponent{
return (distance - 100) / this.toolTs.height return (distance - 100) / this.toolTs.height
} }
private _startPoint:Array<number> private _startPoint: Array<number>
private makeLineInGameCenter(tool) { private makeLineInGameCenter(tool) {
const ts: Transform = tool.getComponent(Transform) const ts: Transform = tool.getComponent(Transform)
const global = ts.globalPosition const global = ts.globalPosition
...@@ -532,44 +582,6 @@ export default class Game extends InteractComponent{ ...@@ -532,44 +582,6 @@ export default class Game extends InteractComponent{
return this.hitEdge(x => a * x + local.y, y => (y - local.y) / a) return this.hitEdge(x => a * x + local.y, y => (y - local.y) / a)
} }
private initElement(entity, left, top, width, height) {
const tl = entity.getComponent(RelativeLayout)
const ts = entity.getComponent(Transform)
let thisWidth = Math.floor(ts.width * ts.scale.x)
let thisHeight = Math.floor(ts.height * ts.scale.y)
const padding = 30
let thisLeft = generateRandomDistance(left, width - thisWidth - padding)
let thisTop = generateRandomDistance(top, height - thisHeight - padding)
if (height <= 0) {
ts.scale.x = entity.min
ts.scale.y = entity.min
thisTop = top
thisWidth = Math.floor(ts.width * entity.min)
thisHeight = Math.floor(ts.height * entity.min)
}
if (width <= 0) {
thisLeft = left
}
tl.left = thisLeft
tl.top = thisTop
return {
left: thisLeft,
top: thisTop,
width: thisWidth,
height: thisHeight,
sx: ts.scale.x,
sy: ts.scale.y,
entity,
type: !!entity.getComponent(Treasure) ? ElementType.Treasure : ElementType.Stone,
index: this.elementList.length
}
}
private hitTreasure({entity}) { private hitTreasure({entity}) {
const _ts = entity.getComponent(Transform) const _ts = entity.getComponent(Transform)
const locationTs = this.Detail.getComponent(Transform) const locationTs = this.Detail.getComponent(Transform)
...@@ -639,7 +651,7 @@ export default class Game extends InteractComponent{ ...@@ -639,7 +651,7 @@ export default class Game extends InteractComponent{
private hitEdge(funcFromX, funcFromY) { private hitEdge(funcFromX, funcFromY) {
const {width, height} = this.BoxContainer.getComponent(Transform) const {width, height} = this.BoxContainer.getComponent(Transform)
const left = - width / 2 const left = -width / 2
const right = -1 * left const right = -1 * left
const bottom = height / 2 const bottom = height / 2
const top = -1 * bottom const top = -1 * bottom
...@@ -709,9 +721,10 @@ function drawTestCircle(entity, left, top, color) { ...@@ -709,9 +721,10 @@ function drawTestCircle(entity, left, top, color) {
// entity.addChild(en) // entity.addChild(en)
} }
function lineLeft (x1, y1, x2, y2, a, b) { function lineLeft(x1, y1, x2, y2, a, b) {
return ((x1 * y2 - x2 * y1) / (x1 - x2) - b) / ((a - ((y2 - y1) / (x2 - x1)))) return ((x1 * y2 - x2 * y1) / (x1 - x2) - b) / ((a - ((y2 - y1) / (x2 - x1))))
} }
function lineRight (x1, y1, x2, y2, a, b) {
function lineRight(x1, y1, x2, y2, a, b) {
return (b - ((x2 * y2 - x1 * y1) / (x2 - x1))) / ((y2 - y1) / (x1 - x2) - a) return (b - ((x2 * y2 - x1 * y1) / (x2 - x1))) / ((y2 - y1) / (x1 - x2) - a)
} }
...@@ -37,17 +37,19 @@ export default class Stone extends ScillaComponent { ...@@ -37,17 +37,19 @@ export default class Stone extends ScillaComponent {
this.entity = entity this.entity = entity
this.ts = new Transform() this.ts = new Transform()
this.tx = new TextureRenderer() this.tx = new TextureRenderer()
this.rl = new RelativeLayout() //this.rl = new RelativeLayout()
this.entity.addComponent(this.ts) this.entity.addComponent(this.ts)
this.entity.addComponent(this.tx) this.entity.addComponent(this.tx)
this.entity.addComponent(this.rl) //this.entity.addComponent(this.rl)
const scale = generateRandomScale(num) const scale = generateRandomScale(num)
this.ts.scale.setXY(scale, scale) this.ts.scale.setXY(scale, scale)
this.rl.once = false //this.rl.once = false
this.tx.texture = texture this.tx.texture = texture
this.tx.measureBounds();
//this.tx.anchor.setXY(0, 0);
this.entity.min = Scale[`min${num}`] this.entity.min = Scale[`min${num}`]
} }
......
...@@ -37,17 +37,19 @@ export default class Treasure extends ScillaComponent { ...@@ -37,17 +37,19 @@ export default class Treasure extends ScillaComponent {
this.entity = entity this.entity = entity
this.ts = new Transform() this.ts = new Transform()
this.tx = new TextureRenderer() this.tx = new TextureRenderer()
this.rl = new RelativeLayout() //this.rl = new RelativeLayout()
this.entity.addComponent(this.ts) this.entity.addComponent(this.ts)
this.entity.addComponent(this.tx) this.entity.addComponent(this.tx)
this.entity.addComponent(this.rl) //this.entity.addComponent(this.rl)
const scale = generateRandomScale(num) const scale = generateRandomScale(num)
this.ts.scale.setXY(scale, scale) this.ts.scale.setXY(scale, scale)
this.rl.once = false //this.rl.once = false
this.tx.texture = texture this.tx.texture = texture
this.tx.measureBounds();
//this.tx.anchor.setXY(0, 0);
this.entity.min = Scale[`min${num}`] this.entity.min = Scale[`min${num}`]
} }
......
import ScillaComponent from 'components/base/ScillaComponent'; import ScillaComponent from 'components/base/ScillaComponent';
import { Entity, createTween, killTweens, dynamic, engine, resource, instantiate, dataCenter, color, ScillaEvent, LocalStorage } from 'scilla'; import {
Entity,
createTween,
killTweens,
dynamic,
engine,
resource,
instantiate,
dataCenter,
color,
ScillaEvent,
LocalStorage
} from 'scilla';
import Toast from 'components/other/Toast'; import Toast from 'components/other/Toast';
import Game from '../game/Game'; import Game from '../game/Game';
import Transform from 'components/base/Transform'; import Transform from 'components/base/Transform';
...@@ -11,10 +23,10 @@ import TextRenderer from 'components/renderer/TextRenderer'; ...@@ -11,10 +23,10 @@ import TextRenderer from 'components/renderer/TextRenderer';
import HtmlRenderer from 'components/renderer/HtmlRenderer'; import HtmlRenderer from 'components/renderer/HtmlRenderer';
import Popup from 'components/other/Popup'; import Popup from 'components/other/Popup';
import Tips from '../dialog/Tips'; import Tips from '../dialog/Tips';
import BuriedPoint, { initEnv } from '../utils/BuriedPoint'; import BuriedPoint, {initEnv} from '../utils/BuriedPoint';
engine.dataCenter.register('CFG') engine.dataCenter.register('CFG')
engine.dataCenter.set('CFG', window['CFG']) engine.dataCenter.setBatch('CFG', window['CFG'])
enum ActStatus { enum ActStatus {
before, before,
...@@ -74,18 +86,24 @@ export default class start extends ScillaComponent { ...@@ -74,18 +86,24 @@ export default class start extends ScillaComponent {
private loginStatus: boolean = false private loginStatus: boolean = false
onCreate() {
super.onCreate();
init() {
this.popup = this.DialogContainer.getComponent(Popup) this.popup = this.DialogContainer.getComponent(Popup)
engine.dataCenter.set('CFG', 'appId', this.homeInfo.appId)
engine.dataCenter.set('CFG', 'oaId', engine.dataCenter.get('CFG', 'opId'))
if (navigator.userAgent.match(/iphone|ipad/gi)) { if (navigator.userAgent.match(/iphone|ipad/gi)) {
this.Apple.enabled = true this.Apple.enabled = true
} }
initEnv() initEnv()
}
init() {
try { try {
engine.dataCenter.set('CFG', 'appId', this.homeInfo.appId)
engine.dataCenter.set('CFG', 'oaId', engine.dataCenter.get('CFG', 'opId'))
const config = JSON.parse(this.homeInfo.interfaceConfig) const config = JSON.parse(this.homeInfo.interfaceConfig)
console.log(config) console.log(config)
engine.dataCenter.register('custom') engine.dataCenter.register('custom')
...@@ -114,8 +132,10 @@ export default class start extends ScillaComponent { ...@@ -114,8 +132,10 @@ export default class start extends ScillaComponent {
return return
} }
this.game.setDetail(0, false, () => {}, this.homeInfo.box) this.game.setDetail(0, false, () => {
this.game.countDown(this.homeInfo.continueTime, this.homeInfo.continueTime, () => {}) }, this.homeInfo.box)
this.game.countDown(this.homeInfo.continueTime, this.homeInfo.continueTime, () => {
})
this.game.setTitle(true, false, this.homeInfo.credits, this.homeInfo.unit, this.homeInfo.remainedLimitTimes === null ? this.homeInfo.remainedFreeTimes : Math.min(this.homeInfo.remainedFreeTimes, this.homeInfo.remainedLimitTimes)) this.game.setTitle(true, false, this.homeInfo.credits, this.homeInfo.unit, this.homeInfo.remainedLimitTimes === null ? this.homeInfo.remainedFreeTimes : Math.min(this.homeInfo.remainedFreeTimes, this.homeInfo.remainedLimitTimes))
this.game.init() this.game.init()
...@@ -132,19 +152,31 @@ export default class start extends ScillaComponent { ...@@ -132,19 +152,31 @@ export default class start extends ScillaComponent {
this.loginStatus = this.homeInfo && this.homeInfo.login this.loginStatus = this.homeInfo && this.homeInfo.login
if (!(this.homeInfo && this.homeInfo.login) || force) { if (!(this.homeInfo && this.homeInfo.login) || force) {
const btn = this.UnLogin.getChildrenByName('Button')[0] const btn = this.UnLogin.getChildrenByName('Button')[0]
if (typeof window['requireLogin'] !== 'function' && !this.homeInfo.loginUrl) { /*if (typeof window['requirelogin'] !== 'function' && !this.homeInfo.loginUrl) {
btn.children[0].getComponent(TextRenderer).text = '知道啦' btn.children[0].getComponent(TextRenderer).text = '知道啦'
} else { } else {
const btnc = btn.getComponent(Button) const btnc = btn.getComponent(Button)
const click = new ScillaEvent() const click = new ScillaEvent()
click.addListener(() => { click.addListener(() => {
if (typeof window['requireLogin'] === 'function') { if (typeof window['requirelogin'] === 'function') {
window['requireLogin']() window['requirelogin']()
} else { } else {
location.href = this.homeInfo.loginUrl location.href = this.homeInfo.loginUrl
} }
}) })
btnc.onClick = click btnc.onClick = click
}*/
if (typeof window['requirelogin'] !== 'function') {
btn.children[0].getComponent(TextRenderer).text = '知道啦'
} else {
const btnc = btn.getComponent(Button)
const click = new ScillaEvent()
click.addListener(() => {
if (typeof window['requirelogin'] === 'function') {
window['requirelogin']()
}
})
btnc.onClick = click
} }
this.callOnNextTick(() => this.popup.showDialog('UnLogin')) this.callOnNextTick(() => this.popup.showDialog('UnLogin'))
return false return false
...@@ -169,9 +201,9 @@ export default class start extends ScillaComponent { ...@@ -169,9 +201,9 @@ export default class start extends ScillaComponent {
return false return false
} }
if (+ new Date() < this.homeInfo.startTime) { if (+new Date() < this.homeInfo.startTime) {
this.actStatus = ActStatus.before this.actStatus = ActStatus.before
} else if (+ new Date() < this.homeInfo.endTime) { } else if (+new Date() < this.homeInfo.endTime) {
this.actStatus = ActStatus.running this.actStatus = ActStatus.running
} else { } else {
this.actStatus = ActStatus.after this.actStatus = ActStatus.after
...@@ -249,26 +281,26 @@ export default class start extends ScillaComponent { ...@@ -249,26 +281,26 @@ export default class start extends ScillaComponent {
this.handle.enabled = true this.handle.enabled = true
createTween(this, this.handleTs, true, {loop: -1}) createTween(this, this.handleTs, true, {loop: -1})
.set({ opacity: 0, scale: {x: 1, y: 1}}) .set({opacity: 0, scale: {x: 1, y: 1}})
.to({ opacity: 1 }, 100) .to({opacity: 1}, 100)
.to({ scale: {x: 0.8, y:0.8}}, 100) .to({scale: {x: 0.8, y: 0.8}}, 100)
.to({ scale: {x: 1, y: 1}}, 100) .to({scale: {x: 1, y: 1}}, 100)
.wait(330) .wait(330)
createTween(this, this.circleOneTs, true, {loop: -1}) createTween(this, this.circleOneTs, true, {loop: -1})
.set({ alpha: 0, scale: {x: 0.5, y: 0.5} }) .set({alpha: 0, scale: {x: 0.5, y: 0.5}})
.wait(200) .wait(200)
.set({ alpha: 1 }) .set({alpha: 1})
.to({ scale: {x: 1.1, y: 1.1} }, 133) .to({scale: {x: 1.1, y: 1.1}}, 133)
.to({ scale: {x: 1.5, y: 1.5}, alpha: 0 }, 67) .to({scale: {x: 1.5, y: 1.5}, alpha: 0}, 67)
.wait(230) .wait(230)
createTween(this, this.circleTwoTs, true, {loop: -1}) createTween(this, this.circleTwoTs, true, {loop: -1})
.set({ alpha: 0, scale: {x: 0.5, y: 0.5} }) .set({alpha: 0, scale: {x: 0.5, y: 0.5}})
.wait(300) .wait(300)
.set({ alpha: 1 }) .set({alpha: 1})
.to({ scale: {x: 1.1, y: 1.1} }, 133) .to({scale: {x: 1.1, y: 1.1}}, 133)
.to({ scale: {x: 1.5, y: 1.5}, alpha: 0 }, 67) .to({scale: {x: 1.5, y: 1.5}, alpha: 0}, 67)
.wait(130) .wait(130)
} }
......
{
"ver": "1.0.1",
"uuid": "8ad59445-0ff2-4382-bb1c-9f7a07845e48",
"subMetas": {
"logo": {
"ver": "1.0.1",
"uuid": "c4c4d4b8-5178-4468-9460-c95435abefb8",
"rawTextureUuid": "8ad59445-0ff2-4382-bb1c-9f7a07845e48",
"type": "texture"
}
},
"type": "texture",
"imagePath": "/Users/rockyl/WorkSpaces/scilla/hello-scilla/assets/singles/logo.png"
}
This diff is collapsed.
This diff is collapsed.
/Users/firefly/.scilla/components
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
{
"name": "rewardsItem",
"root": {
"uuid": "20190301114308",
"components": [
{
"script": "components/base/Transform"
}
],
"children": [
{
"uuid": "20190301114245",
"name": "rewardsItem",
"components": [
{
"script": "components/base/Transform",
"properties": {}
},
{
"script": "components/renderer/TextureRenderer",
"properties": {
"texture": "res|e9d32c40-aa0e-4929-aa5f-80c4c69631ce"
}
},
{
"script": "components/other/RelativeLayout",
"properties": {
"top": 50
}
}
],
"children": [
{
"name": "Image",
"components": [
{
"script": "components/base/Transform",
"properties": {
"width": 120,
"height": 120,
"position": {
"y": -5,
"_type_": "scilla/support/Vector2D"
}
}
},
{
"script": "components/renderer/TextureRenderer",
"properties": {}
}
],
"uuid": "db23b51e-34b2-4bc2-b47f-7f1b2fbc021d"
}
]
}
]
}
}
\ No newline at end of file
This diff is collapsed.
{
"file": "config.png",
"frames": {
"front.png": {
"x": 1,
"y": 1,
"w": 750,
"h": 178,
"offX": 0,
"offY": 0,
"sourceW": 750,
"sourceH": 178
},
"banner.png": {
"x": 1,
"y": 181,
"w": 468,
"h": 172,
"offX": 0,
"offY": 0,
"sourceW": 468,
"sourceH": 172
},
"treasure.png": {
"x": 471,
"y": 181,
"w": 187,
"h": 200,
"offX": 0,
"offY": 0,
"sourceW": 187,
"sourceH": 200
},
"tips-bg.png": {
"x": 1,
"y": 355,
"w": 298,
"h": 59,
"offX": 0,
"offY": 0,
"sourceW": 298,
"sourceH": 59
},
"stone.png": {
"x": 301,
"y": 355,
"w": 128,
"h": 100,
"offX": 0,
"offY": 0,
"sourceW": 128,
"sourceH": 100
},
"reward.png": {
"x": 1,
"y": 416,
"w": 99,
"h": 34,
"offX": 0,
"offY": 0,
"sourceW": 99,
"sourceH": 34
},
"rule.png": {
"x": 102,
"y": 416,
"w": 99,
"h": 34,
"offX": 0,
"offY": 0,
"sourceW": 99,
"sourceH": 34
}
}
}
\ No newline at end of file
{
"file": "dialog.png",
"frames": {
"btnBg.png": {
"x": 1,
"y": 1,
"w": 452,
"h": 94,
"offX": 0,
"offY": 0,
"sourceW": 452,
"sourceH": 94
},
"close.png": {
"x": 1,
"y": 97,
"w": 49,
"h": 49,
"offX": 0,
"offY": 0,
"sourceW": 49,
"sourceH": 49
}
}
}
\ No newline at end of file
{
"file": "start.png",
"frames": {
"rewardsBg.png": {
"x": 1,
"y": 1,
"w": 750,
"h": 315,
"offX": 0,
"offY": 0,
"sourceW": 750,
"sourceH": 315
},
"startBtn.png": {
"x": 1,
"y": 318,
"w": 258,
"h": 111,
"offX": 0,
"offY": 0,
"sourceW": 258,
"sourceH": 111
},
"rewards-item.png": {
"x": 261,
"y": 318,
"w": 183,
"h": 157,
"offX": 0,
"offY": 0,
"sourceW": 183,
"sourceH": 157
},
"handle.png": {
"x": 1,
"y": 431,
"w": 104,
"h": 88,
"offX": 0,
"offY": 0,
"sourceW": 104,
"sourceH": 88
},
"tool.png": {
"x": 107,
"y": 431,
"w": 64,
"h": 815,
"offX": 35,
"offY": 15,
"sourceW": 134,
"sourceH": 845
},
"circle.png": {
"x": 173,
"y": 431,
"w": 57,
"h": 57,
"offX": 0,
"offY": 0,
"sourceW": 57,
"sourceH": 57
}
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>minner-tool</title>
<meta name="viewport"
content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="full-screen" content="true"/>
<meta name="screen-orientation" content="portrait"/>
<meta name="x5-fullscreen" content="true"/>
<meta name="360-fullscreen" content="true"/>
<style>
html, body {
padding: 0;
margin: 0;
border: 0;
height: 100%;
background-color: #282C34;
}
#floatLayer * {
margin: 0;
padding: 0;
}
</style>
</head>
<body>
<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
<script>
var CFG = {
opId: 123
}
</script>
<script src="bundle.js"></script>
<script>
setTimeout(function(){
var options = window['inputOptions'] || {};
window['minner-tool'].startup(document.getElementById('gameContainer'), options);
}, 100);
</script>
</body>
</html>
{
"name": "minner-tool",
"engineConfig": {
"fps": 60,
"designWidth": 750,
"designHeight": 1334,
"scaleMode": "fixedWidth",
"modifyCanvasSize": false,
"resPath": ""
},
"customConfig": {
"scene": {
"scenes": {
"main": "scenes/main.scene"
},
"entryScene": "main"
},
"webServiceUrl": "http://localhost:4001"
},
"dataCenterConfig": {
"dataCenterRoot": [
"API",
"CFG"
]
},
"projectUuid": "1ea735b4-a8cc-49e8-b2f6-24d9d29468ab"
}
{
"name": "rewardsItem",
"root": {
"uuid": "20190301114308",
"components": [
{
"script": "components/base/Transform"
}
],
"children": [
{
"uuid": "20190301114245",
"name": "rewardsItem",
"components": [
{
"script": "components/base/Transform",
"properties": {}
},
{
"script": "components/renderer/TextureRenderer",
"properties": {
"texture": "res|e9d32c40-aa0e-4929-aa5f-80c4c69631ce"
}
},
{
"script": "components/other/RelativeLayout",
"properties": {
"top": 50
}
}
],
"children": [
{
"name": "Image",
"components": [
{
"script": "components/base/Transform",
"properties": {
"width": 120,
"height": 120,
"position": {
"y": -5,
"_type_": "scilla/support/Vector2D"
}
}
},
{
"script": "components/renderer/TextureRenderer",
"properties": {}
}
],
"uuid": "db23b51e-34b2-4bc2-b47f-7f1b2fbc021d"
}
]
}
]
}
}
\ No newline at end of file
This diff is collapsed.
{
"file": "config.png",
"frames": {
"front.png": {
"x": 1,
"y": 1,
"w": 750,
"h": 178,
"offX": 0,
"offY": 0,
"sourceW": 750,
"sourceH": 178
},
"banner.png": {
"x": 1,
"y": 181,
"w": 468,
"h": 172,
"offX": 0,
"offY": 0,
"sourceW": 468,
"sourceH": 172
},
"treasure.png": {
"x": 471,
"y": 181,
"w": 187,
"h": 200,
"offX": 0,
"offY": 0,
"sourceW": 187,
"sourceH": 200
},
"tips-bg.png": {
"x": 1,
"y": 355,
"w": 298,
"h": 59,
"offX": 0,
"offY": 0,
"sourceW": 298,
"sourceH": 59
},
"stone.png": {
"x": 301,
"y": 355,
"w": 128,
"h": 100,
"offX": 0,
"offY": 0,
"sourceW": 128,
"sourceH": 100
},
"reward.png": {
"x": 1,
"y": 416,
"w": 99,
"h": 34,
"offX": 0,
"offY": 0,
"sourceW": 99,
"sourceH": 34
},
"rule.png": {
"x": 102,
"y": 416,
"w": 99,
"h": 34,
"offX": 0,
"offY": 0,
"sourceW": 99,
"sourceH": 34
}
}
}
\ No newline at end of file
{
"file": "dialog.png",
"frames": {
"btnBg.png": {
"x": 1,
"y": 1,
"w": 452,
"h": 94,
"offX": 0,
"offY": 0,
"sourceW": 452,
"sourceH": 94
},
"close.png": {
"x": 1,
"y": 97,
"w": 49,
"h": 49,
"offX": 0,
"offY": 0,
"sourceW": 49,
"sourceH": 49
}
}
}
\ No newline at end of file
{
"file": "start.png",
"frames": {
"rewardsBg.png": {
"x": 1,
"y": 1,
"w": 750,
"h": 315,
"offX": 0,
"offY": 0,
"sourceW": 750,
"sourceH": 315
},
"startBtn.png": {
"x": 1,
"y": 318,
"w": 258,
"h": 111,
"offX": 0,
"offY": 0,
"sourceW": 258,
"sourceH": 111
},
"rewards-item.png": {
"x": 261,
"y": 318,
"w": 183,
"h": 157,
"offX": 0,
"offY": 0,
"sourceW": 183,
"sourceH": 157
},
"handle.png": {
"x": 1,
"y": 431,
"w": 104,
"h": 88,
"offX": 0,
"offY": 0,
"sourceW": 104,
"sourceH": 88
},
"tool.png": {
"x": 107,
"y": 431,
"w": 64,
"h": 815,
"offX": 35,
"offY": 15,
"sourceW": 134,
"sourceH": 845
},
"circle.png": {
"x": 173,
"y": 431,
"w": 57,
"h": 57,
"offX": 0,
"offY": 0,
"sourceW": 57,
"sourceH": 57
}
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>minner-tool</title>
<meta name="viewport"
content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="full-screen" content="true"/>
<meta name="screen-orientation" content="portrait"/>
<meta name="x5-fullscreen" content="true"/>
<meta name="360-fullscreen" content="true"/>
<style>
html, body {
padding: 0;
margin: 0;
border: 0;
height: 100%;
background-color: #282C34;
}
#floatLayer * {
margin: 0;
padding: 0;
}
</style>
</head>
<body>
<div id="gameContainer" style="width: 100%;height: 100%;overflow: hidden;"></div>
<script>
var CFG = {
opId: 123
}
</script>
<script src="bundle.js"></script>
<script>
setTimeout(function(){
var options = window['inputOptions'] || {};
window['minner-tool'].startup(document.getElementById('gameContainer'), options);
}, 100);
</script>
</body>
</html>
{
"name": "minner-tool",
"engineConfig": {
"fps": 60,
"designWidth": 750,
"designHeight": 1334,
"scaleMode": "fixedWidth",
"modifyCanvasSize": false,
"resPath": ""
},
"customConfig": {
"scene": {
"scenes": {
"main": "scenes/main.scene"
},
"entryScene": "main"
},
"webServiceUrl": "http://localhost:4001"
},
"dataCenterConfig": {
"dataCenterRoot": [
"API",
"CFG"
]
},
"projectUuid": "1ea735b4-a8cc-49e8-b2f6-24d9d29468ab"
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"file": "dialog.png",
"frames": {
"btnBg.png": {
"x": 1,
"y": 1,
"w": 452,
"h": 94,
"offX": 0,
"offY": 0,
"sourceW": 452,
"sourceH": 94
},
"close.png": {
"x": 1,
"y": 97,
"w": 49,
"h": 49,
"offX": 0,
"offY": 0,
"sourceW": 49,
"sourceH": 49
}
}
}
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
{
"name": "minner-tool",
"engineConfig": {
"fps": 60,
"designWidth": 750,
"designHeight": 1334,
"scaleMode": "fixedWidth",
"modifyCanvasSize": false,
"resPath": ""
},
"customConfig": {
"scene": {
"scenes": {
"main": "scenes/main.scene"
},
"entryScene": "main"
},
"webServiceUrl": ""
},
"dataCenterConfig": {
"dataCenterRoot": [
"API",
"CFG",
"custom"
]
},
"projectUuid": "1ea735b4-a8cc-49e8-b2f6-24d9d29468ab"
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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