456

assets/resources/prefab/edit_event.prefab

@@ -37905,7 +37905,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -15,
       "y": 454.817,
       "z": 0
     },
@@ -37946,8 +37946,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 500,
-      "height": 50.4
+      "width": 800,
+      "height": 85
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -37985,12 +37985,12 @@
     "_string": "事件名字",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
+    "_actualFontSize": 41,
     "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -38118,8 +38118,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1919.9999999999998,
-      "height": 1919.9999999999998
+      "width": 1920,
+      "height": 1920
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/resources/prefab/event_item.prefab

@@ -235,12 +235,12 @@
     "_string": "事件名字：fuck",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
+    "_actualFontSize": 41,
     "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
@@ -371,12 +371,12 @@
     "_string": "当前事件id：1",
     "_horizontalAlign": 1,
     "_verticalAlign": 1,
-    "_actualFontSize": 40,
+    "_actualFontSize": 41,
     "_fontSize": 40,
     "_fontFamily": "Arial",
     "_lineHeight": 40,
     "_overflow": 2,
-    "_enableWrapText": false,
+    "_enableWrapText": true,
     "_font": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,

assets/script/edit/event/edit_event.ts

@@ -94,7 +94,8 @@ export class edit_event extends Component {
         this.m_delete_call = delete_call;
         this.initMap()
         this.initEventView()
-        this.lab_event_name.getComponent(Label).string = `当前事件名字${this.m_data.event_name}`
+        // this.lab_event_name.getComponent(Label).string = `当前事件名字${this.m_data.event_name}`
+        this.lab_event_name.getComponent(Label).string = `事件名字:${this.m_data.event_name}`
         this.m_delete_call = delete_call;
         this.btn_delete.on(Node.EventType.TOUCH_END,()=>{
             if(this.m_delete_call !=null){

assets/script/edit/event/event_item_view.ts

@@ -19,8 +19,8 @@ export class event_item_view extends Component {
        
         // 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

@@ -331,7 +331,15 @@ export class scene_task extends Component {
                 let c_index = (data_list.length-1)-index
                 let c_row = Math.round(c_index / 2)
                 let c_spacing_y = c_row * 20
-                let c_item_height = (c_row - 1) * 200
+                var is_row_count = 1
+                var is_jishu:boolean = true //是否是奇数
+                if(data_list.length%2==0) {
+                    is_jishu = false
+                }
+                if(is_jishu==false&&index%2==0) {
+                    is_row_count = 2
+                }
+                let c_item_height = (c_row - is_row_count) * 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)