Skip to content

M
MingSnake_241120
Commit 5b7e3769 authored by 王杰's avatar 王杰
Browse files
Options

feat: 改东西

parent 6404c5cc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1341 additions and 573 deletions
assets/Bundles/HomeScene/HomeScene.scene
View file @ 5b7e3769
......@@ -478,7 +478,7 @@
"y": -180,
"z": -12.000012657215834
},
"_id": "1084+AEb1AyKZ7KQ2BsGUR"
"_id": "fcTGbkhuBJ8otO0aCNBok/"
},
{
"__type__": "cc.UITransform",
......@@ -500,7 +500,7 @@
"x": 0,
"y": 1
},
"_id": "89GuVPT4FPvo37aJt0HIS9"
"_id": "e6IgK+VxJDCZZnVK804ZLE"
},
{
"__type__": "cc.Sprite",
......@@ -536,7 +536,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "97lZUCnq5EUpFBwanjW0OG"
"_id": "5744ml6FlHlKuxH2oaj3PI"
},
{
"__type__": "cc.Node",
......@@ -584,7 +584,7 @@
"y": -180,
"z": -11.00000220913452
},
"_id": "68D5CSTIFNPovzzKb4kHg5"
"_id": "b3CTVlpVVA+qeYxrajLprV"
},
{
"__type__": "cc.UITransform",
......@@ -606,7 +606,7 @@
"x": 0,
"y": 1
},
"_id": "d5SmSONF1CgpECJGBWvLTF"
"_id": "44F9ILuKNFOrfVmOu4rlGi"
},
{
"__type__": "cc.Sprite",
......@@ -642,7 +642,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "502nIvZNhNB7LbHGpIwwJw"
"_id": "1ckVTrlddIDaBmug16N8nL"
},
{
"__type__": "cc.Node",
......@@ -690,7 +690,7 @@
"y": -180,
"z": -64.00000614258742
},
"_id": "b2wucxdx5AsLloPLAwaS+U"
"_id": "f8I+GfeUxOcJTyV/uRsdwc"
},
{
"__type__": "cc.UITransform",
......@@ -712,7 +712,7 @@
"x": 0,
"y": 1
},
"_id": "125VomLvdIhaps2cLF00+8"
"_id": "53QYPAABJDVYPldZwin8T+"
},
{
"__type__": "cc.Sprite",
......@@ -748,7 +748,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "d8YDknAc1EupSx7D2NygQO"
"_id": "a9d7dBvTVNKoTSze5+ypYi"
},
{
"__type__": "cc.Node",
......@@ -796,7 +796,7 @@
"y": 180,
"z": 25.99999385741257
},
"_id": "5eGN0N7oxLnrf0NGLVk7yL"
"_id": "7eKLDpx5VACYF3WP9ZBVc7"
},
{
"__type__": "cc.UITransform",
......@@ -818,7 +818,7 @@
"x": 0,
"y": 1
},
"_id": "84JDpMuYpBkbKrJd2QqDPU"
"_id": "802EnTjjpKY4Unrxm26/RC"
},
{
"__type__": "cc.Sprite",
......@@ -854,7 +854,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "3bcMQA0ShGFLme4ryw9wLc"
"_id": "1cZ+DrKW9PX7ndouP9Q4C0"
},
{
"__type__": "cc.UITransform",
......@@ -6014,8 +6014,8 @@
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": -5,
"y": 65.19999999999999,
"x": 0,
"y": 25.2,
"z": 0
},
"_lrot": {
......@@ -6053,8 +6053,8 @@
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 112,
"height": 130.39999999999998
"width": 122,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -6083,7 +6083,7 @@
"b": 255,
"a": 255
},
"_string": "文案看看能有多大呢我也不",
"_string": "",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 20,
......@@ -6138,7 +6138,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 122,
"height": 130.39999999999998
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -6399,6 +6399,9 @@
"fuDaiText": {
"__id__": 148
},
"quanyiText": {
"__id__": 155
},
"signTxt": {
"__id__": 142
},
......
assets/Bundles/SignPanel/SignPanel1.prefab
View file @ 5b7e3769
This diff is collapsed.
assets/Bundles/SignPanel/png/signed_btn.png.meta 0 → 100644
View file @ 5b7e3769
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "83dc4eb8-2617-4529-bc14-5ce03d659db0",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "83dc4eb8-2617-4529-bc14-5ce03d659db0@6c48a",
"displayName": "signed_btn",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "83dc4eb8-2617-4529-bc14-5ce03d659db0",
"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": "83dc4eb8-2617-4529-bc14-5ce03d659db0@f9941",
"displayName": "signed_btn",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 200,
"height": 88,
"rawWidth": 200,
"rawHeight": 88,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-100,
-44,
0,
100,
-44,
0,
-100,
44,
0,
100,
44,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
88,
200,
88,
0,
0,
200,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-100,
-44,
0
],
"maxPos": [
100,
44,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "83dc4eb8-2617-4529-bc14-5ce03d659db0@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "83dc4eb8-2617-4529-bc14-5ce03d659db0@6c48a"
}
}
assets/Scripts/Panels/RankPosterPanel.ts
View file @ 5b7e3769
......@@ -16,7 +16,6 @@ export default class RankPosterPanel extends Panel {
@property(Label) rankIndex: Label = null;
@property(Label) rankName: Label = null;
@property(Sprite) qrcode: Sprite = null;
// EDEN_TODO 生成二维码
onLoad() {
......@@ -29,8 +28,6 @@ export default class RankPosterPanel extends Panel {
this.rankIndex.string = `${this.data.rankIndex > 200 ? "200+" : this.data.rankIndex ? this.data.rankIndex : 0}`;
this.rankName.string = `${this.data.rankName}`;
this.qrcode.spriteFrame = shareStore.inviteInfo.qrCode;
// director.once(Director.EVENT_AFTER_DRAW, this.copyRenderTex);
// director.once(Director.EVENT_END_FRAME, this.copyRenderTex);
this.scheduleOnce(this.copyRenderTex, 0.5);
}
......
assets/Scripts/Panels/SignPanel.ts
View file @ 5b7e3769
......@@ -7,7 +7,7 @@ const { ccclass, property } = _decorator;
import { HTMLRichText } from "../../Component/HTMLRichText/HTMLRichText";
import { sendWebNet, sendWebNetWithToken, WebNetName } from "../Utils/WebNet/WebNet";
import { strFormat } from "../Utils/Utils";
import { _asyncThrottle, strFormat } from "../Utils/Utils";
import { hidePanel, showPanel } from "../../Module/UIFast";
import SignSucPanel from "./SignSucPanel";
......@@ -20,6 +20,7 @@ export default class SignPanel extends Panel {
@property(Node) closeBtn: Node = null;
@property(Node) signBtn: Node = null;
@property(Node) signGrayBtn: Node = null;
// @property(Node) signList: Node = null;
@property(Node) day1: Node = null;
......@@ -57,6 +58,9 @@ export default class SignPanel extends Panel {
resData.signDay = 0
}
this.signInfo = resData
this.signGrayBtn.active = resData.todaySign
this.signBtn.active = !resData.todaySign
for (let i = 1; i <= 7; i++) {
const node = this[`day${i}`]
......@@ -77,14 +81,13 @@ export default class SignPanel extends Panel {
for (let i = 0; i <= 6; i++) {
const node = this[`day${i + 1}`]
node.getChildByName("prizeNum").getComponent(Label).string =data[0].options[0].sendCount ? "x" + data[0].options[0].sendCount : "x0";
node.getChildByName("prizeName").getComponent(Label).string = strFormat(data[0].options[0].name, 8);
node.getChildByName("img_bg").getComponent(Sprite).spriteFrame = data[0].options[0].icon;
node.getChildByName("prizeNum").getComponent(Label).string = data[i].options[0].sendCount ? "x" + data[i].options[0].sendCount : "x0";
node.getChildByName("prizeName").getComponent(Label).string = strFormat(data[i].options[0].name, 8);
node.getChildByName("img_bg").getComponent(Sprite).spriteFrame = data[i].options[0].icon;
}
}
async doSign() {
doSign = _asyncThrottle(async () => {
const { success, data } = await sendWebNetWithToken(WebNetName.doSign);
if (success) {
showPanel(SignSucPanel, { prizeInfo: data });
......@@ -94,6 +97,5 @@ export default class SignPanel extends Panel {
// this.getSignInfo();
// this.getSignPrize();
}
}
});
}
assets/Scripts/Panels/SignSucPanel.ts
View file @ 5b7e3769
......@@ -16,6 +16,7 @@ export default class SignSucPanel extends Panel {
@property(Sprite) PrizeImg: Sprite = null;
@property(Label) PrizeName: Label = null;
@property(Label) PrizeCount: Label = null;
onLoad() {
this.closeBtn.on(Button.EventType.CLICK, this.clickClose);
......@@ -24,8 +25,9 @@ export default class SignSucPanel extends Panel {
async start() {
const { data = this.data } = this.data
// console.log("看看这里拿到了什么数", data.prizeInfo);
console.log("看看这里拿到了什么数", data.prizeInfo);
this.PrizeName.getComponent(Label).string = data.prizeInfo.options[0].optionName;
this.PrizeCount.getComponent(Label).string = data.prizeInfo.options[0].sendCount ? "x" + data.prizeInfo.options[0].sendCount : "x0";;
this.PrizeImg.getComponent(Sprite).spriteFrame = data.prizeInfo.options[0].optionImg;
}
......
assets/Scripts/Scenes/HomeScene.ts
View file @ 5b7e3769
......@@ -53,6 +53,7 @@ export class HomeScene extends Scene {
@property(Label) userName: Label;
@property(Label) pointNum: Label;
@property(Label) fuDaiText: Label;
@property(Label) quanyiText: Label;
@property(Label) signTxt: Label;
@property(Sprite) userImg: Sprite;
......@@ -111,7 +112,8 @@ export class HomeScene extends Scene {
rankInfos = [],
continueSignDays = 0,
luckBenefitDesc ="",
avatar
benefitDesc = "",
avatar,
} = store.homeInfo || {};
this.userName.string = strFormat(nickname || "鸣鸣很忙用户", 8);
......@@ -119,6 +121,7 @@ export class HomeScene extends Scene {
this.userImg.spriteFrame = avatar || this.avatar;
this.signTxt.string = `连续签到${continueSignDays || 0}天`;
this.fuDaiText.string = luckBenefitDesc;
this.quanyiText.string = benefitDesc;
if (rankInfos && rankInfos.length > 0) {
this.rankList.active = true;
......@@ -159,7 +162,7 @@ export class HomeScene extends Scene {
});
clickRule = _asyncThrottle(async () => {
if (!this.checkActTime(true)) return;
if (!this.checkActTime()) return;
showPanel(RulePanel);
});
......
assets/Scripts/store/store.ts
View file @ 5b7e3769
......@@ -22,6 +22,7 @@ export interface IHomeInfo {
newGetSpName: string;
newGetSpImage: string;
luckBenefitDesc: string;
benefitDesc: string;
rankInfos: {
index: number;
nickname: string;
......@@ -68,6 +69,7 @@ class Store {
newGetSpName: "",
newGetSpImage: "",
luckBenefitDesc: "",
benefitDesc: "",
newGetSpId: null,
rankInfos: [],
rankPopList: [],
......
build/web-mobile/index.html
View file @ 5b7e3769
......@@ -98,14 +98,14 @@
</style>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/assets/plugin/rem.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/src/assets/plugin/zepto.min.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/src/assets/plugin/declare-process.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/src/assets/plugin/SVGA.Lite.v2.1.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/src/assets/plugin/jszip.min.v3.10.1.js"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/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/1733978214944/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/custom.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/style.css" />-->
<!-- <link rel="stylesheet" type="text/css" href="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/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/1733978214944/src/polyfills.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/src/polyfills.bundle.js" charset="utf-8"></script>
<!-- SystemJS support. -->
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/system.bundle.js" charset="utf-8"></script>
<script src="//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/src/system.bundle.js" charset="utf-8"></script>
<!-- Import map -->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/src/import-map.json" type="systemjs-importmap" charset="utf-8"></script>-->
<!--<script src="https://yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/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/1733978214944/cocos-js/cc.js"}}
{"imports":{"cc":"//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/cocos-js/cc.js"}}
</script>
<script>
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733978214944/index.js').catch(function (err) {
System.import('//yun.duiba.com.cn/db_games/ccc_game/template3d/1733979359965/index.js').catch(function (err) {
console.error(err);
})
</script>
......
preview-template/mock/checkin_1/doSign.do.json
View file @ 5b7e3769
......@@ -13,7 +13,7 @@
"prizeType": -57302570.87063153,
"ruleId": "esse nostrud dolor veniam",
"url": "est",
"sendCount": 71730706.72972628
"sendCount": 8
},
{
"optionId": "dolor ad",
......
preview-template/mock/checkin_1/query.do.json
View file @ 5b7e3769
......@@ -3,7 +3,7 @@
"message": "nulla do",
"success": true,
"data": {
"todaySign": true,
"todaySign": false,
"timestamp": -31766474.820653602,
"startTime": "in nisi do Lorem",
"signDay": 5,
......
preview-template/mock/checkin_1/queryOptions.do.json
View file @ 5b7e3769
......@@ -6,20 +6,20 @@
"indexes": null,
"options": [
{
"degree": null,
"icon": "//yun.duiba.com.cn/polaris/FastJSON 解析异常.6a6c99a2b0fed4b35bb30613d4cf19a63156940e.png",
"icon2": "//yun.duiba.com.cn/polaris/FastJSON 解析异常.6a6c99a2b0fed4b35bb30613d4cf19a63156940e.png",
"id": "o0de75da1",
"degree": "10",
"icon": "//yun.dui88.com/projectxh5/credit-250-250.png",
"icon2": null,
"id": "o75685c5b",
"index": 1,
"name": "复活卡",
"prizeId": "sp_revival_card",
"prizeType": 1,
"name": "积分10",
"prizeId": "sss_5",
"prizeType": 2,
"refId": null,
"refType": null,
"refType": "increase-credits",
"sendCount": 1
}
],
"ruleId": "ru_1"
"ruleId": "ru_5"
},
{
"index": 2,
......@@ -31,12 +31,12 @@
"icon2": "//yun.duiba.com.cn/polaris/FastJSON 解析异常 (1).2d631128e63c95cf429c2531068260f1058fb8b7.png",
"id": "o5204cb4b",
"index": 1,
"name": "护盾卡",
"name": "护盾卡护盾卡护盾卡护盾卡护盾卡护盾卡",
"prizeId": "sp_shield_card",
"prizeType": 1,
"refId": null,
"refType": null,
"sendCount": 1
"sendCount": 5
}
],
"ruleId": "ru_2"
......@@ -51,12 +51,12 @@
"icon2": "//yun.duiba.com.cn/polaris/FastJSON 解析异常 (2).3f0fb2162944e601d209c6454fec47253fd1af97.png",
"id": "o3c062fc0",
"index": 1,
"name": "移速卡",
"name": "移速卡移速卡移速卡移速卡移速卡移速卡",
"prizeId": "sp_agility_card",
"prizeType": 1,
"refId": null,
"refType": null,
"sendCount": 1
"sendCount": 5
}
],
"ruleId": "ru_3"
......@@ -71,12 +71,12 @@
"icon2": "//yun.duiba.com.cn/polaris/FastJSON 解析异常 (6).2ae3d8b23743cf1e63efa3a6b336cce647d6bd53.png",
"id": "o0b9639cc",
"index": 1,
"name": "加长卡",
"name": "加长卡加长卡加长卡加长卡加长卡加长卡加长卡",
"prizeId": "sp_add_length",
"prizeType": 1,
"refId": null,
"refType": null,
"sendCount": 1
"sendCount": 5
}
],
"ruleId": "ru_4"
......@@ -91,12 +91,12 @@
"icon2": "//yun.duiba.com.cn/polaris/FastJSON 解析异常.6a6c99a2b0fed4b35bb30613d4cf19a63156940e.png",
"id": "o0de75da1",
"index": 1,
"name": "复活111卡",
"name": "复活卡复活卡复活卡复活卡复活卡复活卡",
"prizeId": "sp_revival_card",
"prizeType": 1,
"refId": null,
"refType": null,
"sendCount": 1
"sendCount": 5
}
],
"ruleId": "ru_1"
......@@ -111,8 +111,8 @@
"icon2": null,
"id": "o75685c5b",
"index": 1,
"name": "积分",
"prizeId": "sss_1",
"name": "积分10",
"prizeId": "sss_5",
"prizeType": 2,
"refId": null,
"refType": "increase-credits",
......@@ -131,8 +131,8 @@
"icon2": null,
"id": "o75685c5b",
"index": 1,
"name": "积分",
"prizeId": "sss_1",
"name": "积分10",
"prizeId": "sss_5",
"prizeType": 2,
"refId": null,
"refType": "increase-credits",
......@@ -144,5 +144,5 @@
],
"message": null,
"success": true,
"timeStamp": 1733895555999
"timeStamp": 1733974560958
}
\ No newline at end of file
preview-template/mock/home/index.do.json
View file @ 5b7e3769
......@@ -67,7 +67,9 @@
"bagNum": 3,
"bagImg": "aute laboris et",
"bagName": "银福袋"
}
},
"bagPopVO": null,
"benefitDesc":"权益文案"
},
"message": "incididunt ullamco qui voluptate dolor",
"success": true
......
profiles/v2/packages/builder.json
View file @ 5b7e3769
......@@ -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 12:57:35 build success in 1 min 36 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-12 12:36:54",
"time": "2024-12-12 12:55:59",
"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