xx 1 год назад
Родитель
Сommit
2279eac392

Разница между файлами не показана из-за своего большого размера
+ 755 - 46
assets/edit_game.scene


+ 4 - 0
assets/script/edit/attributes/attributes_count_down.ts

@@ -27,6 +27,10 @@ export class attributes_count_down extends Component {
     @property(Node) clear_fail_event:Node = null;
     @property(Node) clear_start_event:Node = null;
 
+    @property(Node) font_size:Node = null;
+    @property(Node) font_color:Node = null;
+
+
     private call_back = null;
     private m_data:att_count_down = null;
     public initView(call){

+ 2 - 2
assets/script/edit/set_color.ts

@@ -1,4 +1,4 @@
-import { _decorator, Component, Node } from 'cc';
+import { _decorator, Color, Component, Node } from 'cc';
 import cp_palette from '../palette/cp_palette';
 import { control } from '../palette/control';
 const { ccclass, property } = _decorator;
@@ -9,7 +9,7 @@ export class set_color extends Component {
     @property(cp_palette) palette:cp_palette = null;
     @property(control) ctrl:control = null;
     
-    public show(){
+    public show(origin_color:Color,call_back){
         this.btn_close.on(Node.EventType.TOUCH_START,()=>{
             this.close()
         })

+ 10 - 1
assets/script/tools.ts

@@ -1,4 +1,4 @@
-import { _decorator, assetManager, Component, ImageAsset, instantiate, Node, Prefab, resources, Sprite, SpriteFrame, Texture2D } from 'cc';
+import { _decorator, assetManager, Color, Component, ImageAsset, instantiate, Node, Prefab, resources, Sprite, SpriteFrame, Texture2D } from 'cc';
 import { main } from './main';
 import { toast } from './toast';
 import { add_scene } from './edit/add_scene';
@@ -31,6 +31,7 @@ import { tip_type_select } from './edit/tip_type_select';
 import { show_copy_scene } from './edit/show_copy_scene';
 import { show_select_more_scene_page } from './edit/show_select_more_scene_page';
 import { select_task_dai_dao_ju } from './edit/task/select_task_dai_dao_ju';
+import { set_color } from './edit/set_color';
 export class tools  {
 
     public static show_dialog(title="是否确定?",sure_callback,cancel_callback=null){
@@ -352,6 +353,14 @@ export class tools  {
         const reg = /^\s+|\s+$/g;
         return str.replace(reg, '')
     }
+
+    public static show_set_color(color:Color,call){
+        resources.load("prefab/set_color",Prefab,(err, prefab)=>{
+            let node:Node = instantiate(prefab);
+            node.parent = main.g_canvas.node;
+            node.getComponent(set_color).show(color,call)
+        }) 
+    }
 }
 
 

Некоторые файлы не были показаны из-за большого количества измененных файлов