Drawcall优化

Assets/AtlasUtility/Script/Editor/AtlasUtilityWindow.cs

@@ -575,7 +575,7 @@
 
         protected void OnEnable()
         {
-            Instance = InstanceManager.GetAtlasUtility();
+            Instance = InstanceManager.SearchInstance<AtlasUtility>();
             SerializedObject = new SerializedObject(Instance);
 
             PackSize = SerializedObject.FindProperty("PackSize");
@@ -1362,7 +1362,7 @@
         }
 
 
-        protected void GetSelectedPath(ref string value)
+        public static void GetSelectedPath(ref string value)
         {
             if (Selection.assetGUIDs.Length > 0)
             {
@@ -1381,7 +1381,7 @@
             }
         }
 
-        protected void GetSelectedName(ref string value)
+        public static void GetSelectedName(ref string value)
         {
             if (Selection.assetGUIDs.Length > 0)
             {

Assets/AtlasUtility/Script/Editor/InstanceManager.cs

@@ -8,15 +8,15 @@
 
     public class InstanceManager
     {
-        public static AtlasUtility GetAtlasUtility()
+        public static T SearchInstance<T>()
         {
             foreach (var path in Directory.GetFiles(Application.dataPath, "SerializeObject.prefab", SearchOption.AllDirectories))
             {
-                AtlasUtility atlasUtility = AssetDatabase.LoadAssetAtPath<GameObject>(path.GetRelativePath()).GetComponent<AtlasUtility>();
+                T t = AssetDatabase.LoadAssetAtPath<GameObject>(path.GetRelativePath()).GetComponent<T>();
 
-                if (atlasUtility != null)
+                if (t != null)
                 {
-                    return atlasUtility;
+                    return t;
                 }
             }
 

Assets/AtlasUtility/Script/Editor/Reference/AtlasReferenceTable.cs

@@ -13,7 +13,7 @@
 
         protected static string ReferenceTablePath
         {
-            get { return AssetDatabase.GetAssetPath(InstanceManager.GetAtlasUtility().AtlasReferenceTable); }
+            get { return AssetDatabase.GetAssetPath(InstanceManager.SearchInstance<AtlasUtility>().AtlasReferenceTable); }
         }
 
         #endregion

Assets/AtlasUtility/Script/Editor/Reference/PlatformReferenceTable.cs

@@ -15,7 +15,7 @@
 
         protected static string ReferenceTablePath
         {
-            get { return AssetDatabase.GetAssetPath(InstanceManager.GetAtlasUtility().PlatformReferenceTable); }
+            get { return AssetDatabase.GetAssetPath(InstanceManager.SearchInstance<AtlasUtility>().PlatformReferenceTable); }
         }
 
         #endregion

Assets/AtlasUtility/Script/Test.cs

@@ -12,7 +12,16 @@ namespace AtlasUtility
         public Texture2D Texture2D;
         public Text Text;
         public SpriteRenderer SpriteRenderer;
+        public MeshRenderer MeshRenderer;
 
         #endregion
+
+        private void Start()
+        {
+            Shader shader = Shader.Find("Sprites/Default");
+            Material material = new Material(shader);
+            material.mainTexture = Texture2D;
+            MeshRenderer.sharedMaterial = material;
+        }
     }
 }

Assets/AtlasUtility/SerializeObject.prefab

@@ -53,7 +53,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PackAtlasFunction: 0
   SliceAtlasFunction: 0
-  SearchReferenceFunction: 1
+  SearchReferenceFunction: 0
   PlatformControllFunction: 0
   ScaleTextureFunction: 0
   DebugFunction: 0
@@ -63,26 +63,7 @@ MonoBehaviour:
   PackPath: "Assets/Resource/Sprite/Editor/PlazaRoom/\u8868\u60C5"
   PackPlan: 1
   PackAtlas: {fileID: 0}
-  TextureList:
-  - {fileID: 2800000, guid: 19831c53e49f01a419213cdc9fdc769c, type: 3}
-  - {fileID: 2800000, guid: 57729e89d40ed604fbe0a319c5d0e467, type: 3}
-  - {fileID: 2800000, guid: 923c03b8f4f92f0498652d078f1891a1, type: 3}
-  - {fileID: 2800000, guid: 191aacffa8ebc9e4996cf2bc23e6dfc7, type: 3}
-  - {fileID: 2800000, guid: cd07b03a9c0fa8244a7a5815e044a581, type: 3}
-  - {fileID: 2800000, guid: 187a8c01c3f18684b92532dccf8a35d4, type: 3}
-  - {fileID: 2800000, guid: 155422630b0a1014fb4b37563c4f325e, type: 3}
-  - {fileID: 2800000, guid: 35b3d802264a08e4a97cf8dfd8f4ce67, type: 3}
-  - {fileID: 2800000, guid: ce27c24b2b22c954ca2348c4d33f48bb, type: 3}
-  - {fileID: 2800000, guid: a4a9714d1600e0f4c968a0140ad64e5c, type: 3}
-  - {fileID: 2800000, guid: 1f1210050a455994aaf12f941c81ee57, type: 3}
-  - {fileID: 2800000, guid: 7cc4a16667b19dc40ad8b65a61a9bc19, type: 3}
-  - {fileID: 2800000, guid: 2d359cf5b038abd499e278b51e50c35f, type: 3}
-  - {fileID: 2800000, guid: 1b2b5d88627c8c74cb8f0d33cfb0514a, type: 3}
-  - {fileID: 2800000, guid: 3e572d3038c60b649a77c0eec05e4eef, type: 3}
-  - {fileID: 2800000, guid: d1fefade0be446946a32e5ce3b44c788, type: 3}
-  - {fileID: 2800000, guid: ebd5f0f0e87a8ff4aa467206b880efbc, type: 3}
-  - {fileID: 2800000, guid: 9713db053daf72743be0fa799d2e101a, type: 3}
-  - {fileID: 2800000, guid: a9d1487454f0d1244ab051071480b0de, type: 3}
+  TextureList: []
   VirtualTextureList: []
   SlicePadding: 0
   SlicePath: Assets/ZTemp

Assets/Resource/Logo.unity

@@ -91,6 +91,119 @@ NavMeshSettings:
     cellSize: 0.16666666
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1001 &209276173
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2041876477}
+    m_Modifications:
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1999869294669664, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 225526192881614886, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Alpha
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948089163080924, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -446,7 +559,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DebugMode: 1
-  CatchException: 1
+  CatchException: 0
   DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
     type: 2}
 --- !u!4 &1833966245
