From 3a05d2cbbb8c6898e54027a8ebf1cfbe42a8cb8e Mon Sep 17 00:00:00 2001 From: "guoqing.zhu" <1521292690@qq.com> Date: Tue, 31 May 2022 18:33:55 +0800 Subject: [PATCH] upade --- assets/res/prefabs/NUI/UImain2.fire | 38 +- .../resources/prefabs/tips/pb_chainerr.prefab | 847 ++++++++++++++++++ .../prefabs/tips/pb_chainerr.prefab.meta | 7 + assets/scripts/BaseNet.js | 2 +- 4 files changed, 874 insertions(+), 20 deletions(-) create mode 100644 assets/resources/prefabs/tips/pb_chainerr.prefab create mode 100644 assets/resources/prefabs/tips/pb_chainerr.prefab.meta diff --git a/assets/res/prefabs/NUI/UImain2.fire b/assets/res/prefabs/NUI/UImain2.fire index 5692794e..205e026d 100644 --- a/assets/res/prefabs/NUI/UImain2.fire +++ b/assets/res/prefabs/NUI/UImain2.fire @@ -41,8 +41,8 @@ }, "_scale": { "__type__": "cc.Vec3", - "x": 0.9480234059522167, - "y": 0.9480234059522167, + "x": 0.43183625677012477, + "y": 0.43183625677012477, "z": 1 }, "_quat": { @@ -3440,7 +3440,7 @@ }, { "__type__": "cc.Node", - "_name": "pb_hotfix", + "_name": "pb_chainerr", "_objFlags": 0, "_parent": { "__id__": 2 @@ -3642,9 +3642,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "0bmPoCOyFDjKDtw1BaWy9N", + "fileId": "36IYfv+JZFu5hoHFA6i5JK", "sync": false }, { @@ -3874,9 +3874,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "e2frVL381BGZ8JuiZBMIce", + "fileId": "53BS+UPdVMb4OHEsZEmKRK", "sync": false }, { @@ -3885,9 +3885,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "faPZ4q47NIkpE2vTAyb1ex", + "fileId": "3aXsWblXRGboiy5Vi0kabN", "sync": false }, { @@ -3983,9 +3983,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "69ZPCgVK5H6Iy6ecHdFMdT", + "fileId": "2ajzwIcvtMyJnucmpsS/7V", "sync": false }, { @@ -4149,9 +4149,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "28yhHa/TFEpJiBS4NQHtIO", + "fileId": "39mh/Kvk5LYq9lbgbPbs9A", "sync": false }, { @@ -4188,9 +4188,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "22zqHiYBhIAZ001CnlQf7Z", + "fileId": "e8SlJTrHBLUJf1dl9mOJOu", "sync": false }, { @@ -4227,9 +4227,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "7e67v+pp5BirKVLN3Y+Iy5", + "fileId": "d3dG+AuO1IQr6uDIm8a1Uy", "sync": false }, { @@ -4238,9 +4238,9 @@ "__id__": 88 }, "asset": { - "__uuid__": "71e15546-0974-4e60-a07b-4e47f1d73f47" + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" }, - "fileId": "b42iyyWmFAnLJ4bwF6Dpg0", + "fileId": "ba5SXZ88JJqZF/uZTKaPbs", "sync": false }, { diff --git a/assets/resources/prefabs/tips/pb_chainerr.prefab b/assets/resources/prefabs/tips/pb_chainerr.prefab new file mode 100644 index 00000000..b6b422b5 --- /dev/null +++ b/assets/resources/prefabs/tips/pb_chainerr.prefab @@ -0,0 +1,847 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "", + "_objFlags": 0, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "asyncLoadAssets": false + }, + { + "__type__": "cc.Node", + "_name": "pb_chainerr", + "_objFlags": 0, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 7 + } + ], + "_active": true, + "_level": 1, + "_components": [ + { + "__id__": 24 + } + ], + "_prefab": { + "__id__": 25 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1568, + "height": 512 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 240, + "y": 256, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite(Splash)", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_level": 2, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 4 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 6 + }, + "_opacity": 180, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1568, + "height": 512 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_id": "" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "36IYfv+JZFu5hoHFA6i5JK", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "uibg", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 8 + }, + { + "__id__": 13 + }, + { + "__id__": 16 + } + ], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 22 + } + ], + "_prefab": { + "__id__": 23 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 669.5, + "height": 278.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 0.89, + "y": 1.01, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "top", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [ + { + "__id__": 9 + } + ], + "_active": true, + "_level": 4, + "_components": [], + "_prefab": { + "__id__": 12 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 95.9405941, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1.1235955, + "y": 0.990099, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "title", + "_objFlags": 0, + "_parent": { + "__id__": 8 + }, + "_children": [], + "_active": true, + "_level": 3, + "_components": [ + { + "__id__": 10 + } + ], + "_prefab": { + "__id__": 11 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 247, + "g": 194, + "b": 59, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 470.21, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 0.6, + "y": 0.6, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 9 + }, + "_enabled": true, + "_useOriginalSize": false, + "_string": "Switch The Chain", + "_N$string": "Switch The Chain", + "_fontSize": 60, + "_lineHeight": 80, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_N$horizontalAlign": 0, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "53BS+UPdVMb4OHEsZEmKRK", + "sync": false + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "3aXsWblXRGboiy5Vi0kabN", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "txt", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [], + "_active": true, + "_level": 4, + "_components": [ + { + "__id__": 14 + } + ], + "_prefab": { + "__id__": 15 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1179.9, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": -305, + "y": 0, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.5, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 13 + }, + "_enabled": true, + "_useOriginalSize": true, + "_string": "Sorry, the chain you are currently on is not supported by the game.\nPlease click Confirm to switch your chain.", + "_N$string": "Sorry, the chain you are currently on is not supported by the game.\nPlease click Confirm to switch your chain.", + "_fontSize": 40, + "_lineHeight": 60, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_N$horizontalAlign": 0, + "_N$verticalAlign": 0, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "2ajzwIcvtMyJnucmpsS/7V", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "btnConfirm", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [ + { + "__id__": 17 + } + ], + "_active": true, + "_level": 4, + "_components": [ + { + "__id__": 20 + } + ], + "_prefab": { + "__id__": 21 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 109, + "height": 45 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": -95.049505, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 16 + }, + "_children": [], + "_active": true, + "_level": 5, + "_components": [ + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 19 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 171, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_position": { + "__type__": "cc.Vec3", + "x": 0, + "y": -0.950495, + "z": 0 + }, + "_scale": { + "__type__": "cc.Vec3", + "x": 0.4, + "y": 0.5, + "z": 1 + }, + "_rotationX": 0, + "_rotationY": 0, + "_quat": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_skewX": 0, + "_skewY": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 17 + }, + "_enabled": true, + "_useOriginalSize": false, + "_string": "Confirm", + "_N$string": "Confirm", + "_fontSize": 40, + "_lineHeight": 40, + "_enableWrapText": true, + "_N$file": { + "__uuid__": "ef2a48cc-8f1a-4965-b9ba-3deca921b41a" + }, + "_isSystemFontUsed": false, + "_spacingX": 0, + "_batchAsBitmap": false, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "39mh/Kvk5LYq9lbgbPbs9A", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 16 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "7327600a-7c4e-4fed-a79a-dcf9775e5d9e" + }, + "_type": 1, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "e8SlJTrHBLUJf1dl9mOJOu", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 7 + }, + "_enabled": true, + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "b6189259-190d-4fc6-b890-f104d58a7685" + }, + "_type": 1, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_state": 0, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "d3dG+AuO1IQr6uDIm8a1Uy", + "sync": false + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": -544, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 1024, + "_originalHeight": 512, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__uuid__": "173e2483-58ff-4501-b25a-167dd9228ddb" + }, + "fileId": "ba5SXZ88JJqZF/uZTKaPbs", + "sync": false + } +] \ No newline at end of file diff --git a/assets/resources/prefabs/tips/pb_chainerr.prefab.meta b/assets/resources/prefabs/tips/pb_chainerr.prefab.meta new file mode 100644 index 00000000..9c17583e --- /dev/null +++ b/assets/resources/prefabs/tips/pb_chainerr.prefab.meta @@ -0,0 +1,7 @@ +{ + "ver": "1.0.1", + "uuid": "173e2483-58ff-4501-b25a-167dd9228ddb", + "optimizationPolicy": "AUTO", + "asyncLoadAssets": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/scripts/BaseNet.js b/assets/scripts/BaseNet.js index 5e6b5c4f..8906c2bc 100644 --- a/assets/scripts/BaseNet.js +++ b/assets/scripts/BaseNet.js @@ -12,7 +12,7 @@ isDevEnv() isExamining() function isDevEnv() { - return false; + return true; } function isExamining() {