Skip to content

M
MingSnake_241120
Commit 6731e1ce authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

init

parent 89e2d8fa
Hide whitespace changes
Inline Side-by-side
Showing with 410 additions and 40 deletions
assets/Bundles/GameFailPanel/GameFailPanel.prefab
View file @ 6731e1ce
......@@ -38,7 +38,7 @@
}
],
"_prefab": {
"__id__": 27
"__id__": 28
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -543,6 +543,9 @@
"skinNodeArr": [
{
"__id__": 26
},
{
"__id__": 27
}
],
"_genSkinNode": true,
......@@ -583,6 +586,37 @@
"node1": null,
"node2": null
},
{
"__type__": "SkinNode",
"node": {
"__id__": 2
},
"type": 0,
"color1": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"color2": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"skin1": {
"__uuid__": "2b9bf088-f607-491b-bce8-c0b34ae9a7c3@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"skin2": {
"__uuid__": "63848bb9-dd40-451c-a382-0fa1ebf3c26b@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"node1": null,
"node2": null
},
{
"__type__": "cc.PrefabInfo",
"root": {
......
assets/Bundles/GameFailPanel/png/黄失败.png.meta 0 → 100644
View file @ 6731e1ce
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "63848bb9-dd40-451c-a382-0fa1ebf3c26b",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "63848bb9-dd40-451c-a382-0fa1ebf3c26b@6c48a",
"displayName": "黄失败",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "63848bb9-dd40-451c-a382-0fa1ebf3c26b",
"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": "63848bb9-dd40-451c-a382-0fa1ebf3c26b@f9941",
"displayName": "黄失败",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1624,
"height": 455,
"rawWidth": 1624,
"rawHeight": 455,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-812,
-227.5,
0,
812,
-227.5,
0,
-812,
227.5,
0,
812,
227.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
455,
1624,
455,
0,
0,
1624,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-812,
-227.5,
0
],
"maxPos": [
812,
227.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "63848bb9-dd40-451c-a382-0fa1ebf3c26b@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "63848bb9-dd40-451c-a382-0fa1ebf3c26b@6c48a"
}
}
assets/Bundles/RankPrizePanel/RankPrizePanel.prefab
View file @ 6731e1ce
......@@ -44,7 +44,7 @@
}
],
"_prefab": {
"__id__": 77
"__id__": 78
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -1759,6 +1759,9 @@
"skinNodeArr": [
{
"__id__": 76
},
{
"__id__": 77
}
],
"_genSkinNode": true,
......@@ -1799,6 +1802,37 @@
"node1": null,
"node2": null
},
{
"__type__": "SkinNode",
"node": {
"__id__": 2
},
"type": 0,
"color1": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"color2": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"skin1": {
"__uuid__": "493e7b97-56cd-46a5-80bd-6885b8861d61@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"skin2": {
"__uuid__": "5e1e2a81-14dc-496f-8097-ba4dd509d671@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"node1": null,
"node2": null
},
{
"__type__": "cc.PrefabInfo",
"root": {
......
assets/Bundles/RankPrizePanel/png/大横幅-排名奖励背景-很忙@1x.png.meta 0 → 100644
View file @ 6731e1ce
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "5e1e2a81-14dc-496f-8097-ba4dd509d671",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "5e1e2a81-14dc-496f-8097-ba4dd509d671@6c48a",
"displayName": "大横幅-排名奖励背景-很忙@1x",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "5e1e2a81-14dc-496f-8097-ba4dd509d671",
"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": "5e1e2a81-14dc-496f-8097-ba4dd509d671@f9941",
"displayName": "大横幅-排名奖励背景-很忙@1x",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1624,
"height": 455,
"rawWidth": 1624,
"rawHeight": 455,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-812,
-227.5,
0,
812,
-227.5,
0,
-812,
227.5,
0,
812,
227.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
455,
1624,
455,
0,
0,
1624,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-812,
-227.5,
0
],
"maxPos": [
812,
227.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "5e1e2a81-14dc-496f-8097-ba4dd509d671@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "5e1e2a81-14dc-496f-8097-ba4dd509d671@6c48a"
}
}
assets/Module/UIFast.ts
View file @ 6731e1ce
import { UIMgr } from "db://assets/Module/UIMgr";
import Scene from "db://assets/Module/Scene";
export async function changeScene(cls: typeof Scene, data?: any) {
export async function changeScene(cls: typeof Scene, data: any = {}) {
await UIMgr.ins.changeScene(cls, data);
}
export async function backScene(data: any = {}) {
await UIMgr.ins.backScene(data);
}
export async function showPanel(cls: any, data: any = {}, showMask: boolean = true) {
await UIMgr.ins.showPanel(cls, data, showMask);
}
......
assets/Module/UIMgr.ts
View file @ 6731e1ce
......@@ -146,6 +146,18 @@ export class UIMgr {
await Promise.all(loadPs);
}
sceneStack: (typeof Scene)[] = [];
async backScene(data: any = {}) {
console.log(this.sceneStack);
if (this.sceneStack.length <= 1) {
return;
}
this.sceneStack.pop();
const cls = this.sceneStack.pop();
await this.changeScene(cls, data);
}
async changeScene(cls: typeof Scene, data: any = {}) {
const { skin, group = skin, bundle } = cls;
......@@ -177,6 +189,8 @@ export class UIMgr {
this.showWaiting();
await Promise.all(loadPs);
this.sceneStack.push(cls);
director.loadScene(
skin,
(err, scene) => {
......
assets/Scripts/Scenes/BlessingBagPage.ts
View file @ 6731e1ce
......@@ -2,7 +2,7 @@ import {_decorator, Button, instantiate, Label, math, Node, Prefab, Sprite} from
import Scene from "db://assets/Module/Scene";
import {observer, render} from "../store/decorators";
import {sendWebNet, sendWebNetWithToken, WebNetName} from "db://assets/Scripts/Utils/WebNet/WebNet";
import {changeScene, showPanel, showShareGuide, showToast} from "db://assets/Module/UIFast";
import { backScene, changeScene, showPanel, showShareGuide, showToast } from "db://assets/Module/UIFast";
import {HomeScene} from "db://assets/Scripts/Scenes/HomeScene";
import {getUrlParams} from "../Utils/WebNet/web/webTools";
import OpenLuckyPanel from "../Panels/OpenLuckyPanel";
......@@ -10,6 +10,7 @@ import shareStore from "../store/shareStore";
import GetPrize from "db://assets/Scripts/Panels/GetPrize";
import store from "../store/store";
import { VList } from "../../Test/VList";
import { _asyncThrottle } from "../Utils/Utils";
const {ccclass, property} = _decorator;
......@@ -199,9 +200,10 @@ export class BlessingBagPage extends Scene {
}
// 点击返回按钮
backbtn() {
changeScene(HomeScene)
}
backbtn = _asyncThrottle(async () => {
// changeScene(HomeScene)
await backScene();
});
//银福袋按钮
silverBag() {
......@@ -322,16 +324,29 @@ export class BlessingBagPage extends Scene {
if (jumpUrl.indexOf("http") > -1) {
window.location.href = jumpUrl
} else {
// @ts-ignore
wx.miniProgram.navigateTo({
url: `${jumpUrl}?taskId=${getUrlParams("taskToken")}`,
success: () => {
console.log("跳转成功");
},
fail: (e) => {
console.error("跳转失败", e);
}
});
if (jumpUrl.indexOf("new-year-festival") > -1) {
// @ts-ignore
wx.miniProgram.switchTab({
url: `${jumpUrl}?taskId=${getUrlParams("taskToken")}`,
success: () => {
console.log("new-year-festival跳转成功");
},
fail: (e) => {
console.error("new-year-festival跳转失败", e);
}
});
} else {
// @ts-ignore
wx.miniProgram.navigateTo({
url: `${jumpUrl}?taskId=${getUrlParams("taskToken")}`,
success: () => {
console.log("跳转成功");
},
fail: (e) => {
console.error("跳转失败", e);
}
});
}
}
}
}
......
assets/Scripts/Scenes/PointDetailScene.ts
View file @ 6731e1ce
import { _decorator, Button, Component, Label, Node, Size, Sprite, } from 'cc';
import { observer, render } from '../store/decorators';
import Scene from '../../Module/Scene';
import { changeScene, hideWaiting, showWaiting } from '../../Module/UIFast';
import { backScene, changeScene, hideWaiting, showWaiting } from "../../Module/UIFast";
import { _asyncThrottle, dateFormatter, strFormat } from '../Utils/Utils';
import { HomeScene } from './HomeScene';
import { sendWebNet, WebNetName } from '../Utils/WebNet/WebNet';
......@@ -46,8 +46,9 @@ export class PointDetailScene extends Scene {
// 返回首页
clickBackHome = _asyncThrottle(async () => {
const{ifFrom}=this.data
await changeScene(ifFrom, {isFrom: this.data.back});
// const{ifFrom}=this.data
await backScene();
// await changeScene(ifFrom, {isFrom: this.data.back});
});
// 数据更新
......
assets/Scripts/Scenes/PropPage.ts
View file @ 6731e1ce
import { _decorator, Button, instantiate, Label, Node, Prefab, Sprite } from "cc";
import Scene from "db://assets/Module/Scene";
import { changeScene, showPanel, showToast } from "db://assets/Module/UIFast";
import { backScene, changeScene, showPanel, showToast } from "db://assets/Module/UIFast";
import store from "../store/store";
import { observer, render } from "../store/decorators";
import ProPop from "db://assets/Scripts/Panels/ProPop";
......@@ -84,11 +84,10 @@ export class PropPage extends Scene {
clickToBack = async () => {
const { isFrom, isPop } = this.data;
if (isPop == true) {
changeScene(HomeScene);
showPanel(isFrom, { tab: "TOOL" });
} else {
changeScene(isFrom);
}
backScene();
};
clickToConfirm = async (item) => {
......
assets/Scripts/Scenes/RankScene.ts
View file @ 6731e1ce
import { _decorator, Button, Component, Label, Node, Size, Sprite, } from 'cc';
import { observer, render } from '../store/decorators';
import Scene from '../../Module/Scene';
import { changeScene, hideWaiting, showPanel, showWaiting } from '../../Module/UIFast';
import { backScene, changeScene, hideWaiting, showPanel, showWaiting } from "../../Module/UIFast";
import { _asyncThrottle, strFormat } from '../Utils/Utils';
import { HomeScene } from './HomeScene';
import { LOG_TYPE, sendLog, sendWebNet, WebNetName } from '../Utils/WebNet/WebNet';
......@@ -175,7 +175,8 @@ export class RankScence extends Scene {
// 返回首页
clickBackHome = _asyncThrottle(async () => {
await changeScene(HomeScene);
// await changeScene(HomeScene);
await backScene();
});
// 分享按钮
......
build/web-mobile/index.html
View file @ 6731e1ce
......@@ -98,14 +98,14 @@
</style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/assets/plugin/rem.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/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/1735106470043/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/custom.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/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/1735106470043/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/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/1735106470043/cocos-js/cc.js"}}
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/cocos-js/cc.js"}}
</script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1735106470043/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1735108187344/index.js').catch(function (err) {
console.error(err);
})
</script>
......
profiles/v2/packages/builder.json
View file @ 6731e1ce
......@@ -45,8 +45,8 @@
"progress": 1,
"state": "success",
"stage": "build",
"message": "2024-12-25 14:01:58 build success in 49 s!",
"detailMessage": "builder:build-project-total (48928ms)\r",
"message": "2024-12-25 14:30:57 build success in 1 min 10 s!",
"detailMessage": "refresh db internal success\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-25 14:01:09",
"time": "2024-12-25 14:29:47",
"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