【优化】修改新手引导展示方式

assets/bundle/gui/eliminate/eliminate-001.prefab.meta

@@ -2,12 +2,12 @@
   "ver": "1.1.50",
   "importer": "prefab",
   "imported": true,
-  "uuid": "d59a49d0-712f-47e4-bc05-93c7cc6433cd",
+  "uuid": "351bbe76-400b-42a3-bb90-6aa72e2b4770",
   "files": [
     ".json"
   ],
   "subMetas": {},
   "userData": {
-    "syncNodeName": "eliminate-001"
+    "syncNodeName": "Eliminate-002"
   }
 }

assets/bundle/gui/eliminate/animation/tweenGuide.anim

@@ -67,7 +67,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.6166666666666667
+      0.6166666746139526
     ],
     "_values": [
       {
@@ -112,7 +112,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.6166666666666667
+      0.6166666746139526
     ],
     "_values": [
       {
@@ -157,7 +157,7 @@
     "__type__": "cc.RealCurve",
     "_times": [
       0,
-      0.6166666666666667
+      0.6166666746139526
     ],
     "_values": [
       {

assets/bundle/gui/eliminate/prefab/CashWithdrawal-001.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "0d32823e-1814-45d8-8ad9-adf7f485740e",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "CashWithdrawal-001"
+  }
+}

assets/bundle/gui/eliminate/prefab/RedPacketWithdrawal-001.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.50",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "7247f50a-8860-4d5f-bad6-f8b96518b69f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "RedPacketWithdrawal-001"
+  }
+}

assets/bundle/gui/eliminate/prefab/cashWithdrawal.prefab

@@ -3654,7 +3654,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/bundle/gui/eliminate/prefab/item/RecordItem.prefab

@@ -240,7 +240,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -246.763,
+      "x": -246.251,
       "y": 0,
       "z": 0
     },
@@ -376,8 +376,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 226.579,
-      "y": -22.514,
+      "x": 225,
+      "y": -22,
       "z": 0
     },
     "_lrot": {
@@ -512,8 +512,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 226.483,
-      "y": -23.147,
+      "x": 225,
+      "y": -22,
       "z": 0
     },
     "_lrot": {
@@ -648,7 +648,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -190.971,
+      "x": -191.483,
       "y": 21.339,
       "z": 0
     },
@@ -808,7 +808,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": -191.793,
-      "y": -24.717,
+      "y": -19.081,
       "z": 0
     },
     "_lrot": {
@@ -973,8 +973,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 273.954,
-      "y": 21.012,
+      "x": 278.443,
+      "y": 21.323,
       "z": 0
     },
     "_lrot": {
@@ -1002,7 +1002,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_money-001",
+    "_name": "lab_money",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1023,8 +1023,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -0.08500000000003638,
+      "x": -22,
+      "y": -0.371,
       "z": 0
     },
     "_lrot": {
@@ -1064,19 +1064,19 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 20,
-      "height": 27.72
+      "width": 62.28125,
+      "height": 50.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 1,
-      "y": 0.6
+      "y": 0.5
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a8o7ZfzAdLsbJFY2msb/ro"
+    "fileId": "f9B1yDeqhLNodxwZObquoO"
   },
   {
     "__type__": "cc.Label",
@@ -1100,13 +1100,13 @@
       "b": 9,
       "a": 255
     },
-    "_string": "元",
+    "_string": "0.10",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 20,
-    "_fontSize": 20,
+    "_actualFontSize": 32,
+    "_fontSize": 32,
     "_fontFamily": "Arial",
-    "_lineHeight": 22,
+    "_lineHeight": 40,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -1144,7 +1144,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "316cjICRJJt7diCJKovRLZ"
+    "fileId": "f1jadVLpxICL20ap4GcGsG"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1154,14 +1154,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "fe/9X9mm9JRpsntdqJXDLM",
+    "fileId": "78TMCo+2lDmK71CUXOzBIm",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_money",
+    "_name": "lab_money-001",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1182,7 +1182,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -22,
+      "x": 0,
       "y": -0.08500000000003638,
       "z": 0
     },
@@ -1223,19 +1223,19 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 77.8515625,
-      "height": 50.4
+      "width": 20,
+      "height": 27.72
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 1,
-      "y": 0.5
+      "y": 0.6
     },
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f9B1yDeqhLNodxwZObquoO"
+    "fileId": "a8o7ZfzAdLsbJFY2msb/ro"
   },
   {
     "__type__": "cc.Label",
@@ -1259,13 +1259,13 @@
       "b": 9,
       "a": 255
     },
-    "_string": "0.10",
+    "_string": "元",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
     "_fontFamily": "Arial",
-    "_lineHeight": 40,
+    "_lineHeight": 22,
     "_overflow": 0,
     "_enableWrapText": true,
     "_font": null,
