Skip to content

M
MingSnake_241120
Commit eb271aa6 authored by 陈子煜's avatar 陈子煜
Browse files
Options

1

parent 93a02ffb
Hide whitespace changes
Inline Side-by-side
Showing with 451 additions and 78 deletions
assets/Bundles/GetPrize/prize.prefab
View file @ eb271aa6
......@@ -20,19 +20,22 @@
"_children": [
{
"__id__": 2
},
{
"__id__": 8
}
],
"_active": true,
"_components": [
{
"__id__": 8
"__id__": 20
},
{
"__id__": 10
"__id__": 22
}
],
"_prefab": {
"__id__": 12
"__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -127,7 +130,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 56.0546875,
"width": 200,
"height": 50.4
},
"_anchorPoint": {
......@@ -170,7 +173,7 @@
"_fontSize": 28,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 2,
"_overflow": 1,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
......@@ -222,18 +225,317 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "numBg",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 9
}
],
"_active": true,
"_components": [
{
"__id__": 15
},
{
"__id__": 17
}
],
"_prefab": {
"__id__": 19
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 39.00300000000004,
"y": -45.47199999999998,
"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.Node",
"_name": "num",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 10
},
{
"__id__": 12
}
],
"_prefab": {
"__id__": 14
},
"_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__": 1
"__id__": 9
},
"_enabled": true,
"__prefab": {
"__id__": 11
},
"_contentSize": {
"__type__": "cc.Size",
"width": 22.0166015625,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "cbK5Ar2kBAPazvYzcVa/4b"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 9
},
"_enabled": true,
"__prefab": {
"__id__": 13
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "X5",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 18,
"_fontSize": 18,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_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": "e5rhdxXi9B8KKqMQNMziGt"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "799I1CZIpKirmu2oR1Uzly",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 8
},
"_enabled": true,
"__prefab": {
"__id__": 16
},
"_contentSize": {
"__type__": "cc.Size",
"width": 40,
"height": 28
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "5bMQZhYhtAMZ9wuej82Fm/"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 8
},
"_enabled": true,
"__prefab": {
"__id__": 18
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "ce393902-0dba-4f7e-aa84-6f78dbf844ec@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "3eRulicy5ClIRek2DgRDgz"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "76Sl5eyjhJ/JPejJt1E65O",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 21
},
"_contentSize": {
"__type__": "cc.Size",
"width": 120,
......@@ -260,7 +562,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 11
"__id__": 23
},
"_customMaterial": null,
"_srcBlendFactor": 2,
......
assets/Bundles/PropPage/PropPage.scene
View file @ eb271aa6
......@@ -23,7 +23,7 @@
"_active": true,
"_components": [],
"_prefab": {
"__id__": 43
"__id__": 44
},
"_lpos": {
"__type__": "cc.Vec3",
......@@ -54,7 +54,7 @@
},
"autoReleaseAssets": false,
"_globals": {
"__id__": 46
"__id__": 47
},
"_id": "bbf4500c-d4d5-4452-87cb-d464062a3f41"
},
......@@ -77,20 +77,17 @@
"__id__": 9
},
{
"__id__": 17
"__id__": 18
},
{
"__id__": 30
"__id__": 31
},
{
"__id__": 34
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 39
},
{
"__id__": 40
},
......@@ -99,6 +96,9 @@
},
{
"__id__": 42
},
{
"__id__": 43
}
],
"_prefab": null,
......@@ -190,7 +190,7 @@
"_priority": 1073741824,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 794.8450704225352,
"_orthoHeight": 850.9565217391305,
"_near": 1,
"_far": 2000,
"_color": {
......@@ -387,6 +387,9 @@
},
{
"__id__": 16
},
{
"__id__": 17
}
],
"_prefab": null,
......@@ -675,6 +678,56 @@
"_lockFlags": 0,
"_id": "cbZrtCWIxAPb/uoBf3gs80"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 9
},
"_enabled": true,
"__prefab": null,
"clickEvents": [],
"_interactable": true,
"_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_hoverColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_pressedColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_normalSprite": null,
"_hoverSprite": null,
"_pressedSprite": null,
"_disabledSprite": null,
"_duration": 0.05,
"_zoomScale": 0.9,
"_target": null,
"_id": "08BFrmaEZIjLC4Bjei+dZS"
},
{
"__type__": "cc.Node",
"_name": "ScrollView",
......@@ -685,19 +738,19 @@
},
"_children": [
{
"__id__": 18
"__id__": 19
}
],
"_active": true,
"_components": [
{
"__id__": 27
},
{
"__id__": 28
},
{
"__id__": 29
},
{
"__id__": 30
}
],
"_prefab": null,
......@@ -736,18 +789,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 17
"__id__": 18
},
"_children": [
{
"__id__": 19
"__id__": 20
}
],
"_active": true,
"_components": [
{
"__id__": 23
},
{
"__id__": 24
},
......@@ -756,6 +806,9 @@
},
{
"__id__": 26
},
{
"__id__": 27
}
],
"_prefab": null,
......@@ -794,19 +847,19 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 18
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
}
],
"_prefab": null,
......@@ -845,7 +898,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"__prefab": null,
......@@ -867,7 +920,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"__prefab": null,
......@@ -899,7 +952,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"__prefab": null,
......@@ -929,7 +982,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
"__id__": 19
},
"_enabled": true,
"__prefab": null,
......@@ -951,7 +1004,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
"__id__": 19
},
"_enabled": true,
"__prefab": null,
......@@ -967,7 +1020,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
"__id__": 19
},
"_enabled": true,
"__prefab": null,
......@@ -1007,7 +1060,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 18
"__id__": 19
},
"_enabled": true,
"__prefab": null,
......@@ -1037,7 +1090,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__id__": 18
},
"_enabled": true,
"__prefab": null,
......@@ -1059,7 +1112,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__id__": 18
},
"_enabled": true,
"__prefab": null,
......@@ -1072,7 +1125,7 @@
"cancelInnerEvents": true,
"scrollEvents": [],
"_content": {
"__id__": 19
"__id__": 20
},
"_horizontalScrollBar": null,
"_verticalScrollBar": null,
......@@ -1084,7 +1137,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 17
"__id__": 18
},
"_enabled": true,
"__prefab": null,
......@@ -1119,14 +1172,14 @@
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
},
{
"__id__": 32
},
{
"__id__": 33
},
{
"__id__": 34
}
],
"_prefab": null,
......@@ -1165,7 +1218,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"__prefab": null,
......@@ -1187,7 +1240,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"__prefab": null,
......@@ -1226,7 +1279,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"__prefab": null,
......@@ -1261,9 +1314,6 @@
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
},
{
"__id__": 36
},
......@@ -1272,6 +1322,9 @@
},
{
"__id__": 38
},
{
"__id__": 39
}
],
"_prefab": null,
......@@ -1310,7 +1363,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"__prefab": null,
......@@ -1332,7 +1385,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"__prefab": null,
......@@ -1371,7 +1424,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"__prefab": null,
......@@ -1401,7 +1454,7 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"__prefab": null,
......@@ -1524,7 +1577,7 @@
"_enabled": true,
"__prefab": null,
"backBtn": {
"__id__": 34
"__id__": 35
},
"credits": {
"__id__": 12
......@@ -1534,7 +1587,10 @@
"__expectedType__": "cc.Prefab"
},
"content": {
"__id__": 19
"__id__": 20
},
"point": {
"__id__": 9
},
"listComp": null,
"_id": "6fb2Gu9kBBIZWw8cJg1055"
......@@ -1547,14 +1603,14 @@
"instance": null,
"targetOverrides": [
{
"__id__": 44
"__id__": 45
}
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 42
"__id__": 43
},
"sourceInfo": null,
"propertyPath": [
......@@ -1562,7 +1618,7 @@
],
"target": null,
"targetInfo": {
"__id__": 45
"__id__": 46
}
},
{
......@@ -1574,28 +1630,28 @@
{
"__type__": "cc.SceneGlobals",
"ambient": {
"__id__": 47
"__id__": 48
},
"shadows": {
"__id__": 48
"__id__": 49
},
"_skybox": {
"__id__": 49
"__id__": 50
},
"fog": {
"__id__": 50
"__id__": 51
},
"octree": {
"__id__": 51
"__id__": 52
},
"skin": {
"__id__": 52
"__id__": 53
},
"lightProbeInfo": {
"__id__": 53
"__id__": 54
},
"postSettings": {
"__id__": 54
"__id__": 55
},
"bakedWithStationaryMainLight": false,
"bakedWithHighpLightmap": false
......
assets/Scripts/Panels/GetPrize.ts
View file @ eb271aa6
......@@ -37,7 +37,6 @@ export default class GetPrize extends Panel {
console.log(data,112233)
console.log(data.prizeName,22222)
data.map((item, index) => {
const prize = instantiate(this.prizePrefab)
this.content.addChild(prize)
......@@ -45,7 +44,15 @@ export default class GetPrize extends Panel {
const prizeName = prize.getChildByName("Label")
prizeName.getComponent(Label).string = item.prizeName
prize.getComponent(Sprite).spriteFrame = item.prizeImg
const numBg = prize.getChildByName("numBg")
const num = numBg.getChildByName("num")
num.getComponent(Label).string = item.sendCount
})
}
clickShare() {
......@@ -58,5 +65,4 @@ export default class GetPrize extends Panel {
clickHappy = () => {
this.hidePanel()
}
}
assets/Scripts/Panels/OpenLuckyPanel.ts
View file @ eb271aa6
......@@ -2,7 +2,7 @@ import Panel from "../../Module/Panel";
import { _decorator, Button, Node, Sprite, Label, SpriteFrame } from "cc";
import { observer } from "../store/decorators";
import { hidePanel, showPanel } from "db://assets/Module/UIFast";
import { sendWebNetWithToken, WebNetName } from "db://assets/Scripts/Utils/WebNet/WebNet";
import {sendWebNet, sendWebNetWithToken, WebNetName} from "db://assets/Scripts/Utils/WebNet/WebNet";
import GetPrize from "db://assets/Scripts/Panels/GetPrize";
import { _asyncThrottle, sleep } from "../Utils/Utils";
......@@ -73,6 +73,10 @@ export default class OpenLuckyPanel extends Panel {
this.hidePanel();
showPanel(GetPrize, data.prizeVOList);
await sendWebNet(WebNetName.bagPag)
});
clickCancel() {
......
assets/Scripts/Scenes/PropPage.ts
View file @ eb271aa6
......@@ -9,6 +9,7 @@ import ProPop from "db://assets/Scripts/Panels/ProPop";
import {sendWebNet, WebNetName} from "db://assets/Scripts/Utils/WebNet/WebNet";
import {HomeScene} from "db://assets/Scripts/Scenes/HomeScene";
import { YXCollectionView, YXFlowLayout } from "../../Component/YXList/lib";
import {PointDetailScene} from "db://assets/Scripts/Scenes/PointDetailScene";
const {ccclass, property} = _decorator;
......@@ -25,6 +26,7 @@ export class PropPage extends Scene {
@property(Label) credits: Label = null;
@property(Prefab) prizePrefab: Prefab = null;
@property(Node) content: Node = null;
@property(Node) point: Node = null;
/**
* 列表组件
......@@ -36,6 +38,7 @@ export class PropPage extends Scene {
onLoad() {
this.backBtn.on(Button.EventType.CLICK, this.clickToBack)
this.point.on(Button.EventType.CLICK, this.clickToChange)
}
async start() {
......@@ -132,10 +135,11 @@ export class PropPage extends Scene {
//预制体内的名字、解释、图片 进行更替
}
// 点击返回按钮
/** 点击积分按钮*/
clickToChange(){
changeScene(PointDetailScene)
}
/** 点击返回按钮*/
clickToBack() {
changeScene(HomeScene)
}
......
assets/Scripts/store/store.ts
View file @ eb271aa6
......@@ -85,7 +85,8 @@ class Store {
if (data.bagPopVO) {
showPanel(GetPrize, [{
prizeName: data.bagPopVO.bagName,
prizeImg: data.bagPopVO.bagImg
prizeImg: data.bagPopVO.bagImg,
sendCount:data.bagPopVO.bagNum
}])
}
}
......
preview-template/mock/bag/index.do.json
View file @ eb271aa6
......@@ -131,7 +131,7 @@
],
"bagSilverToDiamond": 1,
"bagSilverToGold": 5,
"remainBagSilverNum": 0
"remainBagSilverNum": 100
},
"message": null,
"success": true,
......
preview-template/mock/blessBag/index.do.json
View file @ eb271aa6
......@@ -3,9 +3,9 @@
"success": "officia nostrud",
"code": "Lorem eiusmod Ut",
"data": {
"bagSilverToDiamond": -53063754,
"bagSilverToGold": -43116272,
"remainBagSilverNum": -49368901.17048831,
"bagSilverToDiamond": 10,
"bagSilverToGold": 10,
"remainBagSilverNum": 10000,
"actEndTime": 74088402.72843397,
"actStartTime": 43975762.12147766,
"bagPopVO": {
......
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