@@ -462,3 +575,112 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2041876476
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
+  m_IsPrefabParent: 0
+--- !u!224 &2041876477 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
+    type: 2}
+  m_PrefabInternal: {fileID: 2041876476}

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -282,6 +282,7 @@ MonoBehaviour:
   - {fileID: 4900000, guid: bab08a56dab6d9441b7fe6cdfbc075a4, type: 3}
   - {fileID: 4900000, guid: 37311be8685a98c4a850ea2c4ecd7bb4, type: 3}
   - {fileID: 4900000, guid: 8d5d74d2d26a2be46a1f875c6130a57f, type: 3}
+  - {fileID: 4900000, guid: b9413a82e8f919e46b0c37372b491307, type: 3}
   DiscardList:
   - {fileID: 1422722603004606, guid: f66999d8c3be4ff46b7dbde0417af018, type: 2}
   - {fileID: 1178346060137818, guid: e2d62becad3f170428db59673f313354, type: 2}

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -3006,6 +3006,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1952824747451048
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224313613547489880}
+  - component: {fileID: 222799791215305856}
+  - component: {fileID: 114717479175982566}
+  m_Layer: 5
+  m_Name: T_RandomLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1958222273491316
 GameObject:
   m_ObjectHideFlags: 1
@@ -3037,6 +3054,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1962256433244238
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224934043000563092}
+  - component: {fileID: 222005954037098574}
+  - component: {fileID: 114168126668903866}
+  - component: {fileID: 114006658474401736}
+  m_Layer: 5
+  m_Name: T_Random
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1963732305879570
 GameObject:
   m_ObjectHideFlags: 1
