更新project教学Demo

Author: 邹杭特

Assets/BridgeUI/Common/SelectabesPanel/SelectAblesPanel.cs

@@ -25,7 +25,7 @@ public virtual string[] Ports
         {
             get
             {
-                return selectables.Select(x => x.name).ToArray();
+                return selectables.Where(x => x != null).Select(x => x.name).ToArray();
             }
         }
 

Assets/BridgeUI/Core/GenCode/Editor/GenCodeUtil.cs

@@ -161,7 +161,16 @@ public static void UpdateScripts(GameObject go, List<ComponentItem> components,
                     }
                     else
                     {
-                        var scriptPath = AssetDatabase.GetAssetPath(go).Replace(".prefab", "_ViewModel.cs");
+                        var vscript = MonoScript.FromMonoBehaviour(viewScript as PanelBase);
+                        string scriptPath = null;
+                        if (vscript.name == go.name)
+                        {
+                            scriptPath = AssetDatabase.GetAssetPath(vscript).Replace(".cs", "_ViewModel.cs");
+                        }
+                        else
+                        {
+                            scriptPath = AssetDatabase.GetAssetPath(go).Replace(".prefab", "_ViewModel.cs");
+                        }
                         CreateNewViewModelScript(go.name + "_ViewModel", scriptPath, components);
                     }
                 }
