Ver código fonte

Merge branch 'master' of http://120.79.128.142:3000/904118851/yinmi_h5_edit

xx 1 ano atrás
pai
commit
b21f294184

+ 8 - 0
assets/data/data.ts

@@ -460,6 +460,7 @@ export class event_item_show_new_item extends base_event_item{ // 出现新道
 }
 export class event_item_hide extends base_event_item{ // 隐藏
     public binding_widget_id:number = -1; //绑定某一个UI
+    public binding_widget_list:event_widget_more_event_item[] = [] //绑定事件列表
 }
 
 export class event_item_delay_exe_event extends base_event_item{ // 延迟多久执行一个事件
@@ -479,9 +480,11 @@ export class event_start_event_item extends base_event_item{ // 开始的事件
 }
 export class event_active_event_item extends base_event_item{ // 激活控件的事件
     public binding_widget_id:number = -1; //绑定事件
+    public binding_widget_list:event_widget_more_event_item[] = [] //绑定事件列表
 }
 export class event_stop_active_event_item extends base_event_item{ // 不激活控件的事件,停用交互
     public binding_widget_id:number = -1; //绑定事件
+    public binding_widget_list:event_widget_more_event_item[] = [] //绑定事件列表
 }
 export class event_collect_event_item extends base_event_item{ // 收集多个事件完成
     public event_id_list:number[] = []
@@ -503,6 +506,11 @@ export class event_item_switch_scene_event extends base_event_item { // 切换
     public delay_time:number = 0;
 }
 
+export class event_widget_more_event_item extends base_event_item {
+    public binding_widget_id:number = -1; //绑定事件
+    public binding_widget_remark:string = ''; //绑定备注
+}
+
 export class UserData {
     public user_id:string = null; //用户id
     public token:string = "";

Diferenças do arquivo suprimidas por serem muito extensas
+ 475 - 123
assets/resources/prefab/add_animation.prefab


Diferenças do arquivo suprimidas por serem muito extensas
+ 209 - 409
assets/resources/prefab/edit_event.prefab


+ 1317 - 0
assets/resources/prefab/edit_event_more_delete_drag_other_item.prefab

@@ -0,0 +1,1317 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "edit_event_more_delete_drag_other_item",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "edit_event_more_delete_drag_other_item",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 16
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 50
+      },
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 54
+      }
+    ],
+    "_prefab": {
+      "__id__": 56
+    },
+    "_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.Node",
+    "_name": "btn_select_widget",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -225,
+      "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__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_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__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 5
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 450,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "62L0ppoLxH8r3gBny8yadz"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 7
+    },
+    "_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": 2,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "68Rf5eeERO44uIVMAhn9Fd"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4emytRpFFOB7zWpbF/mNiB",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 450,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "11pg0PMz9PvbvRhoqLOmCB"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_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": "afAMEB0ANFn4XDgKLO5mBK"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 14
+    },
+    "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__": 2
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f7yWZtscJBe5kfZ/Nj4LmU"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c0j0116j5AWKz9qQg6Xd5l",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "dis",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 23
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 43
+      },
+      {
+        "__id__": 45
+      },
+      {
+        "__id__": 47
+      }
+    ],
+    "_prefab": {
+      "__id__": 49
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 225,
+      "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": "lab_cur_select_dis",
+    "_objFlags": 512,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -131.595,
+      "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__": 17
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 19
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bd+1++nWVPL75cKFkjrDY/"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_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": 0,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "42BFhk3IxLNYdRRApAm/sb"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "d4/YCQFOxAkr9H2py3chEG",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "btn_select_dis",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 30
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 38
+      },
+      {
+        "__id__": 40
+      }
+    ],
+    "_prefab": {
+      "__id__": 42
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 65.797,
+      "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": "TEXT_LABEL",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 23
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 29
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -78,
+      "y": 20,
+      "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__": 24
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 26
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 158,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 1
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "982mP3nbJFCIuieErq134o"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 28
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 1,
+    "_actualFontSize": 40,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "818fWtUxJC+IqDo1Vql0Ik"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "32C7TBOElDPZ/cYxOEzn8n",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "PLACEHOLDER_LABEL",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 23
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 33
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -78,
+      "y": 20,
+      "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__": 30
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 32
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 158,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 1
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d3W4/99JZF5qe6bYTReTsn"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 30
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 34
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 187,
+      "g": 187,
+      "b": 187,
+      "a": 255
+    },
+    "_string": "0",
+    "_horizontalAlign": 0,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 1,
+    "_enableWrapText": false,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": false,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "ceksXRpHVGyqoBXEpxrPTC"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "cey/T2pG9KuId8du8aba87",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 37
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 160,
+      "height": 40
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "998ElH7ItKwr7X4kter9K/"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 39
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@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": "c6koCStjNOHY92p624ioUf"
+  },
+  {
+    "__type__": "cc.EditBox",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 23
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 41
+    },
+    "editingDidBegan": [],
+    "textChanged": [],
+    "editingDidEnded": [],
+    "editingReturn": [],
+    "_textLabel": {
+      "__id__": 27
+    },
+    "_placeholderLabel": {
+      "__id__": 33
+    },
+    "_returnType": 0,
+    "_string": "",
+    "_tabIndex": 0,
+    "_backgroundImage": {
+      "__uuid__": "bd1bcaba-bd7d-4a71-b143-997c882383e4@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_inputFlag": 5,
+    "_inputMode": 3,
+    "_maxLength": 8,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "14ZP+2+tBF7Y9bqtcLtQ6n"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "719SreWShCSJWSjbpyzJ4N",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 44
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 450,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "6dlON1Z+NBV4phaCoMGN7R"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 46
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 96,
+      "g": 218,
+      "b": 96,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@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": "d7OZ6aNMtAO7GNOBGKyfSS"
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 48
+    },
+    "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": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_hoverSprite": {
+      "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_pressedSprite": {
+      "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_disabledSprite": {
+      "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_duration": 0.1,
+    "_zoomScale": 1.2,
+    "_target": {
+      "__id__": 16
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "2dspwr/KhKFbVp5/KsxfH7"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "74C5CwD71BF4CxP0eNxF9B",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 51
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 900,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "d6UdtT3HVPwalHaRdE5pDD"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 53
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 96,
+      "g": 218,
+      "b": 96,
+      "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": "c7o67rKo9DfZEmZuVNg1Oj"
+  },
+  {
+    "__type__": "d140fVobd9Lv4dg/nwLXPsC",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 55
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "98lxLTIjhM0Kvlf9Sbr5d4"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

+ 13 - 0
assets/resources/prefab/edit_event_more_delete_drag_other_item.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "276a378d-0b57-41b3-8655-8daf948325bd",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "edit_event_more_delete_drag_other_item"
+  }
+}

+ 595 - 0
assets/resources/prefab/edit_event_more_item.prefab

@@ -0,0 +1,595 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "edit_event_more_item",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "edit_event_more_item",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 14
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 24
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_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.Node",
+    "_name": "lab_id",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -27,
+      "y": 20,
+      "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__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 210,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "9cwjrqYNJJwpgvMXk99y6w"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "id:0001",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 41,
+    "_fontSize": 40,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 2,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "77idFVOIhNVoGw6+ljGrzO"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c1yHtIoShOyZZ1gurMW9Vu",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lab_remark",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": -27,
+      "y": -25,
+      "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__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 10
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 210,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "47KLPHInxLdJeL3ZqLZUpw"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 12
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_string": "",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 31,
+    "_fontSize": 30,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 2,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "b8a7nGyo1FzLLAC+Qxqw68"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "e7GUgujCxIArY8ZY6IjBdy",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "img_delete",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 108,
+      "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__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 45,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "0bbpcHi7hIirT5Un5rYakW"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 14
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 18
+    },
+    "_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": "e7kaBFlg1ER6mbtmCRU1h2"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "2dcp/PeLBOf62s3wWHrF8b",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 21
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 290,
+      "height": 120
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "30JOtwL4tEo7E604YjtKxz"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 23
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 96,
+      "g": 218,
+      "b": 96,
+      "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": "a5TScSz0tKn7PwDkI512sU"
+  },
+  {
+    "__type__": "d1ec17IjcFIyo9H9Zbfp5nW",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 25
+    },
+    "lab_id": {
+      "__id__": 2
+    },
+    "lab_remark": {
+      "__id__": 8
+    },
+    "img_delete": {
+      "__id__": 14
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "c0mMEEA2dNsZnD2fHWDjI7"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

+ 13 - 0
assets/resources/prefab/edit_event_more_item.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "52b2472d-fd7a-4536-a2c2-ef38abe4383a",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "edit_event_more_item"
+  }
+}

