Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 421e7db72e | |||
| f1c0800544 | |||
| 0029d82b19 | |||
| a45298708d |
@ -19,7 +19,9 @@ 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'
|
||||
|
||||
@ -50,22 +50,25 @@
|
||||
},
|
||||
{
|
||||
"__id__": 1376
|
||||
},
|
||||
{
|
||||
"__id__": 1386
|
||||
}
|
||||
],
|
||||
"_active": true,
|
||||
"_components": [
|
||||
{
|
||||
"__id__": 1386
|
||||
"__id__": 1394
|
||||
},
|
||||
{
|
||||
"__id__": 1388
|
||||
"__id__": 1396
|
||||
},
|
||||
{
|
||||
"__id__": 1390
|
||||
"__id__": 1398
|
||||
}
|
||||
],
|
||||
"_prefab": {
|
||||
"__id__": 1392
|
||||
"__id__": 1400
|
||||
},
|
||||
"_lpos": {
|
||||
"__type__": "cc.Vec3",
|
||||
@ -2297,7 +2300,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "b2TwwhnxJH76Y+/zSWtZSA"
|
||||
"fileId": "f4Gg4bv2NCUoW2+JwNkNLh"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2307,7 +2310,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "52GkHtN/5AS7JAYzyjxbvh",
|
||||
"fileId": "11bk2QCntOxJC/Kf1YArEX",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2338,7 +2341,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "f0saoipZVPOLhV1PCaWIGX"
|
||||
"fileId": "eb74xlYRVGbYvIvzPPX2fK"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2348,7 +2351,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "a6QQ1UTPhNN4/aa8jgVZeu",
|
||||
"fileId": "a8n6fBHDJKxKebTC2ahZE4",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2379,7 +2382,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "d8Mt8viIVHw77SmyJfHbTR"
|
||||
"fileId": "18xQQjfTRPv439te/QUyRh"
|
||||
},
|
||||
{
|
||||
"__type__": "5fc10Zl7lVO97/rr2J1uxWH",
|
||||
@ -2403,7 +2406,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "32hABGX/dEDoc6s+1MmJ59"
|
||||
"fileId": "5bqQpHhn1Nz6I1GEvsCNJX"
|
||||
},
|
||||
{
|
||||
"__type__": "5fd13+Xa69CZogb3Q/F1lnC",
|
||||
@ -2576,7 +2579,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "4aILCnwlBDB7hGZd2Ynl+M",
|
||||
"fileId": "deAZ5BMhBB0a5t/hRkEzi7",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2601,7 +2604,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "0bV0tfQhRMN6d7H0ibKbjU"
|
||||
"fileId": "eaRNpA2ZFPioFBGP8E78OJ"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.UITransform",
|
||||
@ -2629,7 +2632,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "87cTvkTYVGTqO1G0zeapjf"
|
||||
"fileId": "1b9ScCOhlIjIZAubYlOKUD"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.Sprite",
|
||||
@ -2674,7 +2677,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "44VLxjV9lNEKL7m6QiTsDE"
|
||||
"fileId": "e5zf2hwhhErLw5n8rPAhCE"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2684,7 +2687,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "c4E9QiWNFDkqphtp7wZDOk",
|
||||
"fileId": "fcL/AOLMxIrborIFwVfo8i",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2939,7 +2942,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "0fboYHWHZNWIUbXhqazPsq"
|
||||
"fileId": "5faZd2aARL/43y6WZMyO4x"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2949,7 +2952,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "13+ILSCshI/5ip7LS5/6gd",
|
||||
"fileId": "ffx+Z2YCFAVay6kQuRas76",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -2980,7 +2983,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "643B7cb2NAR7lSwMKp1GZj"
|
||||
"fileId": "97u2nJ15lOuquow25r3Bja"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -2990,7 +2993,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "f1CeTHGZFMWbdUk44tM+2T",
|
||||
"fileId": "54DjDWRnNHEJWee198pMLg",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3021,7 +3024,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "0faSbheTdNAbTHKkVHN7R9"
|
||||
"fileId": "790wmtrpJLQ777R4VZmzHD"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3045,7 +3048,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "49BAFjRzlEg4a5w9VAFU5X"
|
||||
"fileId": "bcjVsBJB1Ed7ItfaGxh3/H"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3055,7 +3058,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "56ysntvhREJaKGOpDwJobF",
|
||||
"fileId": "beZ8pMMm5M4rP4T8FJjTpB",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3238,7 +3241,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "7e2ZjFsqBFP5cCRxgtmf+t"
|
||||
"fileId": "9e8SgfJjxMFZIV0oP82hyQ"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3248,7 +3251,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "d5i0MG52hKvZuSU8d8vmXq",
|
||||
"fileId": "4ec5LXoTpP8bUOj9AcjtQJ",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3279,7 +3282,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "05jh2EoupN2aPTiwaWTAjx"
|
||||
"fileId": "4ffJ4jab9BmLWvNgVZnDmN"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3289,7 +3292,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "a63qbKtfhIhpSE30CtElEi",
|
||||
"fileId": "78IFwl9S1G0o0W+fI/0UsS",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3320,7 +3323,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "d8zY+1i6FEZ6El4yQMl12s"
|
||||
"fileId": "5eNlmXLYJHiJJEFlvVutKH"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3344,7 +3347,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "a9L2Yr7FNKaLtD/OeYJdpl"
|
||||
"fileId": "0faGWcIKNGdJQXetCGLPcr"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3354,7 +3357,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "73VyHT/BRFkZ59ltUPthmo",
|
||||
"fileId": "08DZBPuLZCdpNbiM3zTkbQ",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3537,7 +3540,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "7bSXs34xBDiasIy27NQf9m"
|
||||
"fileId": "a8nGhZoctG0LfK7IaOCzU0"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3547,7 +3550,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "dcW1sfkKZFx6jT6RDiJ27s",
|
||||
"fileId": "066lZOMh9L9akHmp2ZhUMV",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3578,7 +3581,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "0cNAqyRLRKUpmCNuxqJwEb"
|
||||
"fileId": "f5+LWcAOtP8J95uKypRZdh"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3588,7 +3591,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "fbN+xzJFhCn5xAwb6MbqzN",
|
||||
"fileId": "eaJWLaewJNObKk4KYgrpxj",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3619,7 +3622,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "d7NfPm6CtPYYeTTMWVRPil"
|
||||
"fileId": "950I5Q5cRPp6C3+km7TqS3"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3643,7 +3646,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "12uERD9oNHXLN9QrvPgXI6"
|
||||
"fileId": "7dXgXiMRhDfL0rO6X0lM73"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3653,7 +3656,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "43HdYUNGFN86ZboSc/0emO",
|
||||
"fileId": "a5yYSJTJ9JN6vAnJJdmFx3",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3836,7 +3839,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "4eCAoMvatGC5vK27lyKCm9"
|
||||
"fileId": "06a4B33eJM1Km6bOdD6oc+"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3846,7 +3849,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "20Mznl3ANNTbhTvg/jwte8",
|
||||
"fileId": "4ajGiaIlxHua5GzzAy+dmo",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3877,7 +3880,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "a22g2vYFpMMJ8r4Ihp9CXm"
|
||||
"fileId": "d2YeBBoo5A7Yb395f0fHF4"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3887,7 +3890,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "36uPaDpHBEp5H4i69oODPH",
|
||||
"fileId": "ac5ybgPrJKQ4QXmRHgemq8",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -3918,7 +3921,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "ecY/RLiy9KXrOob/Nm1LuB"
|
||||
"fileId": "2ffM3bdnxGUbYr1VRiPrps"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -3942,7 +3945,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "2a35GyhtZAgZ9DjzSY8bgq"
|
||||
"fileId": "dcOXuLG65Ea740lFqW8vN2"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -3952,7 +3955,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "5eF6boi/BMpLeWgJjsEg9V",
|
||||
"fileId": "12Ga2SdYNBBojuaPGJfEZc",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4135,7 +4138,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "66/tk+89dDZa5IofR0CBit"
|
||||
"fileId": "d5+21H/iVPv5XZpjM7MPxG"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4145,7 +4148,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "b1Kt8U6O1Llb5RFWfQkqpv",
|
||||
"fileId": "8bV9nOAZhNBbvKGl1CePTc",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4176,7 +4179,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "13g74ECRNNKKl4iJWvGR4L"
|
||||
"fileId": "75t972NyVF7YNd3AKMOfDG"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4186,7 +4189,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "276uwfYadGr4oCfabcgeOZ",
|
||||
"fileId": "70NRzJCopGfKbXvqrl35ZS",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4217,7 +4220,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "fdhSoyjL1F3o1b4i8zFb70"
|
||||
"fileId": "2aI/cSdaVG7rvozZ4iUTiU"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -4241,7 +4244,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "26W0VFH9xEQozypOHq0Ug5"
|
||||
"fileId": "f4w4HHMEZP9qRJsnYn7MWU"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4251,7 +4254,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "25KpT/kApLa6PlKB4IhT5H",
|
||||
"fileId": "7azXfEuh9NnpmFk8MgdAfS",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4434,7 +4437,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "e5KNNooddLGZiH55QvncHW"
|
||||
"fileId": "2fprvqimVIzJQfDjkKvuvs"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4444,7 +4447,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "dakDWuNY1ADIHfiLJm8UJW",
|
||||
"fileId": "36FhPT8C1KkKT/qNMhHDnf",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4475,7 +4478,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "24McWfMrJLcqxUKt9UGpHf"
|
||||
"fileId": "daFw7aWftJF6Ve5CHUq0HK"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4485,7 +4488,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "55AiyhpyFMM4/5T7WaMbkT",
|
||||
"fileId": "a1pZ+d6v5EiLeYBeQt6unG",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4516,7 +4519,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "30oNT/7VZO2Ld7qaYmCHuj"
|
||||
"fileId": "b575sE27BDp7WNhwv0x81X"
|
||||
},
|
||||
{
|
||||
"__type__": "45522uB1sdFu4FJAojtnha4",
|
||||
@ -4540,7 +4543,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "eesfDh+utHbrgPkQrRt/EV"
|
||||
"fileId": "27iaFASVNGtIEn5L3Nd30Y"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4550,7 +4553,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "bdHyNoSK5Bp5cfTzLh9Zth",
|
||||
"fileId": "d2Fob7+8RIJq0m9uPoTQru",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -4575,7 +4578,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "d3Xjj6HBREYZO7V1V0hQqx"
|
||||
"fileId": "63bIOjWbJH3KOdDadWP3vc"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.UITransform",
|
||||
@ -4603,7 +4606,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "bb7+UzFSVNAarmXtxfafsl"
|
||||
"fileId": "347k8acNBI2bPVDA9hUmSY"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.Sprite",
|
||||
@ -4648,7 +4651,7 @@
|
||||
},
|
||||
{
|
||||
"__type__": "cc.CompPrefabInfo",
|
||||
"fileId": "f6faqNpQ5J37X70yyvgg4k"
|
||||
"fileId": "983DRgidBIv5cVdUZJQr7K"
|
||||
},
|
||||
{
|
||||
"__type__": "cc.PrefabInfo",
|
||||
@ -4658,7 +4661,7 @@
|
||||
"asset": {
|
||||
"__id__": 0
|
||||
},
|
||||
"fileId": "7dWyDbhk5Jc7rcq3h2kWJH",
|
||||
"fileId": "7dri8YhVRCaKBFB6Owy/t9",
|
||||
"instance": null,
|
||||
"targetOverrides": null,
|
||||
"nestedPrefabInstanceRoots": null
|
||||
@ -12295,7 +12298,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -23751,7 +23754,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -23922,7 +23925,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -24117,7 +24120,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -24269,7 +24272,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -24421,7 +24424,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -24573,7 +24576,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -30094,7 +30097,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -30314,6 +30317,154 @@
|
||||
"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": "",
|
||||
@ -30324,12 +30475,12 @@
|
||||
},
|
||||
"_enabled": true,
|
||||
"__prefab": {
|
||||
"__id__": 1387
|
||||
"__id__": 1395
|
||||
},
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 1080,
|
||||
"height": 1919.9999999999998
|
||||
"height": 1920
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -30352,7 +30503,7 @@
|
||||
},
|
||||
"_enabled": true,
|
||||
"__prefab": {
|
||||
"__id__": 1389
|
||||
"__id__": 1397
|
||||
},
|
||||
"slotGame": {
|
||||
"__id__": 548
|
||||
@ -30383,6 +30534,9 @@
|
||||
"__id__": 1373
|
||||
},
|
||||
"slotRanking": null,
|
||||
"gray": {
|
||||
"__id__": 1386
|
||||
},
|
||||
"_id": ""
|
||||
},
|
||||
{
|
||||
@ -30399,7 +30553,7 @@
|
||||
},
|
||||
"_enabled": true,
|
||||
"__prefab": {
|
||||
"__id__": 1391
|
||||
"__id__": 1399
|
||||
},
|
||||
"_alignFlags": 45,
|
||||
"_target": null,
|
||||
@ -30437,10 +30591,10 @@
|
||||
"instance": null,
|
||||
"targetOverrides": [
|
||||
{
|
||||
"__id__": 1393
|
||||
"__id__": 1401
|
||||
},
|
||||
{
|
||||
"__id__": 1396
|
||||
"__id__": 1404
|
||||
}
|
||||
],
|
||||
"nestedPrefabInstanceRoots": [
|
||||
@ -30461,7 +30615,7 @@
|
||||
"__id__": 563
|
||||
},
|
||||
"sourceInfo": {
|
||||
"__id__": 1394
|
||||
"__id__": 1402
|
||||
},
|
||||
"propertyPath": [
|
||||
"_target"
|
||||
@ -30470,7 +30624,7 @@
|
||||
"__id__": 563
|
||||
},
|
||||
"targetInfo": {
|
||||
"__id__": 1395
|
||||
"__id__": 1403
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -30488,7 +30642,7 @@
|
||||
{
|
||||
"__type__": "cc.TargetOverrideInfo",
|
||||
"source": {
|
||||
"__id__": 1388
|
||||
"__id__": 1396
|
||||
},
|
||||
"sourceInfo": null,
|
||||
"propertyPath": [
|
||||
@ -30498,7 +30652,7 @@
|
||||
"__id__": 1376
|
||||
},
|
||||
"targetInfo": {
|
||||
"__id__": 1397
|
||||
"__id__": 1405
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@ -1160,7 +1160,7 @@
|
||||
"_lpos": {
|
||||
"__type__": "cc.Vec3",
|
||||
"x": 0,
|
||||
"y": -70,
|
||||
"y": -83.523,
|
||||
"z": 0
|
||||
},
|
||||
"_lrot": {
|
||||
@ -1201,7 +1201,7 @@
|
||||
"_contentSize": {
|
||||
"__type__": "cc.Size",
|
||||
"width": 167.19189453125,
|
||||
"height": 54.18
|
||||
"height": 80
|
||||
},
|
||||
"_anchorPoint": {
|
||||
"__type__": "cc.Vec2",
|
||||
@ -1243,7 +1243,7 @@
|
||||
"_fontSize": 43,
|
||||
"_fontFamily": "Arial",
|
||||
"_lineHeight": 43,
|
||||
"_overflow": 0,
|
||||
"_overflow": 2,
|
||||
"_enableWrapText": true,
|
||||
"_font": null,
|
||||
"_isSystemFontUsed": true,
|
||||
|
||||
@ -416,25 +416,25 @@ export class SlotBar extends Component {
|
||||
if (this.isGetBalance) return
|
||||
this.isGetBalance = true;
|
||||
try {
|
||||
let balacneData = await callGameBalanceApi({ GameId: getGameId() });
|
||||
this.setBalance(balacneData.Balance)
|
||||
return balacneData.Balance;
|
||||
let balacneData = await this.refreshBalanceFromServer();
|
||||
this.setBalance(balacneData)
|
||||
return balacneData;
|
||||
} catch (err) {
|
||||
console.log('获取余额失败')
|
||||
return null;
|
||||
} finally {
|
||||
this.scheduleOnce(() => {
|
||||
this.isGetBalance = false;
|
||||
}, 1)
|
||||
}, 0.5)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
async onConfirmErr2(): Promise<number | null> {
|
||||
try {
|
||||
let balacneData = await callGameBalanceApi({ GameId: getGameId() });
|
||||
this.setBalance(balacneData.Balance)
|
||||
return balacneData.Balance;
|
||||
let balacneData = await this.refreshBalanceFromServer();
|
||||
this.setBalance(balacneData)
|
||||
return balacneData;
|
||||
} catch (err) {
|
||||
console.log('获取余额失败')
|
||||
return null;
|
||||
@ -809,5 +809,27 @@ 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)
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { _decorator, Component, Prefab } from 'cc';
|
||||
import { _decorator, Component, Node, 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,6 +72,10 @@ export class SlotScene extends Component {
|
||||
|
||||
@property(SlotRanking)
|
||||
slotRanking: SlotRanking = null;
|
||||
|
||||
@property(Node)
|
||||
gray: Node = null;
|
||||
|
||||
// 游戏数据
|
||||
private gameInfo: GameInfo = null;
|
||||
private spinInfo: any = null;
|
||||
@ -239,12 +243,11 @@ export class SlotScene extends Component {
|
||||
this.slotBar.setWin(0);
|
||||
}
|
||||
|
||||
let curBalanceData = await callGameBalanceApi({ GameId: getGameId() })
|
||||
let curBalance = curBalanceData.Balance
|
||||
if (!curBalance) {
|
||||
curBalance = this.slotBar.getBalance()
|
||||
let curBalanceData = await this.slotBar.refreshBalanceFromServer()
|
||||
if (!curBalanceData) {
|
||||
curBalanceData = this.slotBar.getBalance()
|
||||
}
|
||||
if (curBalance < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
|
||||
if (curBalanceData < (isFeatureBuy ? this.slotBar.getBet() * this.gameInfo.BuyMul : this.slotBar.getBet()) && !isFreeSpin && !GameDataManager.instance.frb.Ongoing) {
|
||||
//余额不足不经过服务器,在客户端拦截
|
||||
this.showErrorTip(2, () => { this.slotBar.onConfirmErr2() });
|
||||
this.handleErrSpin(true);
|
||||
@ -934,9 +937,10 @@ export class SlotScene extends Component {
|
||||
|
||||
() => {
|
||||
let isFrom = getIsFrom()
|
||||
if (!isFrom) {
|
||||
if (!isFrom || isFrom == "") {
|
||||
window.close();
|
||||
} else {
|
||||
this.gray.active = true
|
||||
window.location.replace(isFrom)
|
||||
}
|
||||
}, null,
|
||||
|
||||
@ -187,7 +187,7 @@
|
||||
"_priority": 0,
|
||||
"_fov": 45,
|
||||
"_fovAxis": 0,
|
||||
"_orthoHeight": 959.9999999999999,
|
||||
"_orthoHeight": 960,
|
||||
"_near": 0,
|
||||
"_far": 2000,
|
||||
"_color": {
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
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",
|
||||
|
||||
@ -9,7 +9,7 @@ const qs = new URLSearchParams(location.search)
|
||||
|
||||
// let apiaddr = "https://rpgames-api.rpfafafahkdev.com";
|
||||
let apiaddr = "";
|
||||
let token = "eyJQIjoxMDA5NDksIkUiOjE3ODExODc3NjIsIlMiOjEwMDAsIkQiOiJycF8xMDAxMiJ9.5v087Lt--ozENIV6Rdvga9nZVc2bzxf11iJAbG5x8gM";
|
||||
let token = "eyJQIjoxMDA5NDksIkUiOjE3ODI3NjA2MTIsIlMiOjEwMDQsIkQiOiJycF8xMDAxMiJ9.f8r8mMsNIh9XSXq-Ni_h2KRw4EBDu9pTWIfwAQw7O7U";
|
||||
let language = "en"
|
||||
let currency = "THB"
|
||||
let isfrom = null
|
||||
|
||||
6
package-lock.json
generated
6
package-lock.json
generated
@ -9,9 +9,15 @@
|
||||
"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",
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"common_tools": "git+ssh://git@gitea.rpfafafahkdev.com:taotao/common_tools.git",
|
||||
"nosleep.js": "^0.12.0"
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user