Compare commits

..

No commits in common. "master" and "v0.0.98" have entirely different histories.

10 changed files with 98 additions and 289 deletions

View File

@ -19,9 +19,7 @@ jobs:
echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- name: npm i
run: |
echo 'npm i'
npm i
echo "✅ npm i done"
- name: build
run: |
echo 'build'

View File

@ -50,25 +50,22 @@
},
{
"__id__": 1376
},
{
"__id__": 1386
}
],
"_active": true,
"_components": [
{
"__id__": 1394
"__id__": 1386
},
{
"__id__": 1396
"__id__": 1388
},
{
"__id__": 1398
"__id__": 1390
}
],
"_prefab": {
"__id__": 1400
"__id__": 1392
},
"_lpos": {
"__type__": "cc.Vec3",
@ -2300,7 +2297,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f4Gg4bv2NCUoW2+JwNkNLh"
"fileId": "b2TwwhnxJH76Y+/zSWtZSA"
},
{
"__type__": "cc.PrefabInfo",
@ -2310,7 +2307,7 @@
"asset": {
"__id__": 0
},
"fileId": "11bk2QCntOxJC/Kf1YArEX",
"fileId": "52GkHtN/5AS7JAYzyjxbvh",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -2341,7 +2338,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "eb74xlYRVGbYvIvzPPX2fK"
"fileId": "f0saoipZVPOLhV1PCaWIGX"
},
{
"__type__": "cc.PrefabInfo",
@ -2351,7 +2348,7 @@
"asset": {
"__id__": 0
},
"fileId": "a8n6fBHDJKxKebTC2ahZE4",
"fileId": "a6QQ1UTPhNN4/aa8jgVZeu",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -2382,7 +2379,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "18xQQjfTRPv439te/QUyRh"
"fileId": "d8Mt8viIVHw77SmyJfHbTR"
},
{
"__type__": "5fc10Zl7lVO97/rr2J1uxWH",
@ -2406,7 +2403,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "5bqQpHhn1Nz6I1GEvsCNJX"
"fileId": "32hABGX/dEDoc6s+1MmJ59"
},
{
"__type__": "5fd13+Xa69CZogb3Q/F1lnC",
@ -2579,7 +2576,7 @@
"asset": {
"__id__": 0
},
"fileId": "deAZ5BMhBB0a5t/hRkEzi7",
"fileId": "4aILCnwlBDB7hGZd2Ynl+M",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -2604,7 +2601,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "eaRNpA2ZFPioFBGP8E78OJ"
"fileId": "0bV0tfQhRMN6d7H0ibKbjU"
},
{
"__type__": "cc.UITransform",
@ -2632,7 +2629,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "1b9ScCOhlIjIZAubYlOKUD"
"fileId": "87cTvkTYVGTqO1G0zeapjf"
},
{
"__type__": "cc.Sprite",
@ -2677,7 +2674,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "e5zf2hwhhErLw5n8rPAhCE"
"fileId": "44VLxjV9lNEKL7m6QiTsDE"
},
{
"__type__": "cc.PrefabInfo",
@ -2687,7 +2684,7 @@
"asset": {
"__id__": 0
},
"fileId": "fcL/AOLMxIrborIFwVfo8i",
"fileId": "c4E9QiWNFDkqphtp7wZDOk",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -2942,7 +2939,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "5faZd2aARL/43y6WZMyO4x"
"fileId": "0fboYHWHZNWIUbXhqazPsq"
},
{
"__type__": "cc.PrefabInfo",
@ -2952,7 +2949,7 @@
"asset": {
"__id__": 0
},
"fileId": "ffx+Z2YCFAVay6kQuRas76",
"fileId": "13+ILSCshI/5ip7LS5/6gd",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -2983,7 +2980,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "97u2nJ15lOuquow25r3Bja"
"fileId": "643B7cb2NAR7lSwMKp1GZj"
},
{
"__type__": "cc.PrefabInfo",
@ -2993,7 +2990,7 @@
"asset": {
"__id__": 0
},
"fileId": "54DjDWRnNHEJWee198pMLg",
"fileId": "f1CeTHGZFMWbdUk44tM+2T",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3024,7 +3021,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "790wmtrpJLQ777R4VZmzHD"
"fileId": "0faSbheTdNAbTHKkVHN7R9"
},
{
"__type__": "45522uB1sdFu4FJAojtnha4",
@ -3048,7 +3045,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "bcjVsBJB1Ed7ItfaGxh3/H"
"fileId": "49BAFjRzlEg4a5w9VAFU5X"
},
{
"__type__": "cc.PrefabInfo",
@ -3058,7 +3055,7 @@
"asset": {
"__id__": 0
},
"fileId": "beZ8pMMm5M4rP4T8FJjTpB",
"fileId": "56ysntvhREJaKGOpDwJobF",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3241,7 +3238,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "9e8SgfJjxMFZIV0oP82hyQ"
"fileId": "7e2ZjFsqBFP5cCRxgtmf+t"
},
{
"__type__": "cc.PrefabInfo",
@ -3251,7 +3248,7 @@
"asset": {
"__id__": 0
},
"fileId": "4ec5LXoTpP8bUOj9AcjtQJ",
"fileId": "d5i0MG52hKvZuSU8d8vmXq",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3282,7 +3279,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4ffJ4jab9BmLWvNgVZnDmN"
"fileId": "05jh2EoupN2aPTiwaWTAjx"
},
{
"__type__": "cc.PrefabInfo",
@ -3292,7 +3289,7 @@
"asset": {
"__id__": 0
},
"fileId": "78IFwl9S1G0o0W+fI/0UsS",
"fileId": "a63qbKtfhIhpSE30CtElEi",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3323,7 +3320,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "5eNlmXLYJHiJJEFlvVutKH"
"fileId": "d8zY+1i6FEZ6El4yQMl12s"
},
{
"__type__": "45522uB1sdFu4FJAojtnha4",
@ -3347,7 +3344,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "0faGWcIKNGdJQXetCGLPcr"
"fileId": "a9L2Yr7FNKaLtD/OeYJdpl"
},
{
"__type__": "cc.PrefabInfo",
@ -3357,7 +3354,7 @@
"asset": {
"__id__": 0
},
"fileId": "08DZBPuLZCdpNbiM3zTkbQ",
"fileId": "73VyHT/BRFkZ59ltUPthmo",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3540,7 +3537,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "a8nGhZoctG0LfK7IaOCzU0"
"fileId": "7bSXs34xBDiasIy27NQf9m"
},
{
"__type__": "cc.PrefabInfo",
@ -3550,7 +3547,7 @@
"asset": {
"__id__": 0
},
"fileId": "066lZOMh9L9akHmp2ZhUMV",
"fileId": "dcW1sfkKZFx6jT6RDiJ27s",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3581,7 +3578,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f5+LWcAOtP8J95uKypRZdh"
"fileId": "0cNAqyRLRKUpmCNuxqJwEb"
},
{
"__type__": "cc.PrefabInfo",
@ -3591,7 +3588,7 @@
"asset": {
"__id__": 0
},
"fileId": "eaJWLaewJNObKk4KYgrpxj",
"fileId": "fbN+xzJFhCn5xAwb6MbqzN",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3622,7 +3619,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "950I5Q5cRPp6C3+km7TqS3"
"fileId": "d7NfPm6CtPYYeTTMWVRPil"
},
{
"__type__": "45522uB1sdFu4FJAojtnha4",
@ -3646,7 +3643,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "7dXgXiMRhDfL0rO6X0lM73"
"fileId": "12uERD9oNHXLN9QrvPgXI6"
},
{
"__type__": "cc.PrefabInfo",
@ -3656,7 +3653,7 @@
"asset": {
"__id__": 0
},
"fileId": "a5yYSJTJ9JN6vAnJJdmFx3",
"fileId": "43HdYUNGFN86ZboSc/0emO",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3839,7 +3836,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "06a4B33eJM1Km6bOdD6oc+"
"fileId": "4eCAoMvatGC5vK27lyKCm9"
},
{
"__type__": "cc.PrefabInfo",
@ -3849,7 +3846,7 @@
"asset": {
"__id__": 0
},
"fileId": "4ajGiaIlxHua5GzzAy+dmo",
"fileId": "20Mznl3ANNTbhTvg/jwte8",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3880,7 +3877,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d2YeBBoo5A7Yb395f0fHF4"
"fileId": "a22g2vYFpMMJ8r4Ihp9CXm"
},
{
"__type__": "cc.PrefabInfo",
@ -3890,7 +3887,7 @@
"asset": {
"__id__": 0
},
"fileId": "ac5ybgPrJKQ4QXmRHgemq8",
"fileId": "36uPaDpHBEp5H4i69oODPH",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -3921,7 +3918,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2ffM3bdnxGUbYr1VRiPrps"
"fileId": "ecY/RLiy9KXrOob/Nm1LuB"
},
{
"__type__": "45522uB1sdFu4FJAojtnha4",
@ -3945,7 +3942,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "dcOXuLG65Ea740lFqW8vN2"
"fileId": "2a35GyhtZAgZ9DjzSY8bgq"
},
{
"__type__": "cc.PrefabInfo",
@ -3955,7 +3952,7 @@
"asset": {
"__id__": 0
},
"fileId": "12Ga2SdYNBBojuaPGJfEZc",
"fileId": "5eF6boi/BMpLeWgJjsEg9V",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4138,7 +4135,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d5+21H/iVPv5XZpjM7MPxG"
"fileId": "66/tk+89dDZa5IofR0CBit"
},
{
"__type__": "cc.PrefabInfo",
@ -4148,7 +4145,7 @@
"asset": {
"__id__": 0
},
"fileId": "8bV9nOAZhNBbvKGl1CePTc",
"fileId": "b1Kt8U6O1Llb5RFWfQkqpv",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4179,7 +4176,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "75t972NyVF7YNd3AKMOfDG"
"fileId": "13g74ECRNNKKl4iJWvGR4L"
},
{
"__type__": "cc.PrefabInfo",
@ -4189,7 +4186,7 @@
"asset": {
"__id__": 0
},
"fileId": "70NRzJCopGfKbXvqrl35ZS",
"fileId": "276uwfYadGr4oCfabcgeOZ",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4220,7 +4217,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2aI/cSdaVG7rvozZ4iUTiU"
"fileId": "fdhSoyjL1F3o1b4i8zFb70"
},
{
"__type__": "45522uB1sdFu4FJAojtnha4",
@ -4244,7 +4241,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "f4w4HHMEZP9qRJsnYn7MWU"
"fileId": "26W0VFH9xEQozypOHq0Ug5"
},
{
"__type__": "cc.PrefabInfo",
@ -4254,7 +4251,7 @@
"asset": {
"__id__": 0
},
"fileId": "7azXfEuh9NnpmFk8MgdAfS",
"fileId": "25KpT/kApLa6PlKB4IhT5H",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4437,7 +4434,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2fprvqimVIzJQfDjkKvuvs"
"fileId": "e5KNNooddLGZiH55QvncHW"
},
{
"__type__": "cc.PrefabInfo",
@ -4447,7 +4444,7 @@
"asset": {
"__id__": 0
},
"fileId": "36FhPT8C1KkKT/qNMhHDnf",
"fileId": "dakDWuNY1ADIHfiLJm8UJW",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4478,7 +4475,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "daFw7aWftJF6Ve5CHUq0HK"
"fileId": "24McWfMrJLcqxUKt9UGpHf"
},
{
"__type__": "cc.PrefabInfo",
@ -4488,7 +4485,7 @@
"asset": {
"__id__": 0
},
"fileId": "a1pZ+d6v5EiLeYBeQt6unG",
"fileId": "55AiyhpyFMM4/5T7WaMbkT",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4519,7 +4516,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "b575sE27BDp7WNhwv0x81X"
"fileId": "30oNT/7VZO2Ld7qaYmCHuj"
},
{
"__type__": "45522uB1sdFu4FJAojtnha4",
@ -4543,7 +4540,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "27iaFASVNGtIEn5L3Nd30Y"
"fileId": "eesfDh+utHbrgPkQrRt/EV"
},
{
"__type__": "cc.PrefabInfo",
@ -4553,7 +4550,7 @@
"asset": {
"__id__": 0
},
"fileId": "d2Fob7+8RIJq0m9uPoTQru",
"fileId": "bdHyNoSK5Bp5cfTzLh9Zth",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -4578,7 +4575,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "63bIOjWbJH3KOdDadWP3vc"
"fileId": "d3Xjj6HBREYZO7V1V0hQqx"
},
{
"__type__": "cc.UITransform",
@ -4606,7 +4603,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "347k8acNBI2bPVDA9hUmSY"
"fileId": "bb7+UzFSVNAarmXtxfafsl"
},
{
"__type__": "cc.Sprite",
@ -4651,7 +4648,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "983DRgidBIv5cVdUZJQr7K"
"fileId": "f6faqNpQ5J37X70yyvgg4k"
},
{
"__type__": "cc.PrefabInfo",
@ -4661,7 +4658,7 @@
"asset": {
"__id__": 0
},
"fileId": "7dri8YhVRCaKBFB6Owy/t9",
"fileId": "7dWyDbhk5Jc7rcq3h2kWJH",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@ -12298,7 +12295,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -23754,7 +23751,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -23925,7 +23922,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -24120,7 +24117,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -24272,7 +24269,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -24424,7 +24421,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -24576,7 +24573,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -30097,7 +30094,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -30317,154 +30314,6 @@
"07ZW33UgNAH6k7PRJ+Wz4M"
]
},
{
"__type__": "cc.Node",
"_name": "gray",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1387
},
{
"__id__": 1389
},
{
"__id__": 1391
}
],
"_prefab": {
"__id__": 1393
},
"_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__": 1386
},
"_enabled": true,
"__prefab": {
"__id__": 1388
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "8dnEFMZhdBHZgGTN35mIfp"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1386
},
"_enabled": true,
"__prefab": {
"__id__": 1390
},
"_alignFlags": 45,
"_target": null,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "6d7HB/3g5J2LzW+CANn6gq"
},
{
"__type__": "cc.BlockInputEvents",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1386
},
"_enabled": true,
"__prefab": {
"__id__": 1392
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "1aPZzXzAFCuZ93rILNDyPe"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "88eS+SRl1LOJg4IojX4U5f",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
@ -30475,12 +30324,12 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1395
"__id__": 1387
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
"height": 1919.9999999999998
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -30503,7 +30352,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1397
"__id__": 1389
},
"slotGame": {
"__id__": 548
@ -30534,9 +30383,6 @@
"__id__": 1373
},
"slotRanking": null,
"gray": {
"__id__": 1386
},
"_id": ""
},
{
@ -30553,7 +30399,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 1399
"__id__": 1391
},
"_alignFlags": 45,
"_target": null,
@ -30591,10 +30437,10 @@
"instance": null,
"targetOverrides": [
{
"__id__": 1401
"__id__": 1393
},
{
"__id__": 1404
"__id__": 1396
}
],
"nestedPrefabInstanceRoots": [
@ -30615,7 +30461,7 @@
"__id__": 563
},
"sourceInfo": {
"__id__": 1402
"__id__": 1394
},
"propertyPath": [
"_target"
@ -30624,7 +30470,7 @@
"__id__": 563
},
"targetInfo": {
"__id__": 1403
"__id__": 1395
}
},
{
@ -30642,7 +30488,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 1396
"__id__": 1388
},
"sourceInfo": null,
"propertyPath": [
@ -30652,7 +30498,7 @@
"__id__": 1376
},
"targetInfo": {
"__id__": 1405
"__id__": 1397
}
},
{

View File

@ -1160,7 +1160,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": -83.523,
"y": -70,
"z": 0
},
"_lrot": {
@ -1201,7 +1201,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 167.19189453125,
"height": 80
"height": 54.18
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -1243,7 +1243,7 @@
"_fontSize": 43,
"_fontFamily": "Arial",
"_lineHeight": 43,
"_overflow": 2,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,

View File

@ -416,25 +416,25 @@ export class SlotBar extends Component {
if (this.isGetBalance) return
this.isGetBalance = true;
try {
let balacneData = await this.refreshBalanceFromServer();
this.setBalance(balacneData)
return balacneData;
let balacneData = await callGameBalanceApi({ GameId: getGameId() });
this.setBalance(balacneData.Balance)
return balacneData.Balance;
} catch (err) {
console.log('获取余额失败')
return null;
} finally {
this.scheduleOnce(() => {
this.isGetBalance = false;
}, 0.5)
}, 1)
}
}
async onConfirmErr2(): Promise<number | null> {
try {
let balacneData = await this.refreshBalanceFromServer();
this.setBalance(balacneData)
return balacneData;
let balacneData = await callGameBalanceApi({ GameId: getGameId() });
this.setBalance(balacneData.Balance)
return balacneData.Balance;
} catch (err) {
console.log('获取余额失败')
return null;
@ -809,27 +809,5 @@ export class SlotBar extends Component {
this.setBet(this.betGrade[this.betIndex], true);
}
}
// private _refreshingBalance: boolean = false;
async refreshBalanceFromServer(): Promise<number | null> {
// if (this._refreshingBalance) return this.getBalance();
// this._refreshingBalance = true;
try {
const res = await callGameBalanceApi({});
const balance = Number(res.Balance);
if (!Number.isFinite(balance)) {
console.warn("[SlotBar] invalid balance response:", res);
return this.getBalance();
}
this.setBalance(balance);
return balance;
} catch (err) {
console.error("[SlotBar] refresh balance failed:", err);
return this.getBalance();
} finally {
// this.scheduleOnce(() => {
// this._refreshingBalance = false;
// }, 1)
}
}
}

