456

assets/edit_game.scene

@@ -344,7 +344,7 @@
     "_priority": 0,
     "_fov": 45,
     "_fovAxis": 0,
-    "_orthoHeight": 960,
+    "_orthoHeight": 963.1017770597739,
     "_near": 0,
     "_far": 1000,
     "_color": {
@@ -14130,7 +14130,7 @@
     "_paddingTop": 0,
     "_paddingBottom": 0,
     "_spacingX": 10,
-    "_spacingY": 50,
+    "_spacingY": 20,
     "_verticalDirection": 0,
     "_horizontalDirection": 0,
     "_constraint": 2,

assets/resources/prefab/event_item.prefab

@@ -134,7 +134,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_event_id",
+    "_name": "lab_event_name",
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
@@ -156,7 +156,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 29.041,
+      "y": 59.257999999999996,
       "z": 0
     },
     "_lrot": {
@@ -208,7 +208,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "79qiqF/qNMZoawT9/PGY+d"
+    "fileId": "f0/N0pMeVA+7Gu/7EVeo+M"
   },
   {
     "__type__": "cc.Label",
@@ -227,12 +227,12 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
+      "r": 0,
+      "g": 0,
+      "b": 0,
       "a": 255
     },
-    "_string": "当前事件id：1",
+    "_string": "事件名字：fuck",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 40,
@@ -253,7 +253,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "a7wxGvLelKeISM4z4+Fvl7"
+    "fileId": "2eDpnWqmZCJI0DZDhFTVxL"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -263,14 +263,14 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "b2KW3F8cZEPK6LMjmhe580",
+    "fileId": "a56cwlluFJp5cJpk1xhXCV",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
     "__type__": "cc.Node",
