future 1 anno fa
parent
commit
dc213531c4

File diff suppressed because it is too large
+ 538 - 243
assets/edit_game.scene


+ 922 - 62
assets/resources/prefab/task/other_drag_list_item.prefab

@@ -35,19 +35,22 @@
       },
       {
         "__id__": 186
+      },
+      {
+        "__id__": 222
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 192
+        "__id__": 228
       },
       {
-        "__id__": 194
+        "__id__": 230
       }
     ],
     "_prefab": {
-      "__id__": 196
+      "__id__": 232
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -448,6 +451,8 @@
       "__id__": 0
     },
     "fileId": "74uOr15JJA9IjaRHj+THa2",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -1038,6 +1043,8 @@
       "__id__": 0
     },
     "fileId": "f7ZkD1A2VEGYclEeNp9X43",
+    "instance": null,
+    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -4324,29 +4331,143 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "img_close",
+    "_name": "up_down_node",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
       "__id__": 1
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 187
+      },
+      {
+        "__id__": 203
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 187
+        "__id__": 219
+      }
+    ],
+    "_prefab": {
+      "__id__": 221
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 134.844,
+      "y": -161,
+      "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.Node",
+    "_name": "btn_up",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 186
+    },
+    "_children": [
+      {
+        "__id__": 188
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 194
+      },
+      {
+        "__id__": 196
+      },
+      {
+        "__id__": 198
       },
+      {
+        "__id__": 200
+      }
+    ],
+    "_prefab": {
+      "__id__": 202
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -30,
+      "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.Node",
+    "_name": "Label",
+    "_objFlags": 512,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 187
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
       {
         "__id__": 189
+      },
+      {
+        "__id__": 191
       }
     ],
     "_prefab": {
-      "__id__": 191
+      "__id__": 193
     },
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -164,
+      "y": 0,
       "z": 0
     },
     "_lrot": {
@@ -4378,11 +4499,11 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 188
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 188
+      "__id__": 190
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -4398,52 +4519,52 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "81TTm+xb9GWrBzCbYg+O08"
+    "fileId": "60eBdsb2FCJ7JBsPYvMzQb"
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 186
+      "__id__": 188
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 190
+      "__id__": 192
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 0,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
-    "_spriteFrame": {
-      "__uuid__": "64c1f2bf-dc82-4530-bd30-7879d5a3e03e@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,
+    "_string": "↑",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
     "_id": ""
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "6e4249fFpFX6HIKnyKOY55"
+    "fileId": "abCpcFaQ5A2akCUGaUXURi"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -4453,7 +4574,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a6x0w82IJPkYxUJBOkz+bM",
+    "fileId": "09zU58t0dN5a0LavzOyGMh",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -4464,16 +4585,16 @@
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 1
+      "__id__": 187
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 193
+      "__id__": 195
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 420,
-      "height": 400
+      "width": 40,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4484,46 +4605,785 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "7aSKNd9i5GRraKL7bRZ1yq"
+    "fileId": "dd1nprGtpFoIOFT7R/zuTn"
   },
   {
-    "__type__": "ec7d4YI6MdCZLO+DN0BXwEu",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "__editorExtras__": {},
     "node": {
-      "__id__": 1
+      "__id__": 187
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 195
+      "__id__": 197
     },
-    "drag_width": {
-      "__id__": 133
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
     },
-    "drag_height": {
-      "__id__": 153
+    "_spriteFrame": {
+      "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
+      "__expectedType__": "cc.SpriteFrame"
     },
-    "drag_x": {
-      "__id__": 81
+    "_type": 1,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "drag_y": {
-      "__id__": 101
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "67gi7CJt9KMoWUJ23bOvVz"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 187
     },
-    "btn_finish_logic": {
-      "__id__": 166
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 199
     },
-    "lab_finish_logic": {
-      "__id__": 173
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
     },
-    "btn_delete": {
-      "__id__": 186
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
     },
-    "editBox_remark": {
-      "__id__": 34
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
     },
-    "btn_is_show": {
-      "__id__": 43
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 187
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "65gDAf0DFB9bwuVDn5Ae/k"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 187
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 201
+    },
+    "_alignFlags": 32,
+    "_target": null,
+    "_left": 0,
+    "_right": 60,
+    "_top": 0,
+    "_bottom": 0,
+    "_horizontalCenter": 0,
+    "_verticalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "087M68jABI2rldIu9dY0qe"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "7ckqBgdONMTq4sE8LX6HO6",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_down",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 186
+    },
+    "_children": [
+      {
+        "__id__": 204
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 210
+      },
+      {
+        "__id__": 212
+      },
+      {
+        "__id__": 214
+      },
+      {
+        "__id__": 216
+      }
+    ],
+    "_prefab": {
+      "__id__": 218
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 30,
+      "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.Node",
+    "_name": "Label",
+    "_objFlags": 512,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 203
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 205
+      },
+      {
+        "__id__": 207
+      }
+    ],
+    "_prefab": {
+      "__id__": 209
+    },
+    "_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__": 204
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 206
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "36JnGkykhFgokMM/obADD3"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 204
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 208
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "↓",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "50EEJFC75BbJhkkWsq76Ax"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "74uzh9CBVEhorEGoNlC+jE",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 203
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 211
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "8adSSPw5dDgK6TZqm/MacV"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 203
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 213
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 1,
+    "_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": "77o5rKWhtEurAHOfUTmwLv"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 203
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 215
+    },
+    "clickEvents": [],
+    "_interactable": true,
+    "_transition": 3,
+    "_normalColor": {
+      "__type__": "cc.Color",
+      "r": 214,
+      "g": 214,
+      "b": 214,
+      "a": 255
+    },
+    "_hoverColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_pressedColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_normalSprite": null,
+    "_hoverSprite": null,
+    "_pressedSprite": null,
+    "_disabledSprite": null,
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 203
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "43LVDyp1ZJjbPyQniRb74Z"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 203
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 217
+    },
+    "_alignFlags": 32,
+    "_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": 0,
+    "_originalHeight": 0,
+    "_alignMode": 2,
+    "_lockFlags": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60oYp0cJ1M5a+sux9quD/N"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ebq0x84ZVC3azBaVwPp7g4",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 186
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 220
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "00rEGDXClAoIIWn7/O12cS"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "a1bND3qBdPkK+jigGBOy9A",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "img_close",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 223
+      },
+      {
+        "__id__": 225
+      }
+    ],
+    "_prefab": {
+      "__id__": 227
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -164,
+      "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__": 222
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 224
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "81TTm+xb9GWrBzCbYg+O08"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 222
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 226
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "64c1f2bf-dc82-4530-bd30-7879d5a3e03e@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": "6e4249fFpFX6HIKnyKOY55"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "a6x0w82IJPkYxUJBOkz+bM",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 229
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 420,
+      "height": 400
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "7aSKNd9i5GRraKL7bRZ1yq"
+  },
+  {
+    "__type__": "ec7d4YI6MdCZLO+DN0BXwEu",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 231
+    },
+    "drag_width": {
+      "__id__": 133
+    },
+    "drag_height": {
+      "__id__": 153
+    },
+    "drag_x": {
+      "__id__": 81
+    },
+    "drag_y": {
+      "__id__": 101
+    },
+    "btn_finish_logic": {
+      "__id__": 166
+    },
+    "lab_finish_logic": {
+      "__id__": 173
+    },
+    "btn_delete": {
+      "__id__": 222
+    },
+    "editBox_remark": {
+      "__id__": 34
+    },
+    "btn_is_show": {
+      "__id__": 43
+    },
+    "btn_up": {
+      "__id__": 187
+    },
+    "btn_down": {
+      "__id__": 203
     },
     "_id": ""
   },