@@ -1303,7 +1303,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f1jadVLpxICL20ap4GcGsG"
+    "fileId": "316cjICRJJt7diCJKovRLZ"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -1313,7 +1313,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "78TMCo+2lDmK71CUXOzBIm",
+    "fileId": "fe/9X9mm9JRpsntdqJXDLM",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -1332,7 +1332,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 84.28125,
       "height": 40
     },
     "_anchorPoint": {
@@ -1358,7 +1358,7 @@
     "__prefab": {
       "__id__": 54
     },
-    "_resizeMode": 0,
+    "_resizeMode": 1,
     "_layoutType": 1,
     "_cellSize": {
       "__type__": "cc.Size",
@@ -1373,7 +1373,7 @@
     "_spacingX": 2,
     "_spacingY": 0,
     "_verticalDirection": 1,
-    "_horizontalDirection": 1,
+    "_horizontalDirection": 0,
     "_constraint": 0,
     "_constraintNum": 2,
     "_affectedByScale": false,
@@ -1456,6 +1456,7 @@
       "__id__": 0
     },
     "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
     "targetOverrides": null
   }
 ]

assets/bundle/gui/eliminate/prefab/redPacketWithdrawal.prefab

@@ -140,7 +140,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1068,9 +1068,6 @@
         "__id__": 63
       },
       {
-        "__id__": 69
-      },
-      {
         "__id__": 89
       }
     ],
@@ -1250,7 +1247,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "spriteFrame",
+    "_name": "lab_text",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
@@ -1271,142 +1268,6 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -32.634,
-      "y": 19.541,
-      "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__": 45
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 47
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 40,
-      "height": 49
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "a2glZxnbFF0ZJ20jux/RBz"
-  },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 45
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 49
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_spriteFrame": {
-      "__uuid__": "b26678f8-846f-4447-bd57-0659cca862e1@f9941",
-      "__expectedType__": "cc.SpriteFrame"
-    },
-    "_type": 0,
-    "_fillType": 0,
-    "_sizeMode": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_useGrayscale": false,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "758ZTZwNtLh5bpDXmd4/Kp"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "f3llsAqWhLvKN6cEDz8SUH",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lab_text",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "_parent": {
-      "__id__": 38
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 52
-      },
-      {
-        "__id__": 54
-      }
-    ],
-    "_prefab": {
-      "__id__": 56
-    },
-    "_lpos": {
-      "__type__": "cc.Vec3",
       "x": -207.764,
       "y": 18.865,
       "z": 0
@@ -1440,11 +1301,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 53
+      "__id__": 47
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1468,11 +1329,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 51
+      "__id__": 45
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 55
+      "__id__": 49
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1555,14 +1416,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 52
       },
       {
-        "__id__": 60
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 56
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1599,11 +1460,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 59
+      "__id__": 53
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1627,11 +1488,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 57
+      "__id__": 51
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 61
+      "__id__": 55
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1691,14 +1552,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 58
       },
       {
-        "__id__": 66
+        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 62
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -1735,11 +1596,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 65
+      "__id__": 59
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -1763,11 +1624,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 63
+      "__id__": 57
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 67
+      "__id__": 61
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -1825,6 +1686,9 @@
     },
     "_children": [
       {
+        "__id__": 64
+      },
+      {
         "__id__": 70
       },
       {
@@ -1845,7 +1709,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -5.45,
+      "x": 296.889,
       "y": 19.829,
       "z": 0
     },
@@ -1874,12 +1738,148 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_num",
+    "_name": "spriteFrame",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
+      "__id__": 63
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      },
+      {
+        "__id__": 67
+      }
+    ],
+    "_prefab": {
       "__id__": 69
     },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -91.369140625,
+      "y": -0.2880000000000109,
+      "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__": 64
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 66
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 49
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "a2glZxnbFF0ZJ20jux/RBz"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 64
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 68
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "b26678f8-846f-4447-bd57-0659cca862e1@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "758ZTZwNtLh5bpDXmd4/Kp"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "f3llsAqWhLvKN6cEDz8SUH",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_num",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 63
+    },
     "_children": [],
     "_active": true,
     "_components": [
@@ -1898,7 +1898,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -66.369140625,
       "y": 2.479,
       "z": 0
     },
@@ -1939,7 +1939,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 283.623046875,
+      "width": 33.369140625,
       "height": 75.6
     },
     "_anchorPoint": {
@@ -1975,7 +1975,7 @@
       "b": 53,
       "a": 255
     },
-    "_string": "999999.00",
+    "_string": "0",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 60,
@@ -2062,7 +2062,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
-      "__id__": 69
+      "__id__": 63
     },
     "_children": [],
     "_active": true,
@@ -2079,7 +2079,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 288.623046875,
+      "x": -28,
       "y": 2.479,
       "z": 0
     },