@@ -205,24 +214,42 @@ public static void CreateViewScript(GameObject go, List<ComponentItem> component
                 var tree = uiCoder.tree;
                 var className = uiCoder.className;
                 var classNode = tree.Descendants.OfType<TypeDeclaration>().Where(x => x.Name == className).First();
+                var type = typeof(BridgeUI.PanelBase).Assembly.GetType(className);
 
                 CreateMemberFields(classNode, needAdd);
                 BindingInfoMethods(classNode, needAdd, rule);
                 SortClassMembers(classNode);
 
                 var prefabPath = AssetDatabase.GetAssetPath(go);
-                var folder = prefabPath.Remove(prefabPath.LastIndexOf("/"));
-                var scriptPath = string.Format("{0}/{1}.cs", folder, uiCoder.className);
+                var script = go.GetComponent(type);
+                var scriptPath = "";
+                if (script != null)
+                {
+                    var vScript = MonoScript.FromMonoBehaviour(script as MonoBehaviour);
+                    if(vScript.name == go.name)
+                    {
+                        scriptPath = AssetDatabase.GetAssetPath(vScript);
+                    }
+                    else
+                    {
+                        scriptPath = AssetDatabase.GetAssetPath(go).Replace(".prefab", ".cs");
+                    }
+                }
+                else
+                {
+                    var folder = prefabPath.Remove(prefabPath.LastIndexOf("/"));
+                    scriptPath = string.Format("{0}/{1}.cs", folder, uiCoder.className);
+                }
+
                 var scriptValue = uiCoder.Compile();
                 System.IO.File.WriteAllText(scriptPath, scriptValue, System.Text.Encoding.UTF8);
                 AssetDatabase.Refresh();
 
                 EditorApplication.delayCall += () =>
                 {
-                    var type = typeof(BridgeUI.PanelBase).Assembly.GetType(className);
                     if (type != null)
                     {
-                        var script = go.GetComponent(type);
+                        script = go.GetComponent(type);
                         if (script == null)
                         {
                             go.AddComponent(type);

Assets/BridgeUI/Core/Graph/Editor/Drawers/UIGraphDrawer.cs

@@ -528,7 +528,7 @@ private void TrySaveAllPrefabs(SerializedProperty arrayProp)
                 var instanceIDPorp = item.FindPropertyRelative("instanceID");
                 var obj = EditorUtility.InstanceIDToObject(instanceIDPorp.intValue);
                 if (obj == null) continue;
-                var prefab = PrefabUtility.GetPrefabObject(obj);
+                var prefab = PrefabUtility.GetPrefabParent(obj);
                 if (prefab != null)
                 {
                     var root = PrefabUtility.FindPrefabRoot((GameObject)prefab);

Assets/Demos/5.ProjectDemo/Anims.meta

@@ -0,0 +1,26 @@
+using BridgeUI;
+using BridgeUI.uTween;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.UI;
+public class ColorAnim : AnimPlayer
+{
+    [SerializeField]
+    private float dely = 1;
+    [SerializeField]
+    private float duration = 2;
+    [SerializeField]
+    private Color startColor = Color.red;
+    [SerializeField]
+    private Color endColor = Color.white;
+
+    protected override List<uTweener> CreateTweeners()
+    {
+        var tweens = new List<uTweener>();
+        var colorTween = uTweenColor.Begin(panel.transform as RectTransform, startColor, Color.white, duration, dely);
+        colorTween.includeChildren = true;
+        tweens.Add(colorTween);
+        return tweens;
+    }
+}

Assets/Demos/5.ProjectDemo/Anims/ColorAnim.cs

@@ -0,0 +1,18 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15c88235c1dc63744884eae9c7fc4791, type: 3}
+  m_Name: colorAnim
+  m_EditorClassIdentifier: 
+  reverse: 0
+  dely: 1
+  duration: 2
+  startColor: {r: 0, g: 1, b: 0.43330193, a: 1}
+  endColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Demos/5.ProjectDemo/Anims/ColorAnim.cs.meta

@@ -6,20 +6,12 @@
 using UnityEngine.EventSystems;
 
 public class ProgressTrigger : MonoBehaviour {
-    public bool playOnAwake;
     public float time = 2;
+    public Text progress;
     public Slider slider;
     public UnityEvent onComplete;
 
-    private void Awake()
-    {
-        if(playOnAwake)
-        {
-            Play();
-        }
-    }
-
-    public void Play()
+    private void OnEnable()
     {
         StartCoroutine(DelayPlaying());
     }
@@ -30,6 +22,10 @@ IEnumerator DelayPlaying()
         {
             yield return null;
             slider.value = (slider.maxValue - slider.minValue) * i / time + slider.minValue;
+            if(progress!=null)
+            {
+                progress.text = string.Format("{0}%", (int)(slider.value * 100));
+            }
         }
         onComplete.Invoke();
     }

Assets/Demos/5.ProjectDemo/Anims/colorAnim.asset

@@ -7,26 +7,24 @@
 using BridgeUI.Binding;
 using System;
 
-public class vm_listPanel : ViewModelObject
+public class ListPanel_ViewModel0 : ListPanel_ViewModel
 {
 	#region 属性列表
-	
-	public System.String[] options {
+	protected System.String[] options {
 		get {
-			return GetValue<System.String[]> ("options");
+			return GetValue<System.String[]> (keyword_options);
 		}
 		set {
-			SetValue<System.String[]> ("options", value);
+			SetValue<System.String[]> (keyword_options, value);
 		}
 	}
 
-	
-	public BridgeUI.Binding.PanelAction<System.Int32> on_selectid {
+	protected BridgeUI.Binding.PanelAction<System.Int32> on_selectid {
 		get {
-			return GetValue<BridgeUI.Binding.PanelAction<System.Int32>> ("on_selectid");
+			return GetValue<BridgeUI.Binding.PanelAction<System.Int32>> (keyword_on_selectid);
 		}
 		set {
-			SetValue<BridgeUI.Binding.PanelAction<System.Int32>> ("on_selectid", value);
+			SetValue<BridgeUI.Binding.PanelAction<System.Int32>> (keyword_on_selectid, value);
 		}
 	}
 
@@ -44,8 +42,12 @@ public override void OnBinding (IBindingContext context)
 	private void OnSelectID (IBindingContext panel, int arg0)
 	{
 		UIFacade.Instence.Open ("PopupPanel", new string[] {
-			arg0.ToString (),
+			"小提示-" + arg0.ToString (),
 			options [arg0]
 		});
 	}
+
+	protected const string keyword_options = "options";
+
+	protected const string keyword_on_selectid = "on_selectid";
 }