diff --git a/assets/Game/SlotRanking/prefab/SlotRanking.prefab b/assets/Game/SlotRanking/prefab/SlotRanking.prefab index 1e0ee34..48ff2e2 100644 --- a/assets/Game/SlotRanking/prefab/SlotRanking.prefab +++ b/assets/Game/SlotRanking/prefab/SlotRanking.prefab @@ -1037,7 +1037,7 @@ "__id__": 378 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 387 @@ -1253,7 +1253,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 873.017578125, + "width": 893.55908203125, "height": 50.4 }, "_anchorPoint": { @@ -1289,7 +1289,7 @@ "b": 187, "a": 255 }, - "_string": "活动介绍:活动期间参与指定游戏,并将赢分排在前XX名即可获得丰厚大", + "_string": "누적 베팅 횟수 XX회 및 누적 베팅 금액 XX를 달성하면 이벤트에 참여할 수 있습니다", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 27, @@ -1302,7 +1302,7 @@ "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, - "_isBold": true, + "_isBold": false, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, @@ -15686,7 +15686,7 @@ "__id__": 940 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 1004 @@ -26074,7 +26074,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920.0000000000002 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -26151,7 +26151,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1080, - "height": 1920.0000000000002 + "height": 1920 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/Game/SlotRanking/scripts/RankList.ts b/assets/Game/SlotRanking/scripts/RankList.ts index f32ea17..9fb36ac 100644 --- a/assets/Game/SlotRanking/scripts/RankList.ts +++ b/assets/Game/SlotRanking/scripts/RankList.ts @@ -1,4 +1,4 @@ -import { _decorator, Button, Color, Component, Label, Node, Sprite, Tween, tween, UITransform, v3 } from 'cc'; +import { _decorator, Button, Color, Component, Label, Node, Sprite, Tween, tween, UITransform, v3, Vec2 } from 'cc'; import { VirtualScrollView } from './VScrollView'; import { Palette } from './Palette'; import { SlotRankingDataManager } from './SlotRankingDataManager'; @@ -249,11 +249,24 @@ export class RankList extends Component { // 再次强制更新以确保宽度准确 labelComp.updateRenderData(true); let labelLength = labelComp.node.getComponent(UITransform).width; + let maskLength = this.msg_1.parent.getComponent(UITransform).width // 设置初始位置 - this.msg_1.setPosition(-450, this.msg_1.position.y, this.msg_1.position.z); - let endX = -labelLength; - let duration = Math.max(3, (-450 + labelLength) / 80); + let endX = 0 + let duration = 0 + + if (labelLength <= maskLength) { + labelComp.node.getComponent(UITransform).setAnchorPoint(new Vec2(0.5, 0.5)) + this.msg_1.setPosition(0, this.msg_1.position.y, this.msg_1.position.z); + endX = - maskLength / 2 - labelLength / 2 - 30 + duration = Math.max(3, labelLength / 80); + } else { + labelComp.node.getComponent(UITransform).setAnchorPoint(new Vec2(0, 0.5)) + this.msg_1.setPosition(- maskLength / 2, this.msg_1.position.y, this.msg_1.position.z); + endX = - maskLength / 2 - labelLength - 30 + duration = Math.max(3, (- maskLength / 2 + labelLength) / 80); + + } // 启动跑马灯动画 Tween.stopAllByTarget(this.msg_1); diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index 97db4d9..1628f1f 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -76,9 +76,6 @@ { "__id__": 8 }, - { - "__id__": 64 - }, { "__id__": 67 } @@ -341,22 +338,22 @@ "__id__": 9 }, { - "__id__": 57 + "__id__": 60 } ], "_active": true, "_components": [ - { - "__id__": 60 - }, - { - "__id__": 61 - }, - { - "__id__": 62 - }, { "__id__": 63 + }, + { + "__id__": 64 + }, + { + "__id__": 65 + }, + { + "__id__": 66 } ], "_prefab": null, @@ -427,15 +424,18 @@ }, { "__id__": 46 + }, + { + "__id__": 55 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 58 }, { - "__id__": 56 + "__id__": 59 } ], "_prefab": null, @@ -2121,6 +2121,115 @@ "handler": "onStartBtnClick", "customEventData": "" }, + { + "__type__": "cc.Node", + "_name": "Logo", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 9 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 56 + }, + { + "__id__": 57 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -863.572, + "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": "7fIthn6UNHcLw6FSdCz2Pr" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 55 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 312 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "87yEPbyQ5Oo67IhJRV9xNy" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 55 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "9251663c-e78f-40a1-80a9-7992abf27cad@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": "fbc6nCtwZOupP1ub4elEjo" + }, { "__type__": "cc.UITransform", "_name": "", @@ -2185,10 +2294,10 @@ "_active": true, "_components": [ { - "__id__": 58 + "__id__": 61 }, { - "__id__": 59 + "__id__": 62 } ], "_prefab": null, @@ -2227,7 +2336,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2249,7 +2358,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 57 + "__id__": 60 }, "_enabled": true, "__prefab": null, @@ -2381,115 +2490,6 @@ "_miterLimit": 10, "_id": "88ENBOYIpCGKFcHVTgSMzZ" }, - { - "__type__": "cc.Node", - "_name": "Logo", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 65 - }, - { - "__id__": 66 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -863.572, - "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": "7fIthn6UNHcLw6FSdCz2Pr" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 64 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 312 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "87yEPbyQ5Oo67IhJRV9xNy" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 64 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "9251663c-e78f-40a1-80a9-7992abf27cad@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": "fbc6nCtwZOupP1ub4elEjo" - }, { "__type__": "cc.Node", "_name": "tips", @@ -3087,7 +3087,7 @@ "__id__": 9 }, "rb7Logo": { - "__id__": 64 + "__id__": 55 }, "languageJson": { "__uuid__": "65d2a408-9396-47e4-99de-73423a590b7f", @@ -3118,7 +3118,7 @@ "__id__": 5 }, "Logo": { - "__id__": 64 + "__id__": 55 }, "rotateNode": { "__id__": 67 diff --git a/assets/Loading/scripts/comm.ts b/assets/Loading/scripts/comm.ts index 4d118ff..fe4b9d1 100644 --- a/assets/Loading/scripts/comm.ts +++ b/assets/Loading/scripts/comm.ts @@ -7,7 +7,7 @@ import { PREVIEW } from "cc/env" const gameId = "rp_11001"; // let apiaddr = "https://rpgames-api.rpfafafahkdev.com"; let apiaddr = ""; -let token = "eyJQIjoxMDA5NDksIkUiOjE3Njc2Mzg4MTgsIlMiOjEwMDUsIkQiOiJycF8xMTAwMSJ9._8ddABlHN9TDbjznz2Tde1SC2mZBTJg2olyYV-ZhTiQ"; +let token = "eyJQIjoxMDA5NDksIkUiOjE3Njc3MTM4NTcsIlMiOjk5OCwiRCI6InJwXzExMDAxIn0.NgM_swidNSUlWC58DKHBzYNn4RWEjtQWDTgli0qEyl8"; let language = "en"