@@ -2221,7 +2221,7 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 69
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
@@ -2229,12 +2229,12 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
+      "width": 111.369140625,
       "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 1,
       "y": 0.5
     },
     "_id": ""
@@ -2249,13 +2249,13 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 69
+      "__id__": 63
     },
     "_enabled": true,
     "__prefab": {
       "__id__": 87
     },
-    "_resizeMode": 0,
+    "_resizeMode": 1,
     "_layoutType": 1,
     "_cellSize": {
       "__type__": "cc.Size",
@@ -5001,7 +5001,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -5450,7 +5450,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 720,
-      "height": 1600
+      "height": 1599.9999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/bundle/gui/eliminate/texture/guide_title_bg.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "054a4860-7562-4d1f-b38c-61f5e6d90dee",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "054a4860-7562-4d1f-b38c-61f5e6d90dee@6c48a",
+      "displayName": "guide_title_bg",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "054a4860-7562-4d1f-b38c-61f5e6d90dee",
+        "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": "054a4860-7562-4d1f-b38c-61f5e6d90dee@f9941",
+      "displayName": "guide_title_bg",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 637,
+        "height": 228,
+        "rawWidth": 637,
+        "rawHeight": 228,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -318.5,
+            -114,
+            0,
+            318.5,
+            -114,
+            0,
+            -318.5,
+            114,
+            0,
+            318.5,
+            114,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            228,
+            637,
+            228,
+            0,
+            0,
+            637,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -318.5,
+            -114,
+            0
+          ],
+          "maxPos": [
+            318.5,
+            114,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "054a4860-7562-4d1f-b38c-61f5e6d90dee@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "054a4860-7562-4d1f-b38c-61f5e6d90dee@6c48a"
+  }
+}

assets/script/game/common/manager/LoginHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:15:45
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 15:42:19
+ * @LastEditTime: 2025-04-29 15:08:59
  * @Description: 登录管理
  */
 // LoginHandler.ts
@@ -22,7 +22,24 @@ export class LoginHandler {
         return this._inst;
     }
 