+ 10 - 1
assets/script/edit/animation/new_frame.ts

@@ -34,6 +34,8 @@ export class new_frame extends Component {
 
     @property(Node) res_preview:Node = null;
 
+    @property(Node) btn_update_cur_pos:Node = null;
+
     private m_up_frame:ani_frame = null;
     private m_create_call = null;
     private m_edit_call = null;
@@ -107,7 +109,14 @@ export class new_frame extends Component {
                 this.setupSprContentSize()
             })
         })
-        
+
+        this.btn_update_cur_pos.on(Node.EventType.TOUCH_END, ()=> {
+            let att_data = Attributes.Singleton.get_cur_att_data()
+            this.m_data.pos_x = Math.floor(att_data.x)
+            this.m_data.pos_y = Math.floor(att_data.y)
+            this.pos_x.getComponent(EditBox).string = this.m_data.pos_x.toString()
+            this.pos_y.getComponent(EditBox).string = this.m_data.pos_y.toString()
+        })
 
         this.next_time.on('editing-did-ended', this.change, this);
         this.pos_x.on('editing-did-ended', this.change, this);

+ 3 - 1
assets/script/edit/attributes/attributes_res.ts

@@ -24,7 +24,8 @@ export class attributes_res extends Component {
         })
        }) 
 