-    "_name": "lab_event_name",
+    "_name": "lab_event_id",
     "_objFlags": 512,
     "__editorExtras__": {},
     "_parent": {
@@ -292,7 +292,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 103.258,
+      "y": -2.9589999999999996,
       "z": 0
     },
     "_lrot": {
@@ -344,7 +344,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "f0/N0pMeVA+7Gu/7EVeo+M"
+    "fileId": "79qiqF/qNMZoawT9/PGY+d"
   },
   {
     "__type__": "cc.Label",
@@ -363,12 +363,12 @@
     "_dstBlendFactor": 4,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
-    "_string": "事件名字：fuck",
+    "_string": "当前事件id：1",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
     "_actualFontSize": 40,
@@ -389,7 +389,7 @@
   },
   {
     "__type__": "cc.CompPrefabInfo",
-    "fileId": "2eDpnWqmZCJI0DZDhFTVxL"
+    "fileId": "a7wxGvLelKeISM4z4+Fvl7"
   },
   {
     "__type__": "cc.PrefabInfo",
@@ -399,7 +399,7 @@
     "asset": {
       "__id__": 0
     },
-    "fileId": "a56cwlluFJp5cJpk1xhXCV",
+    "fileId": "b2KW3F8cZEPK6LMjmhe580",
     "instance": null,
     "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
@@ -435,7 +435,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -80.67,
+      "y": -63.67,
       "z": 0
     },
     "_lrot": {
@@ -564,8 +564,8 @@
     "_string": "编辑",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
-    "_fontSize": 40,
+    "_actualFontSize": 27,
+    "_fontSize": 27,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 1,
@@ -611,8 +611,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 150,
-      "height": 80
+      "width": 160,
+      "height": 43
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -890,7 +890,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 400,
-      "height": 300
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -925,10 +925,10 @@
     "_startAxis": 0,
     "_paddingLeft": 0,
     "_paddingRight": 0,
-    "_paddingTop": 50,
-    "_paddingBottom": 50,
+    "_paddingTop": 0,
+    "_paddingBottom": 0,
     "_spacingX": 0,
-    "_spacingY": 20,
+    "_spacingY": 0,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 0,
@@ -954,10 +954,10 @@
       "__id__": 41
     },
     "lab_event_id": {
-      "__id__": 3
+      "__id__": 9
     },
     "lab_event_name": {
-      "__id__": 9
+      "__id__": 3
     },
     "btn_edit_event": {
       "__id__": 15

assets/resources/prefab/ui/edit_event_view.prefab

@@ -423,7 +423,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_isItalic": false,
-    "_isBold": false,
+    "_isBold": true,
     "_isUnderline": false,
     "_underlineHeight": 2,
     "_cacheMode": 0,
@@ -3810,7 +3810,7 @@
     "_paddingTop": 0,
     "_paddingBottom": 0,
     "_spacingX": 50,
-    "_spacingY": 50,
+    "_spacingY": 20,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
     "_constraint": 2,

assets/script/config.ts

@@ -21,6 +21,7 @@ export class config {
     }
 
     static Event = {
+        BackLevelList:"BackLevelList",
         PLAY_SOUND:"PLAY_SOUND",
         DragWidget:"DragWidget",
         DragRes:"DragRes",

assets/script/edit/event/event_item_view.ts

@@ -17,8 +17,10 @@ export class event_item_view extends Component {
         this.m_type = type;
         this.m_delete_call = delete_call;
        
-        this.lab_event_id.getComponent(Label).string = `当前-${ config.event_type_map.get(this.m_type)}-事件id：${this.m_data.event_id}`
-        this.lab_event_name.getComponent(Label).string = `当前事件名字：${this.m_data.event_name}`
+        // this.lab_event_id.getComponent(Label).string = `当前-${ config.event_type_map.get(this.m_type)}-事件id：${this.m_data.event_id}`
+        // this.lab_event_name.getComponent(Label).string = `当前事件名字：${this.m_data.event_name}`
+        this.lab_event_id.getComponent(Label).string = `${ config.event_type_map.get(this.m_type)}-事件id：${this.m_data.event_id}`
+        this.lab_event_name.getComponent(Label).string = `事件名字：${this.m_data.event_name}`
         this.btn_edit_event.on(Node.EventType.TOUCH_END,()=>{
             tools.show_edit_event( this.m_type ,this.m_data,(data)=>{
                 if(this.m_delete_call!=null){

assets/script/edit/task/scene_task.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, instantiate, Label, Layers, Layout, Node, Prefab, ScrollView, Vec2, Vec3 } from 'cc';
+import { _decorator, Component, instantiate, Label, Layers, Layout, Node, Prefab, ScrollView, UITransform, Vec2, Vec3 } from 'cc';
 import { tools } from '../../tools';
 import { edit_scene } from '../edit_scene';
 import { ClientEvent } from '../../clientEvent';
@@ -61,8 +61,9 @@ export class scene_task extends Component {
         }, (text: string)=> {
             this.searchContentLocationList(false,text)
         })
-    }
 
+        ClientEvent.on(config.Event.BackLevelList,this.backLevelList.bind(this),this)
+    }
 
     public initView(_edit_scene:edit_scene){
         this.m_edit_scene = _edit_scene;
@@ -71,6 +72,11 @@ export class scene_task extends Component {
         ClientEvent.on(config.Event.UpdateEditScene,this.UpdateEditScene,this)
     }
 
+    backLevelList() {
+        // 返回关卡列表,关闭更新编辑场景通知
+        ClientEvent.off(config.Event.UpdateEditScene,this.UpdateEditScene,this)
+    }
+
     UpdateEditScene(){
         this.btn_add_task.active = false;
         this.btn_add_event.active = false;
@@ -131,6 +137,7 @@ export class scene_task extends Component {
             const element = task_data.event_list[index];
             this.addEventItemView(element.type,element)
         }
+        this.node.getComponent(ScrollView).scrollToTop()
     }
 
     public addTask(type:number){
@@ -300,7 +307,12 @@ export class scene_task extends Component {
         }
     }
 
-    searchContentLocationList(isId: boolean, string: string) {        
+    searchContentLocationList(isId: boolean, string: string) {  
+        let rect = this.btn_add_event.getComponent(UITransform).getBoundingBox()
+        var event_content_top = rect.y
+        if(event_content_top<0) { event_content_top = Math.abs(event_content_top) }
+        event_content_top = event_content_top + rect.height + 100
+
         let task_data = this.getTaskData()
         let data_list = task_data.event_list
         let check_yes = false
@@ -318,9 +330,9 @@ export class scene_task extends Component {
             if(check_yes) {
                 let c_index = (data_list.length-1)-index
                 let c_row = Math.round(c_index / 2)
-                let c_spacing_y = c_row * 50
-                let c_item_height = (c_row - 1) * 300
-                let c_offset_y = c_spacing_y + c_item_height + 1100
+                let c_spacing_y = c_row * 20
+                let c_item_height = (c_row - 1) * 200
+                let c_offset_y = c_spacing_y + c_item_height + event_content_top
                 this.node.getComponent(ScrollView).scrollToOffset(new Vec2(0, c_offset_y))
                 this.search_node.getComponent(Search).showTip(element)
                 break

assets/script/main.ts

@@ -91,6 +91,7 @@ export class main extends Component {
 
     onBackLevelList(){
         this.level_list.active = true;
+        ClientEvent.dispatchEvent(config.Event.BackLevelList)
     }
 
     onDragWidget(node:Node){