@@ -3234,6 +3269,47 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+--- !u!114 &114006658474401736
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1962256433244238}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 1, g: 1, b: 1, a: 1}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114168126668903866}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114007659393548340
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4432,6 +4508,33 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114168126668903866
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1962256433244238}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.41116995, g: 0.8602941, b: 0.41116995, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114175684105546482
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -8071,6 +8174,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 10000
+--- !u!114 &114717479175982566
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1952824747451048}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u968F\u673A"
 --- !u!114 &114734099788569290
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -9682,6 +9818,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1477284404910490}
+--- !u!222 &222005954037098574
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1962256433244238}
 --- !u!222 &222009141061153608
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -10456,6 +10598,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1819204488424166}
+--- !u!222 &222799791215305856
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1952824747451048}
 --- !u!222 &222814704300754274
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -11133,7 +11281,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 10.340004, y: -36.7}
+  m_AnchoredPosition: {x: 10.340004, y: -20.16}
   m_SizeDelta: {x: 289.76, y: 55}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224131879888782080
@@ -11784,6 +11932,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -0.5}
   m_SizeDelta: {x: -20, y: -13}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224313613547489880
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1952824747451048}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224934043000563092}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224320573874205756
 RectTransform:
   m_ObjectHideFlags: 1
@@ -11820,6 +11986,7 @@ RectTransform:
   - {fileID: 224873190193445316}
   - {fileID: 224645346995192410}
   - {fileID: 224119601682187518}