+
+    //获取当前版本状态
+    async getVersionStatus() {
+        const data = { method: 'system.debug.get' };
+        const result = await CocosHandler.inst.sendMessageToAndroid(data, '获取版本状态');
+        return JSON.parse(result);
+    }
+
+    //关闭安卓启动页
+    closeAndroidSplash() {
+        const data = { method: 'start.scene.hide' };
+        CocosHandler.inst.sendMessageToAndroid(data, '关闭安卓启动页');
+    }
+
+
     async getPrivacyStatus() {
+        //这直接调关闭安卓
+        this.closeAndroidSplash();
         const data = { method: 'privacy.grant.get' };
         const result = await CocosHandler.inst.sendMessageToAndroid(data, '获取隐私授权状态');
         return JSON.parse(result);

assets/script/game/common/manager/ProtocolEvent.ts

@@ -2,14 +2,13 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-07 10:17:16
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-28 16:42:49
+ * @LastEditTime: 2025-04-29 15:25:59
  * @Description: 消息定义
  */
 
-// const server_url = "http://192.168.10.103:8880";
+const server_url = "http://192.168.10.103:8880";
 // https://central-test.atmob.com
-const server_url = "https://central-test.atmob.com";
-
+// const server_url = "https://central-test.atmob.com";
 export enum ProtocolEvent {
     /**微信登录*/
     WechatLogin = server_url + "/project/playlet/v1/user/login",

assets/script/game/common/manager/ServerHandler.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-04-11 10:16:41
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-28 11:46:05
+ * @LastEditTime: 2025-04-29 14:57:44
  * @Description: 
  */
 // ServerHandler.ts
@@ -84,6 +84,7 @@ export class ServerHandler {
         account.wxCoin = data.props['1005'];
         account.hbCoin = data.props['1004'];
         account.goldCoin = data.props['1006'];
+        game.skipAdCount = data.props['1008'] || 0;
         game.popupShow = data.currentLevelInfo.popupStatus
         game.skipAdConfig = data.currentLevelConf.skipCount || -1;
         oops.message.dispatchEvent(GameEvent.UserLogin);

assets/script/game/config/GameData.ts

@@ -1,14 +0,0 @@
-/*
- * @Author: mojunshou 1637302775@qq.com
- * @Date: 2025-04-01 17:04:11
- * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-01 17:06:51
- * @Description: 游戏数据定义
- */
-export default class GameData {
-    //纯本地存储
-    public static showGuild: boolean = true;
-
-
-
-}

assets/script/game/config/GameData.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "17b76f18-2853-4415-8234-3b86ed0875c0",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}

assets/script/game/initialize/view/LoadingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-19 16:23:51
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-23 14:16:55
+ * @LastEditTime: 2025-04-29 15:11:53
  * @Description: loading界面
  */
 import { _decorator, Toggle } from "cc";
@@ -56,7 +56,6 @@ export class LoadingViewComp extends CCVMParentComp {
     async enter() {
         if (DeviceUtil.isNative && DeviceUtil.isAndroid) {
             const state = await LoginHandler.inst.getPrivacyStatus();
-            console.log("隐私状态>>>>>>>>>>>>>>>>", state);
             if (state.data.result) {
                 //同意之后都加载一次启屏广告
                 // CocosHandler.inst.ad_interstitial_start();
@@ -91,7 +90,6 @@ export class LoadingViewComp extends CCVMParentComp {
     }
 
     private onAgreePrivacy() {
-        console.log("同意隐私协议");
         oops.storage.set("agree", true);
         oops.gui.remove(UIID.KindTips);
         //如果是客户端就显示微信登录按钮

assets/script/game/view/DoubleRewardsView.ts

@@ -98,6 +98,7 @@ export class DoubleRewardsView extends VMParent {
         oops.gui.remove(UIID.DoubleRewards);
         oops.message.dispatchEvent(GameEvent.updateGameState, "playing");
         smc.game.GameModel.allAdCount++;
+        smc.game.GameModel.smallAdCount = 0;
     }
 
 

assets/script/game/view/EliminateViewComp.ts

@@ -2,10 +2,10 @@
  * @Author: mojunshou 1637302775@qq.com
  * @Date: 2025-03-20 15:01:09
  * @LastEditors: mojunshou 1637302775@qq.com
- * @LastEditTime: 2025-04-28 20:18:49
+ * @LastEditTime: 2025-04-29 16:04:08
  * @Description: 消除游戏主场景
  */
-import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, v3, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
+import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, Animation, v3, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
 import { oops } from "db://oops-framework/core/Oops";
 import { DeviceUtil } from "db://oops-framework/core/utils/DeviceUtil";
 import { ecs } from "db://oops-framework/libs/ecs/ECS";
@@ -178,7 +178,7 @@ export class EliminateViewComp extends CCComp {
     private targetScore: number = 0; //目标分数
 
     private isDoubleSpeed: boolean = false;  //是否开启二倍速
-    private doubleNum: number = 2;           //除2就是开启了2倍速，除1就是关闭了2倍速
+    private doubleNum: number = 1.5;           //除2就是开启了2倍速，除1就是关闭了2倍速
     private callback: Function | null = null; //回调函数
 
     //tween时间控制变量
@@ -472,6 +472,15 @@ export class EliminateViewComp extends CCComp {
                 tips.string = this.guideTips[step - 1];
             }
         }
+        //tween移动
+        const guideTipsNode = this.guideNode.getChildByPath("tips");
+        if (guideTipsNode) {
+            const guideTipsAni = guideTipsNode.getComponent(Animation);
+            if (guideTipsAni) {
+                guideTipsAni.play();
+            }
+        }
+
         if (step === 1) {
             this.guideStep1()
         }
@@ -553,7 +562,7 @@ export class EliminateViewComp extends CCComp {
         this.guideFinger.active = true;
         this.guideItem1.active = true;
         //拿出this.guideFinger.x y
-
+        //展示tween动画
 
         tween(this.guideFinger)
             .delay(0.2)
@@ -1595,12 +1604,12 @@ export class EliminateViewComp extends CCComp {
                                 if (this.eliminateTotal % randomNum === 0) {
                                     //如果有自动就暂停自动
                                     if (smc.game.GameModel.skipAdConfig != -1) {
-                                        if (smc.game.GameModel.smallAdCount > 0 && smc.game.GameModel.smallAdCount % smc.game.GameModel.skipAdConfig == 0) {
+                                        if (smc.game.GameModel.skipAdCount == 0 || smc.game.GameModel.skipAdCount % smc.game.GameModel.skipAdConfig != 0) {
+                                            ServerHandler.inst.getDoubleSurprise();
+                                        } else {
                                             smc.game.GameModel.viewType = "double_reward";
                                             smc.game.GameModel.directAdCount++; //测试看
                                             ADHandler.inst.showAd(AD_TYPE.Double_Receive);
-                                        } else {
-                                            ServerHandler.inst.getDoubleSurprise();
                                         }
                                     } else {
                                         ServerHandler.inst.getDoubleSurprise();
@@ -2268,7 +2277,7 @@ export class EliminateViewComp extends CCComp {
         }
         oops.gui.toast("二倍速时长已增加3分钟~")
         this.isDoubleSpeed = true;
-        this.doubleNum = 2;
+        this.doubleNum = 1.5;
         //改变按钮时间
         // let time = smc.game.GameModel.doubleSpeedTime;
         this.doubleSpeedTime = this.doubleSpeedTime + smc.game.GameModel.doubleSpeedTime;