-       this.btn_clear_res.on(Node.EventType.TOUCH_END,()=>{
+       if(this.btn_clear_res!=null) {
+        this.btn_clear_res.on(Node.EventType.TOUCH_END,()=>{
             let att = Attributes.Singleton.get_cur_att_data();
             att.src = ""
             att.src_name = ""
@@ -32,6 +33,7 @@ export class attributes_res extends Component {
             tools.showToast("资源已被重置为空!")
             ClientEvent.dispatchEvent(config.Event.UpdateAttributesToView,att,config.attributes_list_type.url)
        })
+       }
     }
 
     public update_att(url:string){

+ 18 - 0
assets/script/edit/event/edit_event_more_delete_drag_other_item.ts

@@ -0,0 +1,18 @@
+import { _decorator, Component, EditBox, Node } from 'cc';
+const { ccclass, property } = _decorator;
+
+@ccclass('edit_event_more_delete_drag_other_item')
+export class edit_event_more_delete_drag_other_item extends Component {
+    @property(Node) btn_select_widget:Node = null
+    @property(EditBox) editbox:EditBox = null
+    start() {
+        this.btn_select_widget.on(Node.EventType.TOUCH_END, ()=> {
+            
+        })
+        this.editbox.node.on(EditBox.EventType.EDITING_DID_ENDED, ()=> {
+            let index = parseInt(this.editbox.string)
+            console.log('index=',index)
+        })
+    }
+}
+

+ 9 - 0
assets/script/edit/event/edit_event_more_delete_drag_other_item.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "d140f568-6ddf-4bbf-8760-fe7c0b5cfb02",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 25 - 0
assets/script/edit/event/edit_event_more_item.ts

@@ -0,0 +1,25 @@
+import { _decorator, Component, Label, Node } from 'cc';
+import { event_widget_more_event_item } from '../../../data/data';
+const { ccclass, property } = _decorator;
+
+@ccclass('edit_event_more_item')
+export class edit_event_more_item extends Component {
+    @property(Node) lab_id:Node = null;
+    @property(Node) lab_remark:Node = null;
+    @property(Node) img_delete:Node = null;
+    private m_delete_callback: Function = null;
+    start() {
+        this.img_delete.on(Node.EventType.TOUCH_END, ()=>{
+            if(this.m_delete_callback!=null) {
+                this.m_delete_callback()
+            }
+        },this)
+    }
+
+    initView(data:event_widget_more_event_item, delete_callback:Function) {
+        this.m_delete_callback = delete_callback
+        this.lab_id.getComponent(Label).string = 'id:' + data.binding_widget_id
+        this.lab_remark.getComponent(Label).string = data.binding_widget_remark
+    }
+}
+

+ 9 - 0
assets/script/edit/event/edit_event_more_item.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "d1ec1ec8-8dc1-48ca-8f47-f596dfa799d6",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

+ 71 - 5
assets/script/edit/event/event_active_event.ts

@@ -1,9 +1,10 @@
-import { _decorator, Component, Label, Node } from 'cc';
-import { attributes_data, event_active_event_item, widget_item_data } from '../../../data/data';
+import { _decorator, Component, instantiate, Label, Node, Prefab } from 'cc';
+import { attributes_data, event_active_event_item, event_widget_more_event_item, widget_item_data } from '../../../data/data';
 import { Attributes } from '../Attributes';
 import { config } from '../../config';
 import { tools } from '../../tools';
 import { ClientEvent } from '../../clientEvent';
+import { edit_event_more_item } from './edit_event_more_item';
 const { ccclass, property } = _decorator;
 
 @ccclass('event_active_event')
@@ -11,6 +12,14 @@ export class event_active_event extends Component {
     private m_data:event_active_event_item = null;
     @property(Node) btn_select_ui:Node = null;
     @property(Node) lab_name:Node = null;
+    @property(Node) btn_more:Node = null;
+    @property(Node) content:Node = null;
+    @property(Prefab) item_more_prefab:Prefab = null;
+    protected start(): void {
+        this.btn_more.on(Node.EventType.TOUCH_END, ()=> {
+            this.onClickMoreBtn()
+        },this)
+    }
     public initView(data:event_active_event_item){
         this.m_data = data;
         this.btn_select_ui.on(Node.EventType.TOUCH_END,()=>{
@@ -25,20 +34,77 @@ export class event_active_event extends Component {
           
         })
         this.updateStatus()
+        this.updateMoreListStatus()
         ClientEvent.on(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
     }
     protected onDestroy(): void {
         ClientEvent.off(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
     }
     UpdateAttributesToView(data:attributes_data,update_type:string){
-        if(this.m_data.binding_widget_id===data.id&&update_type===config.attributes_list_type.delete){
-            this.m_data.binding_widget_id = -1;
-            this.updateStatus()
+        if(update_type==config.attributes_list_type.delete) {
+            if(this.m_data.binding_widget_id===data.id){
+                this.m_data.binding_widget_id = -1;
+                this.updateStatus()
+            }
+            let is_have = false
+            for(let i=0;i<this.m_data.binding_widget_list.length;i++) {
+                const element = this.m_data.binding_widget_list[i]
+                if(element.binding_widget_id===data.id) {
+                    element.binding_widget_id = -1;
+                    is_have = true
+                }
+            }
+            if(is_have) {
+                this.updateMoreListStatus()
+            }
         }
     }
     updateStatus(){
         this.lab_name.getComponent(Label).string =  this.m_data.binding_widget_id===-1?"当前选择激活的控件":`当前选择激活的控件id:${this.m_data.binding_widget_id}`
     }
+    onClickMoreBtn() {
+        let list =  Attributes.Singleton.get_cur_scene_all_only_widget()
+        if(list.length<=0){
+            return tools.showToast("当前场景没有添控件!")
+        }
+        tools.show_select_widget_list(list,(item:widget_item_data)=>{
+            if(item.att.id == this.m_data.binding_widget_id) {
+                return
+            }
+            var have_index:number = -1
+            for(let i=0; i<this.m_data.binding_widget_list.length; i++) {
+                const element = this.m_data.binding_widget_list[i]
+                
+                if(element.binding_widget_id == item.att.id) {
+                    have_index = i
+                    break
+                }
+            }
+            if(have_index!=-1) {
+                this.m_data.binding_widget_list.splice(have_index,1)
+            }
+            let more_item = new event_widget_more_event_item
+            more_item.binding_widget_id = item.att.id
+            more_item.binding_widget_remark = item.att.remark
+            this.m_data.binding_widget_list.push(more_item)
+            this.updateMoreListStatus()
+        },this.m_data.binding_widget_id)
+    }
+    updateMoreListStatus() {
+        if(this.m_data.binding_widget_list==undefined) {
+            this.m_data.binding_widget_list = []
+        }
+        this.content.removeAllChildren()
+        for(let index = 0; index < this.m_data.binding_widget_list.length; index ++) {
+            const element = this.m_data.binding_widget_list[index]
+            let item = instantiate(this.item_more_prefab);
+            item.parent = this.content;
+            item.getComponent(edit_event_more_item).initView(element, ()=>{
+                this.m_data.binding_widget_list.splice(index,1)
+                this.updateMoreListStatus()
+            })
+        }
+    }
 }
 
 

+ 4 - 1
assets/script/edit/event/event_delete_drag_other_data_view.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, EditBox, Label, Node } from 'cc';
+import { _decorator, Component, EditBox, Label, Node, Prefab } from 'cc';
 import { event_item_delete_drag_other, widget_item_data } from '../../../data/data';
 import { Attributes } from '../Attributes';
 import { tools } from '../../tools';
@@ -11,6 +11,9 @@ export class event_delete_drag_other_data_view extends Component {
     @property(Node) btn_select_select_other:Node = null;
     @property(Node) lab_cur_select_widget:Node = null;
     @property(EditBox) edit_other:EditBox = null;
+    @property(Node) btn_more:Node = null;
+    @property(Node) content:Node = null;
+    @property(Prefab) item_more_delete_drag_other_prefab:Prefab = null;
     // @property(Node) lab_cur_select_other:Node = null;
     private m_data:event_item_delete_drag_other = null;
     private m_widget_item_data:widget_item_data = null;

+ 55 - 2
assets/script/edit/event/event_hide.ts

@@ -1,9 +1,10 @@
-import { _decorator, Component, Label, Node } from 'cc';
-import { attributes_data, event_item_hide, widget_item_data } from '../../../data/data';
+import { _decorator, Component, instantiate, Label, Node, Prefab } from 'cc';
+import { attributes_data, event_item_hide, event_widget_more_event_item, widget_item_data } from '../../../data/data';
 import { tools } from '../../tools';
 import { Attributes } from '../Attributes';
 import { ClientEvent } from '../../clientEvent';
 import { config } from '../../config';
+import { edit_event_more_item } from './edit_event_more_item';
 const { ccclass, property } = _decorator;
 
 @ccclass('event_hide')
@@ -11,6 +12,14 @@ export class event_hide extends Component {
     private m_data:event_item_hide = null;
     @property(Node) btn_select_widget:Node = null;
     @property(Node) lab_select_widget:Node = null;
+    @property(Node) btn_more:Node = null;
+    @property(Node) content:Node = null;
+    @property(Prefab) item_more_prefab:Prefab = null;
+    protected start(): void {
+        this.btn_more.on(Node.EventType.TOUCH_END, ()=> {
+            this.onClickMoreBtn()
+        },this)
+    }
     public initView(data:event_item_hide){
         this.m_data = data;
         this.btn_select_widget.on(Node.EventType.TOUCH_END,()=>{
@@ -24,6 +33,7 @@ export class event_hide extends Component {
             },this.m_data.binding_widget_id)
         })
         this.updateStatus()
+        this.updateMoreListStatus()
         ClientEvent.on(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
     }
 
@@ -43,6 +53,49 @@ export class event_hide extends Component {
             this.lab_select_widget.getComponent(Label).string = "隐藏的控件id:"+this.m_data.binding_widget_id;
         }
     }
+    onClickMoreBtn() {
+        let list =  Attributes.Singleton.get_cur_scene_all_only_widget()
+        if(list.length<=0){
+            return tools.showToast("当前场景没有添控件!")
+        }
+        tools.show_select_widget_list(list,(item:widget_item_data)=>{
+            if(item.att.id == this.m_data.binding_widget_id) {
+                return
+            }
+            var have_index:number = -1
+            for(let i=0; i<this.m_data.binding_widget_list.length; i++) {
+                const element = this.m_data.binding_widget_list[i]
+                
+                if(element.binding_widget_id == item.att.id) {
+                    have_index = i
+                    break
+                }
+            }
+            if(have_index!=-1) {
+                this.m_data.binding_widget_list.splice(have_index,1)
+            }
+            let more_item = new event_widget_more_event_item
+            more_item.binding_widget_id = item.att.id
+            more_item.binding_widget_remark = item.att.remark
+            this.m_data.binding_widget_list.push(more_item)
+            this.updateMoreListStatus()
+        },this.m_data.binding_widget_id)
+    }
+    updateMoreListStatus() {
+        if(this.m_data.binding_widget_list==undefined) {
+            this.m_data.binding_widget_list = []
+        }
+        this.content.removeAllChildren()
+        for(let index = 0; index < this.m_data.binding_widget_list.length; index ++) {
+            const element = this.m_data.binding_widget_list[index]
+            let item = instantiate(this.item_more_prefab);
+            item.parent = this.content;
+            item.getComponent(edit_event_more_item).initView(element, ()=>{
+                this.m_data.binding_widget_list.splice(index,1)
+                this.updateMoreListStatus()
+            })
+        }
+    }
 }
 
 

+ 73 - 7
assets/script/edit/event/event_stop_active_event.ts

@@ -1,17 +1,26 @@
-import { _decorator, Component, Label, Node } from 'cc';
-import { attributes_data, event_active_event_item, widget_item_data } from '../../../data/data';
+import { _decorator, Component, instantiate, Label, Node, Prefab } from 'cc';
+import { attributes_data, event_stop_active_event_item, event_widget_more_event_item, widget_item_data } from '../../../data/data';
 import { Attributes } from '../Attributes';
 import { tools } from '../../tools';
 import { ClientEvent } from '../../clientEvent';
 import { config } from '../../config';
+import { edit_event_more_item } from './edit_event_more_item';
 const { ccclass, property } = _decorator;
 
 @ccclass('event_stop_active_event')
 export class event_stop_active_event extends Component {
-    private m_data:event_active_event_item = null;
+    private m_data:event_stop_active_event_item = null;
     @property(Node) btn_select_ui:Node = null;
     @property(Node) lab_name:Node = null;
-    public initView(data:event_active_event_item){
+    @property(Node) btn_more:Node = null;
+    @property(Node) content:Node = null;
+    @property(Prefab) item_more_prefab:Prefab = null;
+    protected start(): void {
+        this.btn_more.on(Node.EventType.TOUCH_END, ()=> {
+            this.onClickMoreBtn()
+        },this)
+    }
+    public initView(data:event_stop_active_event_item){
         this.m_data = data;
         this.btn_select_ui.on(Node.EventType.TOUCH_END,()=>{
             let list =  Attributes.Singleton.get_cur_scene_all_only_widget()
@@ -25,19 +34,76 @@ export class event_stop_active_event extends Component {
           
         })
         this.updateStatus()
+        this.updateMoreListStatus()
         ClientEvent.on(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
     }
     protected onDestroy(): void {
         ClientEvent.off(config.Event.UpdateAttributesToView,this.UpdateAttributesToView,this)
     }
     UpdateAttributesToView(data:attributes_data,update_type:string){
-        if(this.m_data.binding_widget_id===data.id&&update_type===config.attributes_list_type.delete){
-            this.m_data.binding_widget_id = -1;
-            this.updateStatus()
+        if(update_type===config.attributes_list_type.delete) {
+            if(this.m_data.binding_widget_id===data.id){
+                this.m_data.binding_widget_id = -1;
+                this.updateStatus()
+            }
+            let is_have = false
+            for(let i=0;i<this.m_data.binding_widget_list.length;i++) {
+                const element = this.m_data.binding_widget_list[i]
+                if(element.binding_widget_id===data.id) {
+                    element.binding_widget_id = -1;
+                    is_have = true
+                }
+            }
+            if(is_have) {
+                this.updateMoreListStatus()
+            }
         }
     }
     updateStatus(){
         this.lab_name.getComponent(Label).string =  this.m_data.binding_widget_id===-1?"当前选择停用激活的控件":`当前选择停用激活的控件id:${this.m_data.binding_widget_id}`
     }
+    onClickMoreBtn() {
+        let list =  Attributes.Singleton.get_cur_scene_all_only_widget()
+        if(list.length<=0){
+            return tools.showToast("当前场景没有添控件!")
+        }
+        tools.show_select_widget_list(list,(item:widget_item_data)=>{
+            if(item.att.id == this.m_data.binding_widget_id) {
+                return
+            }
+            var have_index:number = -1
+            for(let i=0; i<this.m_data.binding_widget_list.length; i++) {
+                const element = this.m_data.binding_widget_list[i]
+                
+                if(element.binding_widget_id == item.att.id) {
+                    have_index = i
+                    break
+                }
+            }
+            if(have_index!=-1) {
+                this.m_data.binding_widget_list.splice(have_index,1)
+            }
+            let more_item = new event_widget_more_event_item
+            more_item.binding_widget_id = item.att.id
+            more_item.binding_widget_remark = item.att.remark
+            this.m_data.binding_widget_list.push(more_item)
+            this.updateMoreListStatus()
+        },this.m_data.binding_widget_id)
+    }
+    updateMoreListStatus() {
+        if(this.m_data.binding_widget_list==undefined) {
+            this.m_data.binding_widget_list = []
+        }
+        this.content.removeAllChildren()
+        for(let index = 0; index < this.m_data.binding_widget_list.length; index ++) {
+            const element = this.m_data.binding_widget_list[index]
+            let item = instantiate(this.item_more_prefab);
+            item.parent = this.content;
+            item.getComponent(edit_event_more_item).initView(element, ()=>{
+                this.m_data.binding_widget_list.splice(index,1)
+                this.updateMoreListStatus()
+            })
+        }
+    }
 }
 

+ 11 - 9
assets/script/edit/uiWidget/receive_res_item.ts

@@ -27,15 +27,17 @@ export class receive_res_item extends Component {
     start() {
         ClientEvent.on(config.Event.DragResEndOnCheck,this.DragResEndOnCheck,this)
 
-        this.btn_clear_res.on(Node.EventType.TOUCH_END, ()=>{
-            this.m_data.res = '';
-            this.m_data.res_name = '';
-            let lab =  this.getLabel()
-            if(lab!=null){
-                lab.getComponent(Label).string = "无"
-            }
-            ClientEvent.dispatchEvent(config.Event.UpdateAttributesToView,Attributes.Singleton.get_cur_att_data(),this.widget_type)
-        })
+        if(this.btn_clear_res!=null) {
+            this.btn_clear_res.on(Node.EventType.TOUCH_END, ()=>{
+                this.m_data.res = '';
+                this.m_data.res_name = '';
+                let lab =  this.getLabel()
+                if(lab!=null){
+                    lab.getComponent(Label).string = "无"
+                }
+                ClientEvent.dispatchEvent(config.Event.UpdateAttributesToView,Attributes.Singleton.get_cur_att_data(),this.widget_type)
+            })
+        }
     }
 
     protected onDestroy(): void {

+ 8 - 6
assets/script/edit/uiWidget/single_ui_widget_info.ts

@@ -19,12 +19,14 @@ export class single_ui_widget_info extends Component {
     private call_back = null;
     private m_data:ui_att_item = null;
     protected start(): void {
-        this.btn_clear_res.on(Node.EventType.TOUCH_END, ()=> {
-            this.m_data.res = '';
-            this.m_data.res_name = '';
-            this.updateInfo(this.m_data)
-            this.change()
-        })
+        if(this.btn_clear_res!=null) {
+            this.btn_clear_res.on(Node.EventType.TOUCH_END, ()=> {
+                this.m_data.res = '';
+                this.m_data.res_name = '';
+                this.updateInfo(this.m_data)
+                this.change()
+            })
+        }
     }
     public initView(call){
         this.call_back = call;

+ 3 - 0
assets/script/edit/widget_item.ts

@@ -142,6 +142,9 @@ export class widget_item extends Component {
             })
             item.getComponent(Sprite).color = this.getOtherDragListColor(index) //Color.YELLOW
             item.getChildByName('lab_drag_remark').getComponent(Label).string = element.remark
+            if(element.is_show_inTheEditor==undefined) {
+                element.is_show_inTheEditor = true
+            }
             item.active = element.is_show_inTheEditor
         }
         this.lab_drag.getComponent(Label).string = `${this.m_data.name}id:${this.m_att.id}`

+ 8 - 8
assets/script/run/TaskSchedule/taskServce.ts

@@ -169,15 +169,15 @@ export class taskServce {
                     let widget_id = taskServce.getEventById(element).event_item_be_event_data.binding_widget_id
                     let event_data = new event_item
                     // 激活控件
-                    let active_event = new event_active_event_item
-                    active_event.binding_widget_id = widget_id
-                    event_data.type = config.event_type.active_event
-                    event_data.event_item_active_event_data = active_event
+                    // let active_event = new event_active_event_item
+                    // active_event.binding_widget_id = widget_id
+                    // event_data.type = config.event_type.active_event
+                    // event_data.event_item_active_event_data = active_event
                     // 不激活控件
-                    // let stop_active_event = new event_stop_active_event_item
-                    // stop_active_event.binding_widget_id = widget_id
-                    // event_data.type = config.event_type.stop_active_event
-                    // event_data.event_item_stop_active_event_data = stop_active_event
+                    let stop_active_event = new event_stop_active_event_item
+                    stop_active_event.binding_widget_id = widget_id
+                    event_data.type = config.event_type.stop_active_event
+                    event_data.event_item_stop_active_event_data = stop_active_event
                     // 事件
                     taskServce.DistributedEvent(event_data)
                     console.log("event_data--",event_data)

+ 24 - 0
assets/script/run/scene_page.ts

@@ -110,8 +110,32 @@ export class scene_page extends Component {
             }else{
                 tools.showToast("删除拖拽目标配置错误!")
             }
+        }else if(event.type===config.event_type.active_event) {
+            let data = event.event_item_active_event_data
+            this.eventBindingWidgetList(data, event) 
+        }else if(event.type===config.event_type.stop_active_event) {
+            let data = event.event_item_stop_active_event_data
+            this.eventBindingWidgetList(data, event) 
+        }else if(event.type===config.event_type.hide) {
+            let data = event.event_item_hide_data
+            this.eventBindingWidgetList(data, event)
         }
     }
+    eventBindingWidgetList(data, event:event_item) {
+        if(data!=null) {
+            if(data.binding_widget_list==null||data.binding_widget_list.length==0) {
+                return
+            }
+            for(let i=0;i<data.binding_widget_list.length;i++) {
+                const element = data.binding_widget_list[i]
+                let e_widget_id = element.binding_widget_id
+                let e_item = this.mWidgetList.get(e_widget_id)
+                if(e_item){
+                    e_item.getComponent(widget_base).beActive(e_widget_id,event)
+                }
+            }
+        }  
+    }
     on_zhao_bu_tong_finish(widget:zhao_xi_jie_item_data){
        let item =   this.mWidgetList.get(widget.widget_id)
        if(item===null){

+ 1 - 0
assets/script/run/widget/widget_base.ts

@@ -157,6 +157,7 @@ export class widget_base extends Component {
                     
                 break;
                 case config.event_type.stop_active_event: //停止激活
+                console.log('停止激活 停止激活')
                     this.mIsActive = false;
                 break;
                 // case config.event_type.collect_event: //自己被触发后,被收集类给收集

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff