Commit f6a7549d authored by 陈子煜's avatar 陈子煜

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	profiles/v2/packages/builder.json
parents c260e295 9c66311d
......@@ -193,7 +193,7 @@
"_priority": 1073741824,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 850.9565217391305,
"_orthoHeight": 726.1043723554302,
"_near": 1,
"_far": 2000,
"_color": {
......@@ -7233,7 +7233,7 @@
"a": 255
},
"_spriteFrame": {
"__uuid__": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@f9941",
"__uuid__": "3b9d059e-f51b-4857-a379-b4d2f2614914@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
......
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@6c48a",
"displayName": "change-sliver",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@f9941",
"displayName": "change-sliver",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0.5,
"offsetY": 1,
"trimX": 32,
"trimY": 32,
"width": 137,
"height": 134,
"rawWidth": 200,
"rawHeight": 200,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-68.5,
-67,
0,
68.5,
-67,
0,
-68.5,
67,
0,
68.5,
67,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
32,
168,
169,
168,
32,
34,
169,
34
],
"nuv": [
0.16,
0.17,
0.845,
0.17,
0.16,
0.84,
0.845,
0.84
],
"minPos": [
-68.5,
-67,
0
],
"maxPos": [
68.5,
67,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "268d191c-2e4e-4a0e-a8c1-2cfb873c3fd7@6c48a"
}
}
......@@ -238,7 +238,7 @@
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
......
{"ver":"1.0.8","importer":"auto-atlas","imported":true,"uuid":"e6d45b5c-bdb1-460b-af35-d4e04c4c8b13","files":[".json"],"subMetas":{},"userData":{"maxWidth":2048,"maxHeight":2048,"padding":2,"allowRotation":true,"forceSquared":false,"powerOfTwo":false,"algorithm":"MaxRects","format":"png","quality":80,"contourBleed":true,"paddingBleed":true,"filterUnused":false,"removeTextureInBundle":true,"removeImageInBundle":true,"removeSpriteAtlasInBundle":true,"compressSettings":{},"textureSetting":{"wrapModeS":"repeat","wrapModeT":"repeat","minfilter":"linear","magfilter":"linear","mipfilter":"none","anisotropy":0}}}
......@@ -33,8 +33,8 @@ export function hideToast() {
UIMgr.ins.hideToast();
}
export function showShareGuide() {
UIMgr.ins.showShareGuide();
export function showShareGuide(guideTxt = "") {
UIMgr.ins.showShareGuide(guideTxt);
}
export function hideShareGuide() {
......
......@@ -76,9 +76,9 @@ export class UIMgr {
this.toastBg = this.toast.getChildByName("bg");
this.toastLabel = this.toastBg.getChildByName("label");
this.showGuide = this.uiCanvas.getChildByName("ShareGuide");
this.shareGuide = this.uiCanvas.getChildByName("ShareGuide");
this.hideShareGuide();
this.showGuide.on(Button.EventType.CLICK, this.hideShareGuide, this);
this.shareGuide.on(Button.EventType.CLICK, this.hideShareGuide, this);
this.waiting.active = false;
this.toast.active = false;
......@@ -86,14 +86,16 @@ export class UIMgr {
/********* Share Guide *********/
showGuide: Node = null;
shareGuide: Node = null;
showShareGuide() {
this.showGuide.active = true;
showShareGuide(guideTxt = "") {
this.shareGuide.active = true;
this.shareGuide.getChildByName("label")
.getComponent(Label).string = guideTxt;
}
hideShareGuide() {
this.showGuide.active = false;
this.shareGuide.active = false;
}
/********* Share Guide *********/
......
......@@ -6,6 +6,7 @@ import gameStore from "../store/gameStore";
import { MainGame } from "../Scenes/MainGame/MainGame";
import { hideShareGuide, showShareGuide, showToast } from "../../Module/UIFast";
import { unwatchPageVisibility, watchPageVisibility } from "../Utils/pageVisibilityNotify";
import { UIMgr } from "../../Module/UIMgr";
const { ccclass, property } = _decorator;
......@@ -35,19 +36,19 @@ export default class GameRevivePanel extends Panel {
this.shareRevive.on(Button.EventType.CLICK, this.clickShare, this);
this.overBtn.on(Button.EventType.CLICK, this.clickOver, this);
watchPageVisibility(this.onPageVisibility);
// watchPageVisibility(this.onPageVisibility);
}
onDestroy() {
unwatchPageVisibility(this.onPageVisibility);
// unwatchPageVisibility(this.onPageVisibility);
}
onPageVisibility = (visible) => {
if (visible && this.isClickShare && !this.isReview) {
hideShareGuide();
this.review(3);
}
};
// onPageVisibility = (visible) => {
// if (visible && this.isClickShare && !this.isReview) {
// hideShareGuide();
// this.review(3);
// }
// };
async start() {
const {
......@@ -133,7 +134,13 @@ export default class GameRevivePanel extends Panel {
this.clickFlag = true;
this.isClickShare = true;
this.cd.stop();
showShareGuide();
showShareGuide("分享好友后,点击屏幕即可复活");
const clickGuide = () => {
UIMgr.ins.shareGuide.off(Button.EventType.CLICK, clickGuide, this);
hideShareGuide();
this.review(3);
};
UIMgr.ins.shareGuide.once(Button.EventType.CLICK, clickGuide, this);
}
......
......@@ -146,7 +146,7 @@ class Store {
async getTaskInfo() {
return await sendWebNetWithToken(WebNetName.taskList, {
return await sendWebNet(WebNetName.taskList, {
taskToken: getUrlParams("taskToken") || "123456",
});
}
......
......@@ -20,6 +20,7 @@ import store from "../Scripts/store/store";
import { getPreLoadList, preload } from "../Scripts/Utils/LoaderTools";
import { AudioMgr } from "../core_tgx/base/AudioMgr";
import shareStore from "../Scripts/store/shareStore";
import GetPrize from "../Scripts/Panels/GetPrize";
const { ccclass, property } = _decorator;
......@@ -92,6 +93,18 @@ export class Start extends Component{
path: "HomeScene",
type: "bundle",
},
{
path: "SnakeSkin",
type: "bundle",
},
{
path: "SignPanel",
type: "bundle",
},
{
path: "GetPrize",
type: "bundle",
},
{
path: "MainGame",
type: "bundle"
......
......@@ -28,26 +28,26 @@
"__id__": 24
},
{
"__id__": 52
"__id__": 58
},
{
"__id__": 82
"__id__": 88
}
],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 120
},
{
"__id__": 116
"__id__": 122
},
{
"__id__": 118
"__id__": 124
}
],
"_prefab": {
"__id__": 120
"__id__": 126
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -141,7 +141,7 @@
"_priority": 1073741824,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 884.5454545454546,
"_orthoHeight": 726.1043723554302,
"_near": 1,
"_far": 2000,
"_color": {
......@@ -553,25 +553,28 @@
},
{
"__id__": 35
},
{
"__id__": 43
}
],
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 49
},
{
"__id__": 45
"__id__": 51
},
{
"__id__": 47
"__id__": 53
},
{
"__id__": 49
"__id__": 55
}
],
"_prefab": {
"__id__": 51
"__id__": 57
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -673,7 +676,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1624,
"height": 749.9999999999999
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -779,7 +782,7 @@
"__prefab": {
"__id__": 33
},
"_opacity": 178.5,
"_opacity": 204,
"_id": ""
},
{
......@@ -974,6 +977,165 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
},
{
"__id__": 46
}
],
"_prefab": {
"__id__": 48
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 43
},
"_enabled": true,
"__prefab": {
"__id__": 45
},
"_contentSize": {
"__type__": "cc.Size",
"width": 700,
"height": 63
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "b8WmZBGZZKeaUdBsLUOKI8"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 43
},
"_enabled": true,
"__prefab": {
"__id__": 47
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "分享好友后,点击屏幕即可复活",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 50,
"_fontSize": 50,
"_fontFamily": "Arial",
"_lineHeight": 50,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": false,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_enableOutline": false,
"_outlineColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_outlineWidth": 2,
"_enableShadow": false,
"_shadowColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_shadowOffset": {
"__type__": "cc.Vec2",
"x": 2,
"y": 2
},
"_shadowBlur": 2,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "a1CLGSgrVAQKrEqTeeu79w"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "05jv2bZUxBu41yG2M/d5W2",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
......@@ -984,12 +1146,12 @@
},
"_enabled": true,
"__prefab": {
"__id__": 44
"__id__": 50
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1624,
"height": 749.9999999999999
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1012,7 +1174,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 46
"__id__": 52
},
"_alignFlags": 45,
"_target": null,
......@@ -1048,7 +1210,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 48
"__id__": 54
},
"_id": ""
},
......@@ -1066,7 +1228,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 50
"__id__": 56
},
"clickEvents": [],
"_interactable": true,
......@@ -1135,26 +1297,26 @@
},
"_children": [
{
"__id__": 53
"__id__": 59
},
{
"__id__": 61
"__id__": 67
}
],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 81
},
{
"__id__": 77
"__id__": 83
},
{
"__id__": 79
"__id__": 85
}
],
"_prefab": {
"__id__": 81
"__id__": 87
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1191,23 +1353,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 52
"__id__": 58
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 54
"__id__": 60
},
{
"__id__": 56
"__id__": 62
},
{
"__id__": 58
"__id__": 64
}
],
"_prefab": {
"__id__": 60
"__id__": 66
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1244,11 +1406,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 53
"__id__": 59
},
"_enabled": true,
"__prefab": {
"__id__": 55
"__id__": 61
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -1272,11 +1434,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 53
"__id__": 59
},
"_enabled": true,
"__prefab": {
"__id__": 57
"__id__": 63
},
"_alignFlags": 45,
"_target": null,
......@@ -1308,11 +1470,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 53
"__id__": 59
},
"_enabled": true,
"__prefab": {
"__id__": 59
"__id__": 65
},
"_id": ""
},
......@@ -1339,27 +1501,27 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 52
"__id__": 58
},
"_children": [
{
"__id__": 62
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 74
},
{
"__id__": 70
"__id__": 76
},
{
"__id__": 72
"__id__": 78
}
],
"_prefab": {
"__id__": 74
"__id__": 80
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1396,20 +1558,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 61
"__id__": 67
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 69
},
{
"__id__": 65
"__id__": 71
}
],
"_prefab": {
"__id__": 67
"__id__": 73
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1446,11 +1608,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 62
"__id__": 68
},
"_enabled": true,
"__prefab": {
"__id__": 64
"__id__": 70
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -1474,11 +1636,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 62
"__id__": 68
},
"_enabled": true,
"__prefab": {
"__id__": 66
"__id__": 72
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -1555,11 +1717,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 67
},
"_enabled": true,
"__prefab": {
"__id__": 69
"__id__": 75
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -1583,11 +1745,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 67
},
"_enabled": true,
"__prefab": {
"__id__": 71
"__id__": 77
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -1628,11 +1790,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 67
},
"_enabled": true,
"__prefab": {
"__id__": 73
"__id__": 79
},
"_resizeMode": 1,
"_layoutType": 3,
......@@ -1679,16 +1841,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 52
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 76
"__id__": 82
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1624,
"height": 749.9999999999999
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1707,11 +1869,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 52
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 78
"__id__": 84
},
"_alignFlags": 45,
"_target": null,
......@@ -1743,11 +1905,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 52
"__id__": 58
},
"_enabled": true,
"__prefab": {
"__id__": 80
"__id__": 86
},
"_opacity": 255,
"_id": ""
......@@ -1779,29 +1941,29 @@
},
"_children": [
{
"__id__": 83
},
{
"__id__": 91
"__id__": 89
},
{
"__id__": 97
},
{
"__id__": 103
},
{
"__id__": 109
}
],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 115
},
{
"__id__": 111
"__id__": 117
}
],
"_prefab": {
"__id__": 113
"__id__": 119
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1838,23 +2000,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 82
"__id__": 88
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 84
"__id__": 90
},
{
"__id__": 86
"__id__": 92
},
{
"__id__": 88
"__id__": 94
}
],
"_prefab": {
"__id__": 90
"__id__": 96
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1891,11 +2053,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 83
"__id__": 89
},
"_enabled": true,
"__prefab": {
"__id__": 85
"__id__": 91
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -1919,11 +2081,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 83
"__id__": 89
},
"_enabled": true,
"__prefab": {
"__id__": 87
"__id__": 93
},
"_alignFlags": 45,
"_target": null,
......@@ -1955,11 +2117,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 83
"__id__": 89
},
"_enabled": true,
"__prefab": {
"__id__": 89
"__id__": 95
},
"_id": ""
},
......@@ -1986,20 +2148,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 82
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 98
},
{
"__id__": 94
"__id__": 100
}
],
"_prefab": {
"__id__": 96
"__id__": 102
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -2036,11 +2198,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 91
"__id__": 97
},
"_enabled": true,
"__prefab": {
"__id__": 93
"__id__": 99
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -2064,11 +2226,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 91
"__id__": 97
},
"_enabled": true,
"__prefab": {
"__id__": 95
"__id__": 101
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -2122,20 +2284,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 82
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 104
},
{
"__id__": 100
"__id__": 106
}
],
"_prefab": {
"__id__": 102
"__id__": 108
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -2172,11 +2334,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 97
"__id__": 103
},
"_enabled": true,
"__prefab": {
"__id__": 99
"__id__": 105
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -2200,11 +2362,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 97
"__id__": 103
},
"_enabled": true,
"__prefab": {
"__id__": 101
"__id__": 107
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -2258,20 +2420,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 82
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 110
},
{
"__id__": 106
"__id__": 112
}
],
"_prefab": {
"__id__": 108
"__id__": 114
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -2308,11 +2470,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 103
"__id__": 109
},
"_enabled": true,
"__prefab": {
"__id__": 105
"__id__": 111
},
"_contentSize": {
"__type__": "cc.Size",
......@@ -2336,11 +2498,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 103
"__id__": 109
},
"_enabled": true,
"__prefab": {
"__id__": 107
"__id__": 113
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......@@ -2417,16 +2579,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 82
"__id__": 88
},
"_enabled": true,
"__prefab": {
"__id__": 110
"__id__": 116
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1624,
"height": 749.9999999999999
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2445,11 +2607,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 82
"__id__": 88
},
"_enabled": true,
"__prefab": {
"__id__": 112
"__id__": 118
},
"_alignFlags": 45,
"_target": null,
......@@ -2498,12 +2660,12 @@
},
"_enabled": true,
"__prefab": {
"__id__": 115
"__id__": 121
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1624,
"height": 749.9999999999999
"height": 750
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2526,7 +2688,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 117
"__id__": 123
},
"_cameraComponent": {
"__id__": 3
......@@ -2548,7 +2710,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 119
"__id__": 125
},
"_alignFlags": 45,
"_target": null,
......
......@@ -98,14 +98,14 @@
</style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/assets/plugin/rem.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/assets/plugin/rem.min.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/custom.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/custom.css" />-->
<!-- <script src="//yun-duiba-credits-test.duibatest.com.cn/TNGD_GAMES/libs/eruda.min.js"></script>-->
<!-- <script>eruda.init()</script>-->
......@@ -118,20 +118,20 @@
</div>
<!-- Polyfills bundle. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<script type="systemjs-importmap" charset="utf-8">
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/cocos-js/cc.js"}}
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/cocos-js/cc.js"}}
</script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733985135346/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733988264453/index.js').catch(function (err) {
console.error(err);
})
</script>
......
......@@ -45,8 +45,8 @@
"progress": 1,
"state": "success",
"stage": "build",
"message": "2024-12-12 12:38:18 build success in 1 min 23 s!",
"detailMessage": "%c兑吧发布插件 >> 版本号:1733978214944\rcolor: green\r",
"message": "2024-12-12 15:25:18 build success in 54 s!",
"detailMessage": "Asset DB is resume!\r",
"options": {
"name": "cocos-template-3d",
"server": "",
......@@ -109,7 +109,7 @@
"__version__": "1.3.8",
"logDest": "project://temp/builder/log/web-mobile2024-11-6 15-39.log"
},
"time": "2024-12-12 12:36:54",
"time": "2024-12-12 15:24:24",
"dirty": false
}
}
......
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