View File

@ -1,4 +1,4 @@
import { _decorator, Component, Node, Prefab } from 'cc';
import { _decorator, Component, Prefab } from 'cc';
import { FREE_SPIN_ROLLER_RULE, GameInfo, ROLLER_RULE, SLOT_BAR_EVENT, SLOT_GAME_EVENT, SYS_GIFT, WIN_TYPE, testData } from './game/Define';
import { SlotBar } from './SlotBar';
import { SlotGame } from './SlotGame';
@ -72,10 +72,6 @@ export class SlotScene extends Component {
@property(SlotRanking)
slotRanking: SlotRanking = null;
@property(Node)
gray: Node = null;
// 游戏数据
private gameInfo: GameInfo = null;
private spinInfo: any = null;
@ -243,11 +239,12 @@ export class SlotScene extends Component {
this.slotBar.setWin(0);
}
let curBalanceData = await this.slotBar.refreshBalanceFromServer()
if (!curBalanceData) {
curBalanceData = this.slotBar.getBalance()
let curBalanceData = await callGameBalanceApi({ GameId: getGameId() })
let curBalance = curBalanceData.Balance
if (!curBalance) {
curBalance = this.slotBar.getBalance()
}
if (curBalanceData < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
if (curBalance < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
//余额不足不经过服务器,在客户端拦截
this.showErrorTip(2, () => { this.slotBar.onConfirmErr2() });
this.handleErrSpin(true);
@ -937,10 +934,9 @@ export class SlotScene extends Component {
() => {
let isFrom = getIsFrom()
if (!isFrom || isFrom == "") {
if (!isFrom) {
window.close();
} else {
this.gray.active = true
window.location.replace(isFrom)
}
}, null,

View File

@ -187,7 +187,7 @@
"_priority": 0,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 960,
"_orthoHeight": 959.9999999999999,
"_near": 0,
"_far": 2000,
"_color": {

View File

@ -1,9 +1,7 @@
import { _decorator, Node, Component, screen, view, ResolutionPolicy, Sprite, sys, Label, Widget, Vec3, UITransform } from 'cc';
import { LocalizedLabel } from './i18n/LocalizedLabel';
import { getLanguage } from './comm';
import { installLabelAlignmentCenterFix } from 'common_tools';
installLabelAlignmentCenterFix();
const { ccclass, property } = _decorator;
export let SWITCH_PROTRAIT_MODE = {
"da": "Skift venligst til portrættilstand",

View File

@ -9,7 +9,7 @@ const qs = new URLSearchParams(location.search)
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
let apiaddr = "";
let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI3NjA2MTIsIlMiOjEwMDQsIkQiOiJycF8xMDAxMiJ9.f8r8mMsNIh9XSXq-Ni_h2KRw4EBDu9pTWIfwAQw7O7U";
let token = "eyJQIjoxMDA5NDksIkUiOjE3ODExODc3NjIsIlMiOjEwMDAsIkQiOiJycF8xMDAxMiJ9.5v087Lt--ozENIV6Rdvga9nZVc2bzxf11iJAbG5x8gM";
let language = "en"
let currency = "THB"
let isfrom = null

6
package-lock.json generated
View File

@ -9,15 +9,9 @@
"version": "1.0.0",
"license": "ISC",
"dependencies": {
"common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
"nosleep.js": "^0.12.0"
}
},
"node_modules/common_tools": {
"version": "1.0.0",
"resolved": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git#c49bf2990a6f348489505ac4998683c814b58dde",
"license": "MIT"
},
"node_modules/nosleep.js": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz",

View File

@ -14,7 +14,6 @@
"author": "",
"license": "ISC",
"dependencies": {
"common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
"nosleep.js": "^0.12.0"
}
}