Commit f3911585 authored by 李维's avatar 李维

dev commit

parent 2bd86de7
This diff is collapsed.
...@@ -151,7 +151,6 @@ export default class Cartoon { ...@@ -151,7 +151,6 @@ export default class Cartoon {
subscribeTouchEvent(key, callBack, newEvent) { subscribeTouchEvent(key, callBack, newEvent) {
if(!this.touchEventCallback[key] || newEvent) { if(!this.touchEventCallback[key] || newEvent) {
this.touchEventCallback[key] = callBack this.touchEventCallback[key] = callBack
console.log("DVDVDV", this.elements[key].node)
this.elements[key].node.off(cc.Node.EventType.TOUCH_START) this.elements[key].node.off(cc.Node.EventType.TOUCH_START)
this.elements[key].node.on(cc.Node.EventType.TOUCH_START, ()=>{ this.elements[key].node.on(cc.Node.EventType.TOUCH_START, ()=>{
if(this.touchEventCallback[key]) { if(this.touchEventCallback[key]) {
......
This diff is collapsed.
...@@ -132,3 +132,15 @@ export function btnClickAnima(btn, time=0.15, rate=1.05) { ...@@ -132,3 +132,15 @@ export function btnClickAnima(btn, time=0.15, rate=1.05) {
.start() .start()
}) })
} }
export function onHomeworkFinish() {
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer');
if (middleLayerComponent.role == 'student') {
middleLayerComponent.onHomeworkFinish(() => { });
}
} else {
console.log('onHomeworkFinish');
}
}
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "a0fb37da-d793-4eb6-80e4-ccec20a63bbb", "uuid": "3f83a6a1-d6df-485e-b389-5baa1f868390",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
"height": 101, "height": 101,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"speaker": { "speaker_0": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "570d2e53-3fbf-4959-9333-0d2a16b136db", "uuid": "4a47635c-e5dd-469d-9655-13378bc366a1",
"rawTextureUuid": "a0fb37da-d793-4eb6-80e4-ccec20a63bbb", "rawTextureUuid": "3f83a6a1-d6df-485e-b389-5baa1f868390",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{
"ver": "2.3.5",
"uuid": "4afa6af5-0247-4b0b-84cb-ca73c43da096",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 95,
"height": 101,
"platformSettings": {},
"subMetas": {
"speaker_1": {
"ver": "1.0.4",
"uuid": "24a58311-9794-4337-8251-638dd476ff9c",
"rawTextureUuid": "4afa6af5-0247-4b0b-84cb-ca73c43da096",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 95,
"height": 101,
"rawWidth": 95,
"rawHeight": 101,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "b44918f4-0131-4676-9a71-870c316d5b2d",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 95,
"height": 101,
"platformSettings": {},
"subMetas": {
"speaker_2": {
"ver": "1.0.4",
"uuid": "780e7ebc-11dc-4e03-b0b3-f7f21ea25534",
"rawTextureUuid": "b44918f4-0131-4676-9a71-870c316d5b2d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 95,
"height": 101,
"rawWidth": 95,
"rawHeight": 101,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "1011b81a-caf7-4afa-b8a9-445d3eeadb7c",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 95,
"height": 101,
"platformSettings": {},
"subMetas": {
"speaker_3": {
"ver": "1.0.4",
"uuid": "d94751b4-dfc9-4597-806e-6c315f7d3e75",
"rawTextureUuid": "1011b81a-caf7-4afa-b8a9-445d3eeadb7c",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 95,
"height": 101,
"rawWidth": 95,
"rawHeight": 101,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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