+  - {fileID: 224934043000563092}
   m_Father: {fileID: 224378450539291116}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13839,6 +14006,25 @@ RectTransform:
   m_AnchoredPosition: {x: -30, y: -30}
   m_SizeDelta: {x: 42, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224934043000563092
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1962256433244238}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224313613547489880}
+  m_Father: {fileID: 224334310953292558}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 128.61996, y: -62.660004}
+  m_SizeDelta: {x: 53.2, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224938232921887762
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Resource/XML/DefaultNickName.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b9413a82e8f919e46b0c37372b491307
+timeCreated: 1509067330
+licenseType: Pro
+TextScriptImporter:
+  userData: 
+  assetBundleName: config
+  assetBundleVariant: 

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -130,6 +130,7 @@
     <S_Tit desc=""><![CDATA[点赞榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[请输入你的昵称]]></T_Tit>
     <T_TooLong desc=""><![CDATA[昵称太长了]]></T_TooLong>
+    <T_Random desc=""><![CDATA[随机]]></T_Random>
     <T_AllWhiteSpace desc=""><![CDATA[昵称不能为空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[检查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已经存在相同的昵称]]></T_RepeatName>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -130,6 +130,7 @@
     <S_Tit desc=""><![CDATA[點贊榜]]></S_Tit>
     <T_Tit desc=""><![CDATA[請輸入你的昵稱]]></T_Tit>
     <T_TooLong desc=""><![CDATA[昵稱太長了]]></T_TooLong>
+    <T_Random desc=""><![CDATA[]]></T_Random>
     <T_AllWhiteSpace desc=""><![CDATA[昵稱不能為空]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[檢查重名中…]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[已經存在相同的昵稱]]></T_RepeatName>

Assets/Resource/XML/lan/English.xml

@@ -130,6 +130,7 @@ Program 水怪
     <S_Tit desc=""><![CDATA[Like Ranking]]></S_Tit>
     <T_Tit desc=""><![CDATA[Enter your nickname]]></T_Tit>
     <T_TooLong desc=""><![CDATA[Nickname too long]]></T_TooLong>
+    <T_Random desc=""><![CDATA[]]></T_Random>
     <T_AllWhiteSpace desc=""><![CDATA[Nickname can not be null]]></T_AllWhiteSpace>
     <T_Checking desc=""><![CDATA[Checking]]></T_Checking>
     <T_RepeatName desc=""><![CDATA[Repeat]]></T_RepeatName>

Assets/Script/Manage/ManaNickName.cs

@@ -5,20 +5,48 @@ using UnityEngine.Events;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 public class ManaNickName : Regist
 {
-	public static Action OnSetNickNameSucceed;
+    #region Config
+
+    public static Action OnSetNickNameSucceed;
 
 	public static string NickName;
 	public static InputField inputField;
 
-	public override void RegistValueA()
+    private static List<string> LastNames = new List<string>();
+    private static List<string> FirstNames = new List<string>();
+
+    #endregion
+
+    public override void RegistValueA()
 	{
 		SetNickName (ManaData.GetPlayerString ("NickName"));
 		inputField = ManaReso.Get<InputField> ("T_InputField");
+	    string defaultNames = ManaReso.Load<TextAsset>("DefaultNickName", Folder.Config).text;
+	    string[] names = defaultNames.Split('\n');
+        FirstNames = names[0].Split('|')[1].Split(',').ToList();
+	    LastNames = names[1].Split('|')[1].Split(',').ToList();
+        //Debug.Log(FirstNames.Count);
+        //Debug.Log(LastNames.Count);
+        //foreach (var VARIABLE in FirstNames)
+        //{
+        //    Debug.Log(VARIABLE);
+        //}
+        //foreach (var VARIABLE in LastNames)
+        //{
+        //    Debug.LogWarning(VARIABLE);
+        //}
     }
 
+    public static void SetRandomName()
+    {
+        inputField.text = FirstNames.Random()[0].Trim('\'') + LastNames.Random()[0].Trim('\'');
+    }
+
+
 	public static bool ShowNickNameSettingPanelFirstTime()
 	{
         if (!string.IsNullOrEmpty (NickName))

Assets/Script/Manage/ManaUI.cs

@@ -2830,6 +2830,7 @@ public class ManaUI : Regist
 
         #region T
 
+        ManaLan.Add(ManaReso.Get<Text>("T_RandomLab"), new LanStr("UI", "T_Random"));
         ManaLan.Add(ManaReso.Get<Text>("T_ConfirmLab"), new LanStr("Common", "Confirm"));
 
         ManaReso.Get("T_NickName").CreateTweenCG(0f, 1f, 0.25f, false, true, Curve.EaseOutQuad);
@@ -2854,6 +2855,16 @@ public class ManaUI : Regist
             }
         );
 
+        ManaReso.AddButtonEvent
+        (
+            "T_Random",
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.CloseClip);
+                ManaNickName.SetRandomName();
+            }
+        );
+
         #endregion
 
         #region U

Assets/Script/Object/PlazaRoomChest.cs

@@ -148,7 +148,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         BaseInit(chestData);
 
-        ChestSR.material = ShadowSR.material;
+        ChestSR.sharedMaterial = ShadowSR.sharedMaterial;
         
         //if (chestData.Owner == long.Parse(ManaServer.SerialNumber))
         //{
@@ -179,7 +179,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         GrayMaterial.SetFloat("_GrayScaleZ", 0.114f);
         MaterialUnit = new MaterialUnit(GrayMaterial, transform, new List<string>() { "_GrayLerp" });
         MaterialTween = MaterialUnit.CreateTweenMatFloat(1, 0, 0.25f, true, true, Curve.EaseOutQuad);
-        MaterialTween.OnForwardFinish = () => { ChestSR.material = ShadowSR.material; };
+        MaterialTween.OnForwardFinish = () => { ChestSR.sharedMaterial = ShadowSR.sharedMaterial; };
 
         Deactive();
 

Assets/Script/Tool/SpriteUtility.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 87331d9c1b992464abb1c941a40213b0
+folderAsset: yes
+timeCreated: 1509070313
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/SpriteUtility/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: fd22956fab0a6b94a9a31cf338664eef
+folderAsset: yes
+timeCreated: 1509070342
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/SpriteUtility/Editor/SpriteUtilityWindow.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using AtlasUtility;
+using UnityEditor;
+using UnityEngine;
+
+public class SpriteUtilityWindow : EditorWindow
+{
+    #region Config
+
+    protected SpriteUtility Instance;
+
+    protected SerializedProperty Path;
+    protected SerializedProperty Name;
+    protected SerializedProperty Sprite;
+
+    protected SerializedObject SerializedObject;
+
+    #endregion
+
+    [MenuItem("DashGame/SpriteUtility")]
+    protected static void ShowWindow()
+    {
+        Type inspectorType = Type.GetType("UnityEditor.InspectorWindow,UnityEditor.dll");
+
+        SpriteUtilityWindow window = GetWindow<SpriteUtilityWindow>(inspectorType);
+
+        window.titleContent = new GUIContent("SpriteUtility");
+        window.Show();
+    }
+
+    private void OnEnable()
+    {
+        Instance = InstanceManager.SearchInstance<SpriteUtility>();
+        SerializedObject = new SerializedObject(Instance);
+
+        Path = SerializedObject.FindProperty("Path");
+        Name = SerializedObject.FindProperty("Name");
+        Sprite = SerializedObject.FindProperty("Sprite");
+    }
+
+    private void OnGUI()
+    {
+        SerializedObject.Update();
+
+        EditorGUILayout.PropertyField(Sprite, new GUIContent("Sprite"));
+
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.PropertyField(Path, new GUIContent("Path"));
+        if (GUILayout.Button("UseSelectedPath", GUILayout.MaxWidth(120)))
+        {
+            AtlasUtilityWindow.GetSelectedPath(ref Instance.Path);
+        }
+        EditorGUILayout.EndHorizontal();
+
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.PropertyField(Name, new GUIContent("Name"));
+        if (GUILayout.Button("UseSelectedName", GUILayout.MaxWidth(120)))
+        {
+            AtlasUtilityWindow.GetSelectedName(ref Instance.Name);
+        }
+        EditorGUILayout.EndHorizontal();
+
+        if (GUILayout.Button("Generate"))
+        {
+            Generate();
+        }
+
+        SerializedObject.ApplyModifiedProperties();
+    }
+
+    private void Generate()
+    {
+        if (Instance.Sprite == null)
+        {
+            throw new Exception("Sprite未赋值");
+        }
+
+        Mesh mesh = new Mesh();
+        List<Vector3>vertices = new List<Vector3>();
+        List<int> triangles = new List<int>();
+
+        foreach (var vertex in Instance.Sprite.vertices)
+        {
+            vertices.Add(vertex);
+        }
+        foreach (var triangle in Instance.Sprite.triangles)
+        {
+            triangles.Add(triangle);
+        }
+
+        mesh.vertices = vertices.ToArray();
+        mesh.triangles = triangles.ToArray();
+        mesh.uv = Instance.Sprite.uv;
+
+        AssetDatabase.CreateAsset(mesh, GetFullPath());
+    }
+
+    private string GetFullPath()
+    {
+        string directory = Instance.Path.TrimEnd('/', '\\') + "/";
+
+        if (directory.Length < 6 || directory.Substring(0, 6).ToLower() != "assets")
+        {
+            throw new Exception("Path必须位置Assets目录内");
+        }
+
+        if (!Directory.Exists(directory))
+        {
+            throw new Exception("文件夹不存在");
+        }
+
+        if (string.IsNullOrEmpty(Instance.Name) || Instance.Name.Any(System.IO.Path.GetInvalidFileNameChars().Contains))
+        {
+            throw new Exception("无效的名字");
+        }
+
+        string nameWithFormat = Instance.Name + ".asset";
+
+        return directory + nameWithFormat;
+    }
+}

Assets/Script/Tool/SpriteUtility/Editor/SpriteUtilityWindow.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 2418911a30db307468f118fd12d7ad10
+timeCreated: 1509070445
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/SpriteUtility/SerializeObject.prefab

@@ -0,0 +1,56 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1594177319052792}
+  m_IsPrefabParent: 1
+--- !u!1 &1594177319052792
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4977813053446552}
+  - component: {fileID: 114220711197389178}
+  m_Layer: 0
+  m_Name: SerializeObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4977813053446552
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1594177319052792}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114220711197389178
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1594177319052792}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 628e1ab164dedcb41bbd5cdee1d9a3d7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Path: Assets
+  Name: Test
+  Sprite: {fileID: 21300034, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}

Assets/Script/Tool/SpriteUtility/SerializeObject.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 372dea240631a8f48a8067d5b8ce9b8d
+timeCreated: 1509071660
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Tool/SpriteUtility/SpriteUtility.cs

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class SpriteUtility : MonoBehaviour
+{
+    #region Config
+
+    public string Path;
+    public string Name;
+    public Sprite Sprite;
+
+    #endregion
+
+    public void Start()
+    {
+        
+    }
+
+    public void Update()
+    {
+
+    }
+}

Assets/Script/Tool/SpriteUtility/SpriteUtility.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 628e1ab164dedcb41bbd5cdee1d9a3d7
+timeCreated: 1509070356
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

第三期.txt

@@ -16,8 +16,15 @@
 IOS设置Team
 
 
+利用shader控制深度
+
 缺排行榜按钮 公告按钮
 
 内存优化(释放掉loading界面)
 
-Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)
+Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)
+
+
+
+AtlasUtility SpriteUtility 中的UseSelectedPath UseSelectedName改为AutoPath AutoName
+检查文件夹路径和文件名是否合法应该提取出来