diff --git a/.pink/settings.json b/.pink/settings.json new file mode 100644 index 0000000..8ab9b74 --- /dev/null +++ b/.pink/settings.json @@ -0,0 +1,5 @@ +{ + "cocos.engine.type": "official", + "cocos.engine.version": "4.0.0-beta.2", + "cocos.engine.dirName": "" +} \ No newline at end of file diff --git a/assets/Welcome.scene b/assets/Welcome.scene index 56add44..a21f3a1 100644 --- a/assets/Welcome.scene +++ b/assets/Welcome.scene @@ -52,7 +52,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 43 + "__id__": 61 }, "_id": "478fdf39-37fe-4d07-9770-f088728b9215" }, @@ -73,24 +73,30 @@ }, { "__id__": 8 + }, + { + "__id__": 38 } ], "_active": true, "_components": [ { - "__id__": 38 + "__id__": 55 }, { - "__id__": 39 + "__id__": 56 }, { - "__id__": 40 + "__id__": 57 }, { - "__id__": 41 + "__id__": 58 }, { - "__id__": 42 + "__id__": 59 + }, + { + "__id__": 60 } ], "_prefab": null, @@ -182,7 +188,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 185.35714285714286, + "_orthoHeight": 740, "_near": 0, "_far": 2000, "_color": { @@ -1001,7 +1007,7 @@ "_string": "No account needed", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 79, + "_actualFontSize": 57, "_fontSize": 56, "_fontFamily": "Arial", "_lineHeight": 64, @@ -1136,7 +1142,7 @@ "_string": "Privacy Policy", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 54, + "_actualFontSize": 39, "_fontSize": 38, "_fontFamily": "Arial", "_lineHeight": 46, @@ -1321,7 +1327,7 @@ "_string": "Terms of Service", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 54, + "_actualFontSize": 39, "_fontSize": 38, "_fontFamily": "Arial", "_lineHeight": 46, @@ -1503,7 +1509,7 @@ "_string": "|", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 79, + "_actualFontSize": 57, "_fontSize": 56, "_fontFamily": "Arial", "_lineHeight": 64, @@ -1583,6 +1589,703 @@ "termsUrl": "", "_id": "c3ujDR7IRHVpX7n0QWR5qv" }, + { + "__type__": "cc.Node", + "_name": "PreparationPanel", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 39 + }, + { + "__id__": 42 + }, + { + "__id__": 45 + }, + { + "__id__": 48 + }, + { + "__id__": 51 + } + ], + "_active": true, + "_components": [ + { + "__id__": 54 + } + ], + "_prefab": null, + "_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": "f6fcJfVRVIdob5LZwVXz2I" + }, + { + "__type__": "cc.Node", + "_name": "PreparationTitle", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 40 + }, + { + "__id__": 41 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -45, + "y": -454, + "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": "06NamHi6VNCrS2wjSFbRbr" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 39 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 640, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "3fuQmDlSNBbaiz+jj2fv3x" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 39 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 250, + "g": 250, + "b": 250, + "a": 255 + }, + "_string": "LOADING...", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 69, + "_fontSize": 68, + "_fontFamily": "Arial", + "_lineHeight": 76, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_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": "122LWgArJHX7Z5ADZfbKwz" + }, + { + "__type__": "cc.Node", + "_name": "PreparationPercent", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 43 + }, + { + "__id__": 44 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 368, + "y": -454, + "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": "57BxKcw2RCpLV+bV0eXMSb" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 42 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "67fSB+iR1Hob7gOGlI5DaH" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 42 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 250, + "g": 250, + "b": 250, + "a": 255 + }, + "_string": "70%", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 69, + "_fontSize": 68, + "_fontFamily": "Arial", + "_lineHeight": 76, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_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": "37r4LjWkxLNrwX0UVQD+mY" + }, + { + "__type__": "cc.Node", + "_name": "PreparationCaption", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 46 + }, + { + "__id__": 47 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -699, + "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": "9c2DFouQlEe4ifxZT5GWcc" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 45 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 920, + "height": 76 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "ceuxIXavNC2qIw7N74XiLm" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 45 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 250, + "g": 250, + "b": 250, + "a": 255 + }, + "_string": "Getting things ready", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 52, + "_fontSize": 51, + "_fontFamily": "Arial", + "_lineHeight": 59, + "_overflow": 2, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_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": "074RDiJAVImJ7NwfyCGiKj" + }, + { + "__type__": "cc.Node", + "_name": "PreparationFrame", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 49 + }, + { + "__id__": 50 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -2.5, + "y": -576, + "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": "34RvgI2ftGHoP1nOOjf5vS" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 48 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 973, + "height": 168 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "faJ8fiwkJL9Zt5QHLjZ0U4" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 48 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7a1db310-5d4f-4897-986f-3a1e216406d3@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": false, + "_useGrayscale": false, + "_atlas": null, + "_id": "d4TrQJ/IFP4bBBPxBXR9Dk" + }, + { + "__type__": "cc.Node", + "_name": "PreparationFill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 38 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 52 + }, + { + "__id__": 53 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -454, + "y": -576, + "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": "4fT/8YfnxFA6TJCjGZWhbF" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 634.1999999999999, + "height": 102 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "44MiJOyMBLWaGHZg2gd421" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": false, + "_useGrayscale": false, + "_atlas": null, + "_id": "1aAyPZoB5DZLDyRYuUxIox" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 38 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1920 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "edgXzQKD1MerbnTNef+Ys5" + }, { "__type__": "cc.UITransform", "_name": "", @@ -1676,30 +2379,85 @@ "_id": "02VbCZGqVK94/vLEHGBckY" }, { - "__type__": "cc.SceneGlobals", - "ambient": { + "__type__": "e4defACO69APKCPd/E0D5i8", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": null, + "login": { + "__id__": 36 + }, + "panel": { + "__id__": 38 + }, + "loginControls": [ + { + "__id__": 15 + }, + { + "__id__": 22 + }, + { + "__id__": 25 + }, + { + "__id__": 29 + }, + { + "__id__": 33 + }, + { + "__id__": 19 + } + ], + "meter": { + "__id__": 53 + }, + "percentage": { "__id__": 44 }, - "shadows": { - "__id__": 45 - }, - "_skybox": { - "__id__": 46 - }, - "fog": { + "caption": { "__id__": 47 }, + "frameArtwork": { + "__uuid__": "7a1db310-5d4f-4897-986f-3a1e216406d3@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "fillArtwork": { + "__uuid__": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_id": "fe/7Iw3rRMYb/Rpy/tzluK" + }, + { + "__type__": "cc.SceneGlobals", + "ambient": { + "__id__": 62 + }, + "shadows": { + "__id__": 63 + }, + "_skybox": { + "__id__": 64 + }, + "fog": { + "__id__": 65 + }, "octree": { - "__id__": 48 + "__id__": 66 }, "skin": { - "__id__": 49 + "__id__": 67 }, "lightProbeInfo": { - "__id__": 50 + "__id__": 68 }, "postSettings": { - "__id__": 51 + "__id__": 69 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/login/scripts/GuestLoginView.ts b/assets/login/scripts/GuestLoginView.ts index 866e373..f8767d7 100644 --- a/assets/login/scripts/GuestLoginView.ts +++ b/assets/login/scripts/GuestLoginView.ts @@ -8,6 +8,7 @@ const { ccclass, property } = _decorator; @ccclass('GuestLoginView') export class GuestLoginView extends Component implements LoginViewPort { static readonly AUTHENTICATED = 'guest-authenticated'; + static readonly STATE_CHANGED = 'guest-login-state-changed'; @property({ type: Button }) guestButton: Button | null = null; @property({ type: Label }) statusLabel: Label | null = null; private presenter: GuestLoginPresenter | null = null; @@ -30,6 +31,7 @@ export class GuestLoginView extends Component implements LoginViewPort { this.statusLabel.string = state.message; this.statusLabel.node.active = state.message.length > 0; } + this.node.emit(GuestLoginView.STATE_CHANGED, state); } onDisable(): void { this.presenter?.cancel(); } onDestroy(): void { diff --git a/assets/login/scripts/WelcomeLayoutAuthoring.ts b/assets/login/scripts/WelcomeLayoutAuthoring.ts index c7f8368..17d67d3 100644 --- a/assets/login/scripts/WelcomeLayoutAuthoring.ts +++ b/assets/login/scripts/WelcomeLayoutAuthoring.ts @@ -1,11 +1,50 @@ import { _decorator, Button, Canvas, Color, Component, Label, Node, Sprite, UITransform, Widget } from 'cc'; import { EDITOR } from 'cc/env'; +import { GuestLoginView } from './GuestLoginView'; +import { StartupLoadingView } from '../../startup/scripts/StartupLoadingView'; const { ccclass, executeInEditMode, property } = _decorator; /** 仅按显式开关校准已存在节点,不在运行时重建界面。 / Explicit editor-only calibration of existing nodes; never rebuild UI at runtime. */ @ccclass('WelcomeLayoutAuthoring') @executeInEditMode export class WelcomeLayoutAuthoring extends Component { + @property + get applyPreparationLayout(): boolean { return false; } + set applyPreparationLayout(value: boolean) { + if (!EDITOR || !value) return; + const panel = this.child(this.node, 'PreparationPanel'); + const group = this.child(this.node, 'WelcomeComposition'); + const loading = this.node.getComponent(StartupLoadingView); + if (!loading || !loading.frameArtwork || !loading.fillArtwork) throw new Error('Preparation artwork is not bound.'); + this.box(panel, 0, 0, 1080, 1920); + this.text(this.child(panel, 'PreparationTitle'), 'LOADING...', -45, -454, 640, 90, 68); + this.text(this.child(panel, 'PreparationPercent'), '70%', 368, -454, 220, 90, 68); + this.text(this.child(panel, 'PreparationCaption'), 'Getting things ready', 0, -699, 920, 76, 51); + for (const name of ['PreparationTitle', 'PreparationPercent', 'PreparationCaption']) { + this.child(panel, name).getComponent(Label)!.isBold = true; + } + const frame = this.child(panel, 'PreparationFrame'); + this.box(frame, -2.5, -576, 973, 168); + frame.getComponent(Sprite)!.spriteFrame = loading.frameArtwork; + this.sprite(frame); + const fill = this.child(panel, 'PreparationFill'); + this.box(fill, -458, -582, 906, 102); + fill.getComponent(UITransform)!.setAnchorPoint(0, .5); + const meter = fill.getComponent(Sprite)!; + meter.spriteFrame = loading.fillArtwork; + this.sprite(fill); + meter.type = Sprite.Type.SLICED; + // 左右圆头保持固定宽度,中段伸缩,不拉伸整条高光。 / Keep rounded caps fixed and stretch only the center highlight. + // 九宫格边距由重命名资源的导入设置持久化。 / Slice borders are persisted in the renamed resource import settings. + loading.login = group.getComponent(GuestLoginView); + loading.panel = panel; + loading.meter = meter; + loading.percentage = this.child(panel, 'PreparationPercent').getComponent(Label); + loading.caption = this.child(panel, 'PreparationCaption').getComponent(Label); + loading.loginControls = ['GuestAccess', 'GuestReassurance', 'PrivacyLink', 'TermsLink', 'LegalDivider', 'AuthenticationStatus'].map(name => this.child(group, name)); + fill.getComponent(UITransform)!.setContentSize(906 * .7, 102); + panel.active = false; + } @property get applyReferenceLayout(): boolean { return false; } set applyReferenceLayout(value: boolean) { diff --git a/assets/startup.meta b/assets/startup.meta new file mode 100644 index 0000000..9d16528 --- /dev/null +++ b/assets/startup.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "cc824225-4727-4ceb-a8f0-4c8e5fa2968b", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/startup/scripts.meta b/assets/startup/scripts.meta new file mode 100644 index 0000000..700016f --- /dev/null +++ b/assets/startup/scripts.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "59d8d637-a831-4d49-b6f2-52a04f638720", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/startup/scripts/StartupLoadingView.ts b/assets/startup/scripts/StartupLoadingView.ts new file mode 100644 index 0000000..e7724c6 --- /dev/null +++ b/assets/startup/scripts/StartupLoadingView.ts @@ -0,0 +1,93 @@ +import { _decorator, Component, Label, Node, Sprite, SpriteFrame, UITransform } from 'cc'; +import { GuestLoginView } from '../../login/scripts/GuestLoginView'; +import type { LoginState } from '../../login/scripts/GuestLoginPresenter'; +import { StartupProgress } from './StartupProgress'; +const { ccclass, property } = _decorator; + +/** 加载展示与认证解耦;仅显隐控件,不禁用拥有请求生命周期的节点。 / Display controls without disabling the node that owns authentication. */ +@ccclass('StartupLoadingView') +export class StartupLoadingView extends Component { + static readonly READY = 'startup-preparation-ready'; + @property({ type: GuestLoginView }) login: GuestLoginView | null = null; + @property({ type: Node }) panel: Node | null = null; + @property({ type: [Node] }) loginControls: Node[] = []; + @property({ type: Sprite }) meter: Sprite | null = null; + @property({ type: Label }) percentage: Label | null = null; + @property({ type: Label }) caption: Label | null = null; + @property({ type: SpriteFrame }) frameArtwork: SpriteFrame | null = null; + @property({ type: SpriteFrame }) fillArtwork: SpriteFrame | null = null; + private readonly progress = new StartupProgress(); + private notified = false; + private completedFor = 0; + private visible = false; + private readonly previousVisibility = new Map(); + onLoad(): void { + if (!this.login || !this.panel || !this.meter || !this.percentage || !this.caption) { + throw new Error('Startup loading controls are not fully bound.'); + } + this.login.node.on(GuestLoginView.STATE_CHANGED, this.onLoginState, this); + this.show(false); + } + onEnable(): void { + this.show(this.progress.phase !== 'idle' && !this.notified); + if (this.visible) this.draw(); + } + private onLoginState(state: LoginState): void { + if (state.phase === 'signing-in') { + this.notified = false; + this.completedFor = 0; + this.progress.begin(); + this.show(this.enabledInHierarchy); + this.draw(); + } else if (state.phase === 'authenticated') { + this.progress.finish(); + this.draw(); + } else { + this.progress.reset(); + this.show(false); + } + } + update(dt: number): void { + if (this.progress.phase === 'idle') return; + this.progress.tick(dt); + this.draw(); + if (this.progress.phase === 'complete') this.completedFor += Math.max(0, Math.min(.1, dt)); + if (this.progress.phase === 'complete' && this.completedFor >= .12 && !this.notified) { + this.notified = true; + // 当前无主场景,收尾后返回既有认证成功落点;后续由就绪接口承接。 / Until a game scene exists, retain the existing authenticated landing state. + this.show(false); + this.node.emit(StartupLoadingView.READY); + } + } + private draw(): void { + // 认证状态可更新文字,但加载层收尾前不显示到同一位置。 / Keep the latest auth message hidden until the loading overlay finishes. + if (this.visible && this.login?.statusLabel) this.login.statusLabel.node.active = false; + if (this.meter) { + this.meter.node.active = this.progress.value > 0; + this.meter.getComponent(UITransform)?.setContentSize(906 * this.progress.value, 102); + } + if (this.percentage) this.percentage.string = `${Math.floor(this.progress.value * 100)}%`; + if (this.caption) this.caption.string = 'Getting things ready'; + } + private show(visible: boolean): void { + if (this.panel) this.panel.active = visible; + if (visible === this.visible) return; + this.visible = visible; + for (const control of this.loginControls) { + if (!control.isValid) continue; + if (visible) { + this.previousVisibility.set(control, control.active); + control.active = false; + } else { + control.active = control === this.login?.statusLabel?.node + ? this.login.statusLabel.string.length > 0 + : (this.previousVisibility.get(control) ?? control.active); + } + } + if (!visible) this.previousVisibility.clear(); + } + onDisable(): void { this.show(false); } + onDestroy(): void { + if (this.login?.isValid) this.login.node.off(GuestLoginView.STATE_CHANGED, this.onLoginState, this); + } +} diff --git a/assets/startup/scripts/StartupLoadingView.ts.meta b/assets/startup/scripts/StartupLoadingView.ts.meta new file mode 100644 index 0000000..7084306 --- /dev/null +++ b/assets/startup/scripts/StartupLoadingView.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "e4def002-3baf-403c-a08f-77f1340f98bc", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/startup/scripts/StartupProgress.ts b/assets/startup/scripts/StartupProgress.ts new file mode 100644 index 0000000..479ab60 --- /dev/null +++ b/assets/startup/scripts/StartupProgress.ts @@ -0,0 +1,30 @@ +export type PreparationPhase = 'idle' | 'loading' | 'finishing' | 'complete'; + +/** 未知耗时只估算到上限,真实完成才允许满格。 / Estimated waiting progress is capped until actual completion. */ +export class StartupProgress { + phase: PreparationPhase = 'idle'; + value = 0; + private elapsed = 0; + private finishElapsed = 0; + private finishFrom = 0; + begin(): void { this.reset(); this.phase = 'loading'; this.value = .03; } + reset(): void { this.phase = 'idle'; this.value = 0; this.elapsed = 0; this.finishElapsed = 0; this.finishFrom = 0; } + finish(): void { + if (this.phase !== 'loading') return; + this.phase = 'finishing'; this.finishFrom = this.value; + } + tick(seconds: number): number { + const dt = Number.isFinite(seconds) ? Math.min(.1, Math.max(0, seconds)) : 0; + if (this.phase === 'loading') { + this.elapsed += dt; + const target = .08 + .82 * (1 - Math.exp(-this.elapsed / 8)); + this.value = Math.min(.9, this.value + Math.max(0, target - this.value) * (1 - Math.exp(-dt * 7))); + } else if (this.phase === 'finishing') { + this.finishElapsed += dt; + const t = Math.min(1, this.finishElapsed / .24); + this.value = this.finishFrom + (1 - this.finishFrom) * (1 - (1 - t) ** 3); + if (t === 1) { this.value = 1; this.phase = 'complete'; } + } + return this.value; + } +} diff --git a/assets/startup/scripts/StartupProgress.ts.meta b/assets/startup/scripts/StartupProgress.ts.meta new file mode 100644 index 0000000..315a6ed --- /dev/null +++ b/assets/startup/scripts/StartupProgress.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "bd350eaf-d6b7-4516-9d17-78534f4862a6", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/startup/visuals.meta b/assets/startup/visuals.meta new file mode 100644 index 0000000..0e4dbd8 --- /dev/null +++ b/assets/startup/visuals.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "6d3c346b-a6f3-4b4f-922e-7a4ea7eff1f4", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/startup/visuals/prep-meter-fill.png b/assets/startup/visuals/prep-meter-fill.png new file mode 100644 index 0000000..b39ee2b Binary files /dev/null and b/assets/startup/visuals/prep-meter-fill.png differ diff --git a/assets/startup/visuals/prep-meter-fill.png.meta b/assets/startup/visuals/prep-meter-fill.png.meta new file mode 100644 index 0000000..b8709ee --- /dev/null +++ b/assets/startup/visuals/prep-meter-fill.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3@6c48a", + "displayName": "prep-meter-fill", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3", + "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": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3@f9941", + "displayName": "prep-meter-fill", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 5, + "width": 653, + "height": 90, + "rawWidth": 657, + "rawHeight": 100, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 48, + "borderRight": 48, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -326.5, + -45, + 0, + 326.5, + -45, + 0, + -326.5, + 45, + 0, + 326.5, + 45, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 2, + 95, + 655, + 95, + 2, + 5, + 655, + 5 + ], + "nuv": [ + 0.0030441400304414, + 0.05, + 0.9969558599695586, + 0.05, + 0.0030441400304414, + 0.95, + 0.9969558599695586, + 0.95 + ], + "minPos": [ + -326.5, + -45, + 0 + ], + "maxPos": [ + 326.5, + 45, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "6cc8cbd1-ca56-4bf5-9bd0-48a6a05f8de3@6c48a" + } +} diff --git a/assets/startup/visuals/prep-meter-frame.png b/assets/startup/visuals/prep-meter-frame.png new file mode 100644 index 0000000..94563f7 Binary files /dev/null and b/assets/startup/visuals/prep-meter-frame.png differ diff --git a/assets/startup/visuals/prep-meter-frame.png.meta b/assets/startup/visuals/prep-meter-frame.png.meta new file mode 100644 index 0000000..db906d3 --- /dev/null +++ b/assets/startup/visuals/prep-meter-frame.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "7a1db310-5d4f-4897-986f-3a1e216406d3", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "7a1db310-5d4f-4897-986f-3a1e216406d3@6c48a", + "displayName": "prep-meter-frame", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "7a1db310-5d4f-4897-986f-3a1e216406d3", + "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": "7a1db310-5d4f-4897-986f-3a1e216406d3@f9941", + "displayName": "prep-meter-frame", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 13, + "trimY": 2, + "width": 930, + "height": 161, + "rawWidth": 956, + "rawHeight": 165, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -465, + -80.5, + 0, + 465, + -80.5, + 0, + -465, + 80.5, + 0, + 465, + 80.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 13, + 163, + 943, + 163, + 13, + 2, + 943, + 2 + ], + "nuv": [ + 0.013598326359832637, + 0.012121212121212121, + 0.9864016736401674, + 0.012121212121212121, + 0.013598326359832637, + 0.9878787878787879, + 0.9864016736401674, + 0.9878787878787879 + ], + "minPos": [ + -465, + -80.5, + 0 + ], + "maxPos": [ + 465, + 80.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "7a1db310-5d4f-4897-986f-3a1e216406d3@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "7a1db310-5d4f-4897-986f-3a1e216406d3@6c48a" + } +} diff --git a/docs/guest-login.md b/docs/guest-login.md index e992e25..2fbacb2 100644 --- a/docs/guest-login.md +++ b/docs/guest-login.md @@ -1,6 +1,6 @@ # Fruit Pop 游客登录 -本阶段仅实现登录场景、两步游客认证及本地会话保存,不包含加载页或游戏主界面。 +当前实现登录场景、两步游客认证、本地会话保存及认证期间的 loading 界面层,尚不包含游戏主界面。 ## 场景与美术 @@ -40,8 +40,8 @@ 本地存储前缀为 fruit-pop.auth,按服务地址与产品隔离。重登失败不覆盖旧成功会话。 首次调用者拥有同一服务实例的合并请求及其取消信号;界面层禁止并发提交。 -认证成功后显示 Signed in successfully. 并发出不含 token 的 guest-authenticated 事件,供后续加载功能衔接。 -当前不添加加载场景,也不自动跳转。 +点击游客按钮后由独立 StartupLoadingView 展示同场景 loading 层。认证成功时发出不含 token 的 guest-authenticated 事件;进度收满并短暂停留后恢复 Signed in successfully. 落点,发出 startup-preparation-ready 事件。 +当前没有游戏主场景,不自动跳转;后续游戏场景加载与首屏就绪必须显式接入完成条件,不能把认证成功等同于游戏就绪。详见 startup-loading.md。 ## 验证记录 diff --git a/docs/startup-loading.md b/docs/startup-loading.md new file mode 100644 index 0000000..9df0121 --- /dev/null +++ b/docs/startup-loading.md @@ -0,0 +1,29 @@ +# Fruit Pop 加载界面 + +## 范围 + +- 在 Welcome 场景 Canvas 下添加独立 PreparationPanel,复用已有背景、Logo、水果节点。 +- 按 1080×1920 loading 参考图安排标题、百分比、进度槽及 Getting things ready;所有节点在编辑器中独立可修改,运行时不创建 UI。 +- 新切图通过资源工具导入到 assets/startup/visuals,命名 prep-meter-frame.png、prep-meter-fill.png。原始美术未修改,参考整图未作为运行背景导入。 +- 进度填充采用左锚点与九宫格,左右边距各 48 像素,满格宽度按槽内边界限制为 906,保留圆头和高光;原图上的 70% 只是编辑器展示样例。 + +## 职责与流程 + +- GuestLoginView 继续管理按钮绑定和认证生命周期,通过 guest-login-state-changed 发布无会话内容的展示状态。 +- StartupProgress 是独立于引擎的进度状态机。等待期间只估算到 90%,不会自行完成;认证成功后用 0.24 秒平滑收满,并显示 100% 至少约 0.12 秒。 +- StartupLoadingView 绑定已保存的场景节点,隐藏按钮和页脚,不禁用拥有认证请求的 WelcomeComposition。失败恢复原控件并展示最新错误,可再次点击登录。 +- 成功提示在 loading 收尾期间保持隐藏,结束后恢复。组件临时禁用保留待收尾状态,再启用后继续,不重复发送完成通知。 +- 当前没有主场景,完成后返回现有认证成功落点,并发送不含 token 的 startup-preparation-ready。后续接游戏场景时,需要让完成条件等待场景加载及首屏实际就绪;当前没有假装预加载不存在的资源。 +- 只参考 crimson-lantern 的职责分离、加载上限和真实完成原则,未复制其实现,也未引入原生更新工作流。 + +## 验证 + +- pnpm@11.17.0 安装锁定依赖,pnpm typecheck、pnpm test(19 项)通过。验收过程中出现过编辑器调整按钮缩放导致旧布局契约失败,后续保存值已恢复为 1;未放宽原登录布局测试。 +- 测试覆盖进度单调与上限、无效时间、真实完成和重置、场景布局、资源命名及九宫格边距、认证组件绑定。 +- PinK 场景预览核对 loading 展示、失败恢复、收尾文字互斥、禁用再启用及完成事件单次发送。 +- 编辑器允许打开 PreparationPanel 预览美术;初始隐藏由 StartupLoadingView.onLoad 执行,并在发布页验证,不强制覆盖编辑器可见状态。 +- web-mobile 构建成功。发布页注入验签失败后恢复可重试;随后真实两步认证成功,100% 后撤层并发送一次完成事件。 +- 540×960、390×844、390×640、844×390 核对主体与 loading 控件边界均在可见区域内,切图尺寸比例保持一致。 +- 最终产物 build/web-mobile-startup-release,构建成功;最终 pnpm typecheck 和 19 项测试全部通过。发布页启动隐藏覆盖层、满格宽度 906、左右圆头及恢复后的控件状态已复核。 + +未进行原生构建和真机验证;当前没有原生子工程,本轮范围为场景 UI 与 Web 认证流程。 \ No newline at end of file diff --git a/package.json b/package.json index 17c2bd1..50c4bdf 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,10 @@ "name": "fruit-pop-googleplay", "type": "3d", "version": "1.0.0", + "uuid": "", + "creator": { + "version": "unknow" + }, "private": true, "packageManager": "pnpm@11.17.0", "scripts": { @@ -16,10 +20,6 @@ "tsx": "4.20.3", "typescript": "5.8.3" }, - "uuid": "", - "creator": { - "version": "unknow" - }, "pink": { "uuid": "39d627e8-7de7-41b7-80d7-bf7a0a58b628", "version": "1.127.0", diff --git a/tests/startup-loading.test.ts b/tests/startup-loading.test.ts new file mode 100644 index 0000000..43c1414 --- /dev/null +++ b/tests/startup-loading.test.ts @@ -0,0 +1,73 @@ +import { test } from 'node:test'; +import { strict as assert } from 'node:assert'; +import { readFileSync, readdirSync } from 'node:fs'; +import { StartupProgress } from '../assets/startup/scripts/StartupProgress'; + +test('waiting progress stays monotonic and below completion, even after long waits', () => { + const progress = new StartupProgress(); + progress.begin(); + let previous = progress.value; + for (let i = 0; i < 6000; i++) { + const value = progress.tick(.1); + assert.ok(value >= previous && value <= .9); + previous = value; + } + assert.equal(progress.phase, 'loading'); + const before = progress.value; + progress.tick(NaN); progress.tick(-1); progress.tick(Infinity); + assert.equal(progress.value, before); +}); + +test('only real completion reaches 100%; retry resets progress and stale finish is ignored', () => { + const progress = new StartupProgress(); + progress.finish(); assert.equal(progress.phase, 'idle'); + progress.begin(); progress.tick(.1); progress.finish(); + const first = progress.tick(.1); + progress.finish(); + assert.ok(first < 1); + progress.tick(.1); progress.tick(.1); + assert.equal(progress.phase, 'complete'); assert.equal(progress.value, 1); + progress.begin(); assert.equal(progress.phase, 'loading'); assert.equal(progress.value, .03); + progress.reset(); progress.finish(); progress.tick(.1); + assert.equal(progress.phase, 'idle'); assert.equal(progress.value, 0); +}); + +// 场景必须由领域工具保存;测试只读取布局和资源引用。 / Domain tools author the scene; tests only inspect its saved layout and references. +type Entry = Record; +const scene: Entry[] = JSON.parse(readFileSync('assets/Welcome.scene', 'utf8')); +const node = (name: string): Entry => scene.find(item => item.__type__ === 'cc.Node' && item._name === name)!; +const components = (name: string): Entry[] => node(name)._components.map((ref: Entry) => scene[ref.__id__]); +const component = (name: string, type: string): Entry => components(name).find(item => item.__type__ === type)!; + +test('loading has independent editable labels and renamed frame/fill resources with preserved caps', () => { + assert.ok(node('PreparationPanel')._children.length >= 5); + for (const [name, text] of [['PreparationTitle', 'LOADING...'], ['PreparationPercent', '70%'], ['PreparationCaption', 'Getting things ready']]) { + assert.equal(component(name, 'cc.Label')._string, text); + } + assert.equal(component('PreparationFrame', 'cc.UITransform')._contentSize.width, 973); + assert.equal(component('PreparationFrame', 'cc.UITransform')._contentSize.height, 168); + assert.equal(node('PreparationFrame')._lpos.y, -576); + assert.equal(component('PreparationFill', 'cc.UITransform')._anchorPoint.x, 0); + assert.equal(component('PreparationFill', 'cc.UITransform')._contentSize.width, 906 * .7); + assert.equal(component('PreparationFill', 'cc.Sprite')._type, 1); + for (const [name, file] of [['PreparationFrame', 'prep-meter-frame'], ['PreparationFill', 'prep-meter-fill']]) { + const meta = JSON.parse(readFileSync(`assets/startup/visuals/${file}.png.meta`, 'utf8')); + assert.equal(component(name, 'cc.Sprite')._spriteFrame.__uuid__, meta.uuid + '@f9941'); + if (name === 'PreparationFill') { + assert.equal(meta.subMetas.f9941.userData.borderLeft, 48); + assert.equal(meta.subMetas.f9941.userData.borderRight, 48); + } + } + assert.deepEqual(readdirSync('assets/startup/visuals').filter(file => !file.endsWith('.meta')).sort(), ['prep-meter-fill.png', 'prep-meter-frame.png']); +}); + +test('loading binds the existing login without hiding its request-owning node', () => { + const loading = components('Canvas').find(item => item.panel && item.meter)!; + assert.ok(loading); + assert.equal(scene[loading.panel.__id__]._name, 'PreparationPanel'); + assert.equal(scene[loading.login.__id__].node.__id__, scene.indexOf(node('WelcomeComposition'))); + assert.equal(scene[loading.meter.__id__].node.__id__, scene.indexOf(node('PreparationFill'))); + const hidden = loading.loginControls.map((ref: Entry) => scene[ref.__id__]._name); + assert.ok(hidden.includes('GuestAccess')); assert.ok(hidden.includes('PrivacyLink')); + assert.ok(!hidden.includes('WelcomeComposition')); assert.ok(!hidden.includes('BrandMark')); +}); \ No newline at end of file diff --git a/美术资源/06-free-coins-available/06-free-coins-available.png b/美术资源/06-free-coins-available/06-free-coins-available.png new file mode 100644 index 0000000..7661039 Binary files /dev/null and b/美术资源/06-free-coins-available/06-free-coins-available.png differ diff --git a/美术资源/06-free-coins-available/amount-bar-no-text.png b/美术资源/06-free-coins-available/amount-bar-no-text.png new file mode 100644 index 0000000..091030c Binary files /dev/null and b/美术资源/06-free-coins-available/amount-bar-no-text.png differ diff --git a/美术资源/06-free-coins-available/claim-button.png b/美术资源/06-free-coins-available/claim-button.png new file mode 100644 index 0000000..7768c72 Binary files /dev/null and b/美术资源/06-free-coins-available/claim-button.png differ diff --git a/美术资源/06-free-coins-available/close.png b/美术资源/06-free-coins-available/close.png new file mode 100644 index 0000000..4a3b3c2 Binary files /dev/null and b/美术资源/06-free-coins-available/close.png differ diff --git a/美术资源/06-free-coins-available/daily-label.png b/美术资源/06-free-coins-available/daily-label.png new file mode 100644 index 0000000..69692e6 Binary files /dev/null and b/美术资源/06-free-coins-available/daily-label.png differ diff --git a/美术资源/06-free-coins-available/panel-background.png b/美术资源/06-free-coins-available/panel-background.png new file mode 100644 index 0000000..9faafb5 Binary files /dev/null and b/美术资源/06-free-coins-available/panel-background.png differ diff --git a/美术资源/06-free-coins-available/reward.png b/美术资源/06-free-coins-available/reward.png new file mode 100644 index 0000000..e251498 Binary files /dev/null and b/美术资源/06-free-coins-available/reward.png differ diff --git a/美术资源/06-free-coins-available/title.png b/美术资源/06-free-coins-available/title.png new file mode 100644 index 0000000..26ae783 Binary files /dev/null and b/美术资源/06-free-coins-available/title.png differ diff --git a/美术资源/07-free-coins-claimed/07-free-coins-claimed.png b/美术资源/07-free-coins-claimed/07-free-coins-claimed.png new file mode 100644 index 0000000..44b2964 Binary files /dev/null and b/美术资源/07-free-coins-claimed/07-free-coins-claimed.png differ diff --git a/美术资源/07-free-coins-claimed/amount-bar-no-text.png b/美术资源/07-free-coins-claimed/amount-bar-no-text.png new file mode 100644 index 0000000..981780b Binary files /dev/null and b/美术资源/07-free-coins-claimed/amount-bar-no-text.png differ diff --git a/美术资源/07-free-coins-claimed/claimed-button.png b/美术资源/07-free-coins-claimed/claimed-button.png new file mode 100644 index 0000000..4435330 Binary files /dev/null and b/美术资源/07-free-coins-claimed/claimed-button.png differ diff --git a/美术资源/07-free-coins-claimed/close.png b/美术资源/07-free-coins-claimed/close.png new file mode 100644 index 0000000..b2ca6c6 Binary files /dev/null and b/美术资源/07-free-coins-claimed/close.png differ diff --git a/美术资源/07-free-coins-claimed/daily-label.png b/美术资源/07-free-coins-claimed/daily-label.png new file mode 100644 index 0000000..5738967 Binary files /dev/null and b/美术资源/07-free-coins-claimed/daily-label.png differ diff --git a/美术资源/07-free-coins-claimed/panel-background.png b/美术资源/07-free-coins-claimed/panel-background.png new file mode 100644 index 0000000..03efade Binary files /dev/null and b/美术资源/07-free-coins-claimed/panel-background.png differ diff --git a/美术资源/07-free-coins-claimed/reward.png b/美术资源/07-free-coins-claimed/reward.png new file mode 100644 index 0000000..ceb8d4b Binary files /dev/null and b/美术资源/07-free-coins-claimed/reward.png differ diff --git a/美术资源/07-free-coins-claimed/title-no-close.png b/美术资源/07-free-coins-claimed/title-no-close.png new file mode 100644 index 0000000..dea6dcc Binary files /dev/null and b/美术资源/07-free-coins-claimed/title-no-close.png differ diff --git a/美术资源/08-insufficient-coins/08-insufficient-coins.png b/美术资源/08-insufficient-coins/08-insufficient-coins.png new file mode 100644 index 0000000..28bd76b Binary files /dev/null and b/美术资源/08-insufficient-coins/08-insufficient-coins.png differ diff --git a/美术资源/08-insufficient-coins/close-button.png b/美术资源/08-insufficient-coins/close-button.png new file mode 100644 index 0000000..ab58e51 Binary files /dev/null and b/美术资源/08-insufficient-coins/close-button.png differ diff --git a/美术资源/08-insufficient-coins/description.png b/美术资源/08-insufficient-coins/description.png new file mode 100644 index 0000000..909710a Binary files /dev/null and b/美术资源/08-insufficient-coins/description.png differ diff --git a/美术资源/08-insufficient-coins/free-coins-button.png b/美术资源/08-insufficient-coins/free-coins-button.png new file mode 100644 index 0000000..0ff025f Binary files /dev/null and b/美术资源/08-insufficient-coins/free-coins-button.png differ diff --git a/美术资源/08-insufficient-coins/fruit-and-coins.png b/美术资源/08-insufficient-coins/fruit-and-coins.png new file mode 100644 index 0000000..eda1b1b Binary files /dev/null and b/美术资源/08-insufficient-coins/fruit-and-coins.png differ diff --git a/美术资源/08-insufficient-coins/not-now-button.png b/美术资源/08-insufficient-coins/not-now-button.png new file mode 100644 index 0000000..7e08856 Binary files /dev/null and b/美术资源/08-insufficient-coins/not-now-button.png differ diff --git a/美术资源/08-insufficient-coins/popup-background.png b/美术资源/08-insufficient-coins/popup-background.png new file mode 100644 index 0000000..7323f7b Binary files /dev/null and b/美术资源/08-insufficient-coins/popup-background.png differ diff --git a/美术资源/08-insufficient-coins/title.png b/美术资源/08-insufficient-coins/title.png new file mode 100644 index 0000000..0c632b8 Binary files /dev/null and b/美术资源/08-insufficient-coins/title.png differ diff --git a/美术资源/10-free-spins-trigger/10-free-spins-trigger.png b/美术资源/10-free-spins-trigger/10-free-spins-trigger.png new file mode 100644 index 0000000..29cbd82 Binary files /dev/null and b/美术资源/10-free-spins-trigger/10-free-spins-trigger.png differ diff --git a/美术资源/10-free-spins-trigger/awarded.png b/美术资源/10-free-spins-trigger/awarded.png new file mode 100644 index 0000000..0f3af49 Binary files /dev/null and b/美术资源/10-free-spins-trigger/awarded.png differ diff --git a/美术资源/10-free-spins-trigger/digit-8.png b/美术资源/10-free-spins-trigger/digit-8.png new file mode 100644 index 0000000..a8d3baa Binary files /dev/null and b/美术资源/10-free-spins-trigger/digit-8.png differ diff --git a/美术资源/10-free-spins-trigger/font/digits.fnt b/美术资源/10-free-spins-trigger/font/digits.fnt new file mode 100644 index 0000000..600edf4 --- /dev/null +++ b/美术资源/10-free-spins-trigger/font/digits.fnt @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/美术资源/10-free-spins-trigger/font/digits.png b/美术资源/10-free-spins-trigger/font/digits.png new file mode 100644 index 0000000..b180f65 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/digits.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/0.png b/美术资源/10-free-spins-trigger/font/glyphs/0.png new file mode 100644 index 0000000..6b262a3 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/0.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/1.png b/美术资源/10-free-spins-trigger/font/glyphs/1.png new file mode 100644 index 0000000..f510e21 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/1.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/2.png b/美术资源/10-free-spins-trigger/font/glyphs/2.png new file mode 100644 index 0000000..2bd3d62 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/2.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/3.png b/美术资源/10-free-spins-trigger/font/glyphs/3.png new file mode 100644 index 0000000..2c6e2d0 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/3.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/4.png b/美术资源/10-free-spins-trigger/font/glyphs/4.png new file mode 100644 index 0000000..94f5088 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/4.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/5.png b/美术资源/10-free-spins-trigger/font/glyphs/5.png new file mode 100644 index 0000000..a0b0dad Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/5.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/6.png b/美术资源/10-free-spins-trigger/font/glyphs/6.png new file mode 100644 index 0000000..b105a45 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/6.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/7.png b/美术资源/10-free-spins-trigger/font/glyphs/7.png new file mode 100644 index 0000000..b3fccfb Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/7.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/8.png b/美术资源/10-free-spins-trigger/font/glyphs/8.png new file mode 100644 index 0000000..f703d4b Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/8.png differ diff --git a/美术资源/10-free-spins-trigger/font/glyphs/9.png b/美术资源/10-free-spins-trigger/font/glyphs/9.png new file mode 100644 index 0000000..39ba5e7 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/glyphs/9.png differ diff --git a/美术资源/10-free-spins-trigger/font/preview-0123456789.png b/美术资源/10-free-spins-trigger/font/preview-0123456789.png new file mode 100644 index 0000000..4c30e07 Binary files /dev/null and b/美术资源/10-free-spins-trigger/font/preview-0123456789.png differ diff --git a/美术资源/10-free-spins-trigger/scatter.png b/美术资源/10-free-spins-trigger/scatter.png new file mode 100644 index 0000000..690195f Binary files /dev/null and b/美术资源/10-free-spins-trigger/scatter.png differ diff --git a/美术资源/10-free-spins-trigger/start.png b/美术资源/10-free-spins-trigger/start.png new file mode 100644 index 0000000..48a11af Binary files /dev/null and b/美术资源/10-free-spins-trigger/start.png differ diff --git a/美术资源/10-free-spins-trigger/title.png b/美术资源/10-free-spins-trigger/title.png new file mode 100644 index 0000000..7288c7a Binary files /dev/null and b/美术资源/10-free-spins-trigger/title.png differ diff --git a/美术资源/12-free-spins-result/12-free-spins-result.png b/美术资源/12-free-spins-result/12-free-spins-result.png new file mode 100644 index 0000000..7b45d65 Binary files /dev/null and b/美术资源/12-free-spins-result/12-free-spins-result.png differ diff --git a/美术资源/12-free-spins-result/cherries-decoration.png b/美术资源/12-free-spins-result/cherries-decoration.png new file mode 100644 index 0000000..3d7b4d9 Binary files /dev/null and b/美术资源/12-free-spins-result/cherries-decoration.png differ diff --git a/美术资源/12-free-spins-result/coin-value-frame-no-number.png b/美术资源/12-free-spins-result/coin-value-frame-no-number.png new file mode 100644 index 0000000..8c56dc5 Binary files /dev/null and b/美术资源/12-free-spins-result/coin-value-frame-no-number.png differ diff --git a/美术资源/12-free-spins-result/continue-button.png b/美术资源/12-free-spins-result/continue-button.png new file mode 100644 index 0000000..7e30d31 Binary files /dev/null and b/美术资源/12-free-spins-result/continue-button.png differ diff --git a/美术资源/12-free-spins-result/free-spins-complete-title.png b/美术资源/12-free-spins-result/free-spins-complete-title.png new file mode 100644 index 0000000..4eb67b4 Binary files /dev/null and b/美术资源/12-free-spins-result/free-spins-complete-title.png differ diff --git a/美术资源/12-free-spins-result/popup-background.png b/美术资源/12-free-spins-result/popup-background.png new file mode 100644 index 0000000..0e5b313 Binary files /dev/null and b/美术资源/12-free-spins-result/popup-background.png differ diff --git a/美术资源/12-free-spins-result/total-win-label.png b/美术资源/12-free-spins-result/total-win-label.png new file mode 100644 index 0000000..976a978 Binary files /dev/null and b/美术资源/12-free-spins-result/total-win-label.png differ