+ 5 - 1
assets/script/edit/attributes/attributes_anchor.ts

@@ -1,10 +1,11 @@
-import { _decorator, Component, EditBox, Vec2 } from 'cc';
+import { _decorator, Component, EditBox, Vec2, Node } from 'cc';
 const { ccclass, property } = _decorator;
 
 @ccclass('attributes_anchor')
 export class attributes_anchor extends Component {
     @property(EditBox) editBox_x:EditBox = null;
     @property(EditBox) editBox_y:EditBox = null;
+    @property(Node) btn_set:Node = null;
     private call_back:Function = null;
     start() {
         this.editBox_x.node.on(EditBox.EventType.EDITING_DID_ENDED, ()=>{
@@ -13,6 +14,9 @@ export class attributes_anchor extends Component {
         this.editBox_y.node.on(EditBox.EventType.EDITING_DID_ENDED, ()=>{
             this.change()
         })
+        this.btn_set.on(Node.EventType.TOUCH_END, ()=>{
+            
+        })
     }
 
     initView(call:Function){

+ 36 - 11
assets/script/edit/attributes/attributes_drop.ts

@@ -33,16 +33,8 @@ export class attributes_drop extends Component {
 
         this._is_err_drag_back = data.is_err_drag_back;
         this.lab_is_err_back_pos.getComponent(Label).string = this._is_err_drag_back ?"是":"否"
-        this.content.removeAllChildren()
-        if(this.m_data.other_drag_list==undefined){
-            this.m_data.other_drag_list = []
-        }
-        for (let index = 0; index < this.m_data.other_drag_list.length; index++) {
-            let item = instantiate(this.other_drag_item)
-            item.parent = this.content;
-            let item_data = this.m_data.other_drag_list[index]
-            item.getComponent(other_drag_list_item).initView(item_data,this.onOtherDragItemClickDelete.bind(this))
-        }
+
+        this.onUpdateOtherDragList()
 
         if(this.m_data.other_widget_finish_listen_list==undefined){
             this.m_data.other_widget_finish_listen_list = []
@@ -83,6 +75,19 @@ export class attributes_drop extends Component {
         this.call_back = call;
         this._err_back_status_call = err_back_status_call;
     }
+    
+    onUpdateOtherDragList() {
+        this.content.removeAllChildren()
+        if(this.m_data.other_drag_list==undefined){
+            this.m_data.other_drag_list = []
+        }
+        for (let index = 0; index < this.m_data.other_drag_list.length; index++) {
+            let item = instantiate(this.other_drag_item)
+            item.parent = this.content;
+            let item_data = this.m_data.other_drag_list[index]
+            item.getComponent(other_drag_list_item).initView(index, this.m_data.other_drag_list.length, item_data,this.onOtherDragItemClickDelete.bind(this),this.onOtherDragItemUpDown.bind(this))
+        }
+    }
 
     addOtherWidgetFinishListenItem(){
         let item = instantiate(this.other_widget_finish_item)
@@ -109,7 +114,8 @@ export class attributes_drop extends Component {
         item_data.drag_size_width = this.m_data.drag_size_width;
         item_data.drag_size_height = this.m_data.drag_size_height;
         this.m_data.other_drag_list.push(item_data)
-        item.getComponent(other_drag_list_item).initView(this.m_data.other_drag_list[this.m_data.other_drag_list.length-1],this.onOtherDragItemClickDelete.bind(this))
+        let index = this.m_data.other_drag_list.length-1
+        item.getComponent(other_drag_list_item).initView(index, this.m_data.other_drag_list.length, this.m_data.other_drag_list[index],this.onOtherDragItemClickDelete.bind(this),this.onOtherDragItemUpDown.bind(this))
         this.change()
     }
 
@@ -118,6 +124,25 @@ export class attributes_drop extends Component {
         this.m_data.other_drag_list.splice(index,1)
         this.change()
     }
+    onOtherDragItemUpDown(item:other_drag_list_item, is_up:boolean) {
+        console.log('is_up=',is_up)
+        let list = this.m_data.other_drag_list
+        let c_index = item.getIndex()
+        let c_data = list[c_index]
+        let move_index=-1;
+        if(is_up) {
+            move_index = c_index - 1
+        } else {
+            move_index = c_index + 1
+        }
+        if(move_index == -1) {return}
+        let move_data = list[move_index]
+        list[c_index] = move_data
+        list[move_index] = c_data
+
+        this.onUpdateOtherDragList()
+        this.change()
+    }
     change(){
         this.m_data.drag_pos_x = parseInt(this.drag_x.string);
         this.m_data.drag_pos_y = parseInt(this.drag_y.string);

+ 41 - 5
assets/script/edit/attributes/other_drag_list_item.ts

@@ -18,11 +18,17 @@ export class other_drag_list_item extends Component {
     @property(Node) btn_delete:Node = null;
     @property(EditBox) editBox_remark:EditBox = null;
     @property(Node) btn_is_show:Node = null;
+    @property(Node) btn_up:Node = null;
+    @property(Node) btn_down:Node = null;
+    private m_index:number = 0
     private m_data:att_drag_data = null;
-    private delete_call = null;
-    public initView(data:att_drag_data,call){
-        this.delete_call = call;
+    private m_delete_call = null;
+    private m_up_down_call = null;
+    public initView(index:number, total_count:number, data:att_drag_data,delete_call,up_down_call){
+        this.m_index = index
         this.m_data = data;
+        this.m_delete_call = delete_call;
+        this.m_up_down_call = up_down_call;
         this.update_att(this.m_data)
         this.btn_finish_logic.on(Node.EventType.TOUCH_END,()=>{
             let list = Attributes.Singleton.getEventList()
@@ -32,8 +38,8 @@ export class other_drag_list_item extends Component {
             })
         })
         this.btn_delete.on(Node.EventType.TOUCH_END,()=>{
-            if(this.delete_call){
-                this.delete_call(this.m_data)
+            if(this.m_delete_call){
+                this.m_delete_call(this.m_data)
             }
             this.node.removeFromParent()
         })
@@ -50,7 +56,33 @@ export class other_drag_list_item extends Component {
             // console.log('this.m_data.is_show_inTheEditor=',this.m_data.is_show_inTheEditor)
             this.change()
         }, this)
+
+        if(index==0) {
+            this.btn_up.active = false
+        } else {
+            this.btn_up.active = true
+        }
+
+        if(index==total_count-1) {
+            this.btn_down.active = false
+        } else {
+            this.btn_down.active = true
+        }
+
+        this.btn_up.on(Node.EventType.TOUCH_END, ()=>{
+            this.onClickUpDownBtn(true)
+        })
+        this.btn_down.on(Node.EventType.TOUCH_END, ()=>{
+            this.onClickUpDownBtn(false)
+        })
     }
+
+    onClickUpDownBtn(is_up:boolean) {
+        if(this.m_up_down_call!=null) {
+            this.m_up_down_call(this, is_up)
+        }
+    }
+
     change(){
         this.m_data.drag_pos_x = parseInt(this.drag_x.string);
         this.m_data.drag_pos_y = parseInt(this.drag_y.string);
@@ -81,6 +113,10 @@ export class other_drag_list_item extends Component {
         }
         this.btn_is_show.getComponent(Toggle).isChecked = data.is_show_inTheEditor
     }
+
+    public getIndex():number {
+        return this.m_index
+    }
 }
 
 

Some files were not shown because too many files changed in this diff