Browse Source

调整掉花概率

liuqilin 7 years ago
parent
commit
e5781c2069

+ 1 - 0
Assets/AtlasUtility/Script/Editor/TestEditor.cs

@@ -47,6 +47,7 @@ namespace AtlasUtility
 
             if (GUILayout.Button("Test"))
             {
+                Debug .Log(Script.GameObject.transform.GetSiblingIndex());
                 //foreach (var VARIABLE in Enum.GetValues(typeof(PlayerDirection)))
                 //{
                 //    Debug.Log(VARIABLE);

+ 45 - 231
Assets/Panel.prefab

@@ -11,16 +11,16 @@ Prefab:
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1338839275615992}
   m_IsPrefabParent: 1
---- !u!1 &1068751886612132
+--- !u!1 &1312685176750482
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224977832684939848}
-  - component: {fileID: 222685148270028482}
-  - component: {fileID: 114448897707175658}
+  - component: {fileID: 224947028358140272}
+  - component: {fileID: 222497433765154724}
+  - component: {fileID: 114938694695160328}
   m_Layer: 5
   m_Name: Title
   m_TagString: Untagged
@@ -28,24 +28,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1080608065445320
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224004470014524054}
-  - component: {fileID: 222175080681637908}
-  - component: {fileID: 114300240974044762}
-  - component: {fileID: 114060076327655078}
-  m_Layer: 5
-  m_Name: NewButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1338839275615992
 GameObject:
   m_ObjectHideFlags: 0
@@ -63,17 +45,17 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1528406634465908
+--- !u!1 &1440665118297126
 GameObject:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224039332265720712}
-  - component: {fileID: 222434975420286526}
-  - component: {fileID: 114936055368922624}
-  - component: {fileID: 114467161086344116}
+  - component: {fileID: 224376657049105432}
+  - component: {fileID: 222790523026842770}
+  - component: {fileID: 114071356562392082}
+  - component: {fileID: 114126513381034690}
   m_Layer: 5
   m_Name: Button
   m_TagString: Untagged
@@ -81,62 +63,39 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1654504510131344
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 224190239401635906}
-  - component: {fileID: 222235463764209680}
-  - component: {fileID: 114002878433859344}
-  m_Layer: 5
-  m_Name: Content
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &114002878433859344
+--- !u!114 &114071356562392082
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1654504510131344}
+  m_GameObject: {fileID: 1440665118297126}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: New Text
---- !u!114 &114060076327655078
+  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 &114126513381034690
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1080608065445320}
+  m_GameObject: {fileID: 1440665118297126}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -166,18 +125,18 @@ MonoBehaviour:
     m_PressedTrigger: Pressed
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 114300240974044762}
+  m_TargetGraphic: {fileID: 114071356562392082}
   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 &114300240974044762
+--- !u!114 &114501709495217876
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1080608065445320}
+  m_GameObject: {fileID: 1338839275615992}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -191,20 +150,20 @@ MonoBehaviour:
       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_Sprite: {fileID: 0}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &114448897707175658
+--- !u!114 &114938694695160328
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1068751886612132}
+  m_GameObject: {fileID: 1312685176750482}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -232,179 +191,36 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: New Text
---- !u!114 &114467161086344116
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1528406634465908}
-  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: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    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: 114936055368922624}
-  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 &114501709495217876
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1338839275615992}
-  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: 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_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!114 &114936055368922624
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1528406634465908}
-  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: 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_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!222 &222175080681637908
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1080608065445320}
---- !u!222 &222235463764209680
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1654504510131344}
 --- !u!222 &222238864335677058
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1338839275615992}
---- !u!222 &222434975420286526
+--- !u!222 &222497433765154724
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1528406634465908}
---- !u!222 &222685148270028482
+  m_GameObject: {fileID: 1312685176750482}
+--- !u!222 &222790523026842770
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1068751886612132}
---- !u!224 &224004470014524054
+  m_GameObject: {fileID: 1440665118297126}
+--- !u!224 &224376657049105432
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1080608065445320}
+  m_GameObject: {fileID: 1440665118297126}
   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: 224597384089362468}
-  m_RootOrder: 3
-  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: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224039332265720712
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1528406634465908}
-  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: 224597384089362468}
-  m_RootOrder: 2
-  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: 0, y: 0}
-  m_SizeDelta: {x: 160, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224190239401635906
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1654504510131344}
-  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: 224597384089362468}
-  m_RootOrder: 1
+  m_Father: {fileID: 224947028358140272}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -421,10 +237,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224977832684939848}
-  - {fileID: 224190239401635906}
-  - {fileID: 224039332265720712}
-  - {fileID: 224004470014524054}
+  - {fileID: 224947028358140272}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -433,16 +246,17 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224977832684939848
+--- !u!224 &224947028358140272
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1068751886612132}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 1312685176750482}
+  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_Children:
+  - {fileID: 224376657049105432}
   m_Father: {fileID: 224597384089362468}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 137 - 100
Assets/Resource/Logo.unity

@@ -95,7 +95,7 @@ NavMeshSettings:
 RectTransform:
   m_PrefabParentObject: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
     type: 2}
-  m_PrefabInternal: {fileID: 361251518}
+  m_PrefabInternal: {fileID: 1382871605}
 --- !u!1 &16072523
 GameObject:
   m_ObjectHideFlags: 0
@@ -107,6 +107,7 @@ GameObject:
   - component: {fileID: 16072526}
   - component: {fileID: 16072525}
   - component: {fileID: 16072524}
+  - component: {fileID: 16072528}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -189,106 +190,42 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!1001 &361251518
-Prefab:
+--- !u!114 &16072528
+MonoBehaviour:
   m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 16072527}
-    m_Modifications:
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: c32731d4b49fbd146ae54a3978501d8c, type: 2}
-  m_IsPrefabParent: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 16072523}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef3c42f14ba649d4aaf2ea3afe194ba7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GameObject: {fileID: 16072523}
+  TextAsset: {fileID: 0}
+  Text: {fileID: 0}
+  Texture2D: {fileID: 0}
+  SpriteRenderer: {fileID: 0}
+  Sprite: {fileID: 0}
+  MeshFilter: {fileID: 0}
+  MeshRenderer: {fileID: 0}
+  MaxAmount: 23
+--- !u!1 &25573182 stripped
+GameObject:
+  m_PrefabParentObject: {fileID: 1338839275615992, guid: c32731d4b49fbd146ae54a3978501d8c,
+    type: 2}
+  m_PrefabInternal: {fileID: 1382871605}
+--- !u!225 &25573183
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 25573182}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -669,6 +606,106 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1382871605
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 16072527}
+    m_Modifications:
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: c32731d4b49fbd146ae54a3978501d8c, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Script/Extension/ExtList.cs

@@ -267,7 +267,7 @@ public static class ExtList
     }
 
 
-    public static int GetMatchAmount<T>(this List<T> list, Func<T, bool> func) //todo 
+    public static int GetMatchAmount<T>(this List<T> list, Func<T, bool> func)
     {
         int matchAmount = 0;
         for (int i = 0; i < list.Count; i++)

+ 7 - 0
Assets/Script/Social/FashionShowHomePage.cs

@@ -125,6 +125,13 @@ public class FashionShowHomePage : Regist
         SimpleTabButton.onClick.AddListener(() => OnTabButtonClick(SimpleTabButton));
         GloryTabButton.onClick.AddListener(() => OnTabButtonClick(GloryTabButton));
 
+        //#NAME.Init()
+        //#NAME.OnSaveItem += OnSave#NAMEItem
+        //#NAME.OnGetNextItem += OnGetNext#NAMEItem
+        //#NAME.OnGetPreviousItem += OnGetPrevious#NAMEItem
+        //OnSave#NAMEItem
+        //OnGetNext#NAMEItem
+        //OnGetPrevious#NAMEItem
         HomeScrollRect.Init(1, 3);
         CuteScrollRect.Init(1, 3);
         GraceScrollRect.Init(1, 3);

+ 1 - 2
Assets/TestLabel.cs

@@ -9,9 +9,8 @@ public class TestLabel
 	//StartMark-Used by LabelUtility-Do not remove
 	public static string Panel = "Panel";
 	public static string Title = "Title";
-	public static string Content = "Content";
 	public static string Button = "Button";
-	public static string NewButton = "NewButton";
+	public static string GameObject = "GameObject";
 	//EndMark-Used by LabelUtility-Do not remove
 
 	#endregion

+ 1 - 1
Assets/TestLabel.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: f7fb805300eb1a943a9198efb382841e
-timeCreated: 1514016437
+timeCreated: 1514040935
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 19 - 34
Assets/TestScript.cs

@@ -4,44 +4,29 @@ using System.Collections.Generic;
 
 public class TestScript : MonoBehaviour
 {
-    #region Config
+	#region Config
 
-    //StartMark-Used by LabelUtility-Do not remove
-    private Text Title;
-    private Text Content;
-    private Button Button;
-    private Button NewButton;
-    private Transform Panel;
-    //EndMark-Used by LabelUtility-Do not remove
+	//StartMark-Used by LabelUtility-Do not remove
+	private Text Title;
+	private Button Button;
+	private VirtualScrollRectPlus GameObject;
+	//EndMark-Used by LabelUtility-Do not remove
 
-    #endregion
+	#endregion
 
-    private void Regist()
-    {
-        //RegistStartMark-Used by LabelUtility-Do not remove
-        Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
-        Auxiliary.CompileDic(transform, childDictionary);
-        Title = childDictionary[TestLabel.Title].GetComponent<Text>();
-        Content = childDictionary[TestLabel.Content].GetComponent<Text>();
-        Button = childDictionary[TestLabel.Button].GetComponent<Button>();
-        NewButton = childDictionary[TestLabel.NewButton].GetComponent<Button>();
-        Panel = childDictionary[TestLabel.Panel].GetComponent<Transform>();
+	private void Regist()
+	{
+		//RegistStartMark-Used by LabelUtility-Do not remove
+		Dictionary<string, Transform> childDictionary = new Dictionary<string, Transform>();
+		Auxiliary.CompileDic(transform, childDictionary);
+		Title = childDictionary[TestLabel.Title].GetComponent<Text>();
+		Button = childDictionary[TestLabel.Button].GetComponent<Button>();
+		GameObject = childDictionary[TestLabel.GameObject].GetComponent<VirtualScrollRectPlus>();
         //RegistEndMark-Used by LabelUtility-Do not remove
         //RegistEventStartMark-Used by LabelUtility-Do not remove
-        Button.onClick.AddListener(OnButtonClick);
-        NewButton.onClick.AddListener(OnNewButtonClick);
-        //RegistEventEndMark-Used by LabelUtility-Do not remove
-    }
+		//RegistEventEndMark-Used by LabelUtility-Do not remove
+	}
 
-    //EventStartMark-Used by LabelUtility-Do not remove
-    private void OnButtonClick()
-    {
-        Debug.Log(1);
-    }
-    
-    private void OnNewButtonClick()
-    {
-
-    }
-    //EventEndMark-Used by LabelUtility-Do not remove
+	//EventStartMark-Used by LabelUtility-Do not remove
+	//EventEndMark-Used by LabelUtility-Do not remove
 }

+ 1 - 1
Assets/TestScript.cs.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 12e87b20af07e454dbd88462d0bdcd72
-timeCreated: 1514016438
+timeCreated: 1514040936
 licenseType: Pro
 MonoImporter:
   serializedVersion: 2

+ 30 - 6
Assets/Tookits/LabelUtility/Editor/LabelSetDrawer.cs

@@ -142,11 +142,11 @@ namespace labelUtility
                 {
                     EditorGUI.BeginChangeCheck();
                     position = DrawPropertys(position, Prefabs, LineHeight + LineSpan);
-                    position = DrawButton(position, "Refresh", () => { registTargets = RefreshRegistTargets(); }, LineHeight);
                     if (EditorGUI.EndChangeCheck())
                     {
-                        registTargets = RefreshRegistTargets();
+                        OnRefresh();
                     }
+                    position = DrawButton(position, "Refresh", OnRefresh, LineHeight);
                 }
 
                 if (drawRegistArea)
@@ -183,9 +183,9 @@ namespace labelUtility
                     position = DrawPropertys(position, Types, LineHeight + LineSpan);
                     if (EditorGUI.EndChangeCheck())
                     {
-                        registTargets = RefreshRegistTargets();
+                        OnRefresh();
                     }
-                    position = DrawPropertys(position, RegistTargets, (LineHeight + LineSpan)*6);
+                    position = DrawPropertys(position, RegistTargets, (LineHeight + LineSpan)*7);
                     position = DrawButton(position, "Create Components From Prefab", () => { LabelUtility.CreateComponentsFromPrefab(Instance); });
                 }
 
@@ -202,9 +202,19 @@ namespace labelUtility
             Instance.TotalHeight = position.y - originY;
         }
 
-        private List<RegistTarget> RefreshRegistTargets()
+        private void OnRefresh()
         {
+            //for (int i = 0; i < Instance.RegistTargets.Count; i++)
+            //{
+            //    Debug.Log(Instance.RegistTargets[i].Transform.name + "  " + Instance.RegistTargets[i].Type);
+            //}
+
             RegistTargetsChangeFlag = true;
+            registTargets = RefreshRegistTargets();
+        }
+
+        private List<RegistTarget> RefreshRegistTargets()
+        {
             List<GameObject> prefabs = new List<GameObject>();
             for (int i = 0; i < Prefabs.arraySize; i++)
             {
@@ -223,6 +233,10 @@ namespace labelUtility
                 componentTypes.Add(componentType);
             }
             List<Type> types = GetTypes(componentTypes);
+            //foreach (var VARIABLE in Instance.RegistTargets)
+            //{
+            //    Debug.Log(VARIABLE.Transform.name + "  " + VARIABLE.Transform.GetSiblingIndex());
+            //}
             List<RegistTarget> registTargets = new List<RegistTarget>();
             for (int i = 0; i < types.Count; i++)
             {
@@ -257,7 +271,17 @@ namespace labelUtility
         {
             foreach (var registTarget in Instance.RegistTargets)
             {
-                if (registTarget.Transform == transform && registTarget.Type == type)
+                if (registTarget.Transform == null)
+                {
+                    continue;
+                }
+                //if (registTarget.Transform == transform && registTarget.Type == type)
+                //{
+                //    Debug.Log(transform.name + "  " + registTarget.Transform.name);
+                //    Debug.Log(registTarget.Transform.GetSiblingIndex());
+                //    Debug.LogWarning(transform.GetSiblingIndex());
+                //}
+                if (registTarget.Transform == transform  && registTarget.Type == type)
                 {
                     return registTarget;
                 }

+ 20 - 0
Assets/Tookits/LabelUtility/Editor/LabelUtilityWindow.cs

@@ -69,8 +69,28 @@ namespace labelUtility
                 eventString.RegistStrings = new List<string>();
                 eventString.RegistStrings.Add("#NEWNAME.onClick.AddListener(On#NEWNAMEClick)");
                 eventString.MethodNames = new List<string>();
+                eventString.MethodNames.Add("void On#NEWNAMEClick()");
+                Instance.EventStrings.Add(eventString);
+
+                eventString = new ComponentEventString();
+                eventString.ComponentType = ComponentType.Text;
+                eventString.RegistStrings = new List<string>();
+                eventString.RegistStrings.Add("LanguageManager.Add(#NEWNAME, new MulLanStr(LanguageLabel.#NAME))");
+                eventString.MethodNames = new List<string>();
                 eventString.MethodNames.Add("On#NEWNAMEClick");
                 Instance.EventStrings.Add(eventString);
+
+                eventString = new ComponentEventString();
+                eventString.ComponentType = ComponentType.VirtualScrollRectPlus;
+                eventString.RegistStrings = new List<string>();
+                eventString.RegistStrings.Add("#NAME.OnSaveItem += OnSave#NAMEItem");
+                eventString.RegistStrings.Add("#NAME.OnGetNextItem += OnGetNext#NAMEItem");
+                eventString.RegistStrings.Add("#NAME.OnGetPreviousItem += OnGetPrevious#NAMEItem");
+                eventString.MethodNames = new List<string>();
+                eventString.MethodNames.Add("void OnSave#NAMEItem(int index, VirtualScrollRectItem item)");
+                eventString.MethodNames.Add("VirtualScrollRectItem OnGetNext#NAMEItem(int index)");
+                eventString.MethodNames.Add("VirtualScrollRectItem OnGetPrevious#NAMEItem(int index)");
+                Instance.EventStrings.Add(eventString);
             }
             EditorGUILayout.PropertyField(DllNames, new GUIContent("DllNames"), true);
             EditorGUILayout.PropertyField(EventStrings, new GUIContent("EventStrings"), true);

+ 25 - 6
Assets/Tookits/LabelUtility/LabelUtility.cs

@@ -23,6 +23,8 @@ namespace labelUtility
         public string Name;
         public bool Force;
         public bool Ignore;
+        //public bool CustomName;
+        public bool CustomEvent = true;
         public Transform Transform;
         public ComponentType Type;
     }
@@ -76,6 +78,7 @@ namespace labelUtility
         Button,
         InputField,
         Transform,
+        CanvasGroup,
         RectTransform,
         SpriteRenderer,
         VirtualScrollRectPlus,
@@ -235,7 +238,7 @@ namespace labelUtility
         }
 
 
-        public static void CreateLabelFromPrefab(LabelSet labelSet, bool showWarning = true) //todo 更新
+        public static void CreateLabelFromPrefab(LabelSet labelSet, bool showWarning = true, bool regist = false) //todo 更新
         {
             if (labelSet.LabelScript == null)
             {
@@ -251,6 +254,11 @@ namespace labelUtility
                 }
             }
 
+            if (!regist)
+            {
+                regist = EditorUtility.DisplayDialog("提示", "是否自动注册", "确定", "取消");
+            }
+
             List<string> labels = new List<string>();
             List<Transform> transforms = GetAllTransformFromPrefab(labelSet.Prefabs);
             foreach (var transform in transforms)
@@ -258,6 +266,11 @@ namespace labelUtility
                 labels.Add($"{labelSet.LabePrefix} {transform.name} = \"{transform.name}\";");
             }
             InsertLineToScript(StartMark, EndMark, labelSet.LabelScript, labels);
+
+            if (regist)
+            {
+                CreateComponentsFromPrefab(labelSet, false);
+            }
         }
 
         public static void CreateLabelFromLanguageXml(LabelSet labelSet, bool showWarning = true) //todo 更新
@@ -364,13 +377,17 @@ namespace labelUtility
                 {
                     if (eventString.ComponentType == registTarget.Type)
                     {
+                        if (!registTarget.CustomEvent)
+                        {
+                            continue;
+                        }
                         for (int i = 0; i < eventString.MethodNames.Count; i++)
                         {
-                            eventNames.Add($"{eventString.MethodNames[i].Replace("#NEWNAME", registTarget.Name)}");
+                            eventNames.Add($"{eventString.MethodNames[i].Replace("#NEWNAME", registTarget.Name).Replace("#NAME", registTarget.Transform.name)}");
                         }
                         for (int i = 0; i < eventString.RegistStrings.Count; i++)
                         {
-                            registEventStrings.Add($"{eventString.RegistStrings[i].Replace("#NEWNAME", registTarget.Name)};");
+                            registEventStrings.Add($"{eventString.RegistStrings[i].Replace("#NEWNAME", registTarget.Name).Replace("#NAME", registTarget.Transform.name)};");
                         }
                     }
                 }
@@ -401,8 +418,10 @@ namespace labelUtility
                         {
                             //Debug.Log((int)methodStrings[j][0]);
                             //Debug.Log((int)methodStrings[j][1]);
-                            //Debug.LogWarning(methodStrings[j].Substring(tabAmount.Value));
-                            newEventMethods.Add(methodStrings[j].Substring(tabAmount.Value));
+                            //Debug.LogWarning(methodStrings[j]);
+                            //Debug.Log(methodStrings[j].Length);
+                            string str = methodStrings[j].Length > 0 ? methodStrings[j].Substring(tabAmount.Value) : methodStrings[j];
+                            newEventMethods.Add(str);
                         }
                     }
                     if (i < eventNames.Count - 1)
@@ -412,7 +431,7 @@ namespace labelUtility
                 }
                 else
                 {
-                    newEventMethods.Add($"{labelSet.ComponentPrefix} void {eventNames[i]}()");
+                    newEventMethods.Add($"{labelSet.ComponentPrefix} {eventNames[i]}");
                     newEventMethods.Add("{\r\n");
                     newEventMethods.Add(i < eventNames.Count - 1 ? "}\r\n" : "}");
                 }

+ 31 - 66
Assets/Tookits/LabelUtility/LabelUtility.prefab

@@ -60,7 +60,20 @@ MonoBehaviour:
     RegistStrings:
     - '#NEWNAME.onClick.AddListener(On#NEWNAMEClick)'
     MethodNames:
-    - On#NEWNAMEClick
+    - void On#NEWNAMEClick()
+  - ComponentType: 1
+    RegistStrings:
+    - LanguageManager.Add(#NEWNAME, new MulLanStr(LanguageLabel.#NAME))
+    MethodNames: []
+  - ComponentType: 10
+    RegistStrings:
+    - '#NAME.OnSaveItem += OnSave#NAMEItem'
+    - '#NAME.OnGetNextItem += OnGetNext#NAMEItem'
+    - '#NAME.OnGetPreviousItem += OnGetPrevious#NAMEItem'
+    MethodNames:
+    - void OnSave#NAMEItem(int index, VirtualScrollRectItem item)
+    - VirtualScrollRectItem OnGetNext#NAMEItem(int index)
+    - VirtualScrollRectItem OnGetPrevious#NAMEItem(int index)
   LabelSets:
   - Name: CanvasLabel
     UtilityType: 1
@@ -87,33 +100,17 @@ MonoBehaviour:
     - Name: Title
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224977832684939848, guid: c32731d4b49fbd146ae54a3978501d8c,
+      CustomEvent: 0
+      Transform: {fileID: 224947028358140272, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 1
-    - Name: Content
+    - Name: Button123
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224190239401635906, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 1
-    - Name: Button
-      Force: 0
-      Ignore: 0
-      Transform: {fileID: 224039332265720712, guid: c32731d4b49fbd146ae54a3978501d8c,
+      CustomEvent: 0
+      Transform: {fileID: 224376657049105432, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 4
-    - Name: NewButton
-      Force: 0
-      Ignore: 0
-      Transform: {fileID: 224004470014524054, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 4
-    - Name: Panel
-      Force: 1
-      Ignore: 0
-      Transform: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 6
   - Name: LanguageLabel
     UtilityType: 0
     LabelScriptPath: 
@@ -139,33 +136,17 @@ MonoBehaviour:
     - Name: Title
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224977832684939848, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 1
-    - Name: Content
-      Force: 0
-      Ignore: 0
-      Transform: {fileID: 224190239401635906, guid: c32731d4b49fbd146ae54a3978501d8c,
+      CustomEvent: 0
+      Transform: {fileID: 224947028358140272, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 1
-    - Name: Button
+    - Name: Button123
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224039332265720712, guid: c32731d4b49fbd146ae54a3978501d8c,
+      CustomEvent: 0
+      Transform: {fileID: 224376657049105432, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 4
-    - Name: NewButton
-      Force: 0
-      Ignore: 0
-      Transform: {fileID: 224004470014524054, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 4
-    - Name: Panel
-      Force: 1
-      Ignore: 0
-      Transform: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 6
   - Name: "\u6D4B\u8BD5"
     UtilityType: 2
     LabelScriptPath: Assets
@@ -188,36 +169,20 @@ MonoBehaviour:
     Prefabs:
     - {fileID: 1338839275615992, guid: c32731d4b49fbd146ae54a3978501d8c, type: 2}
     FoldOut: 1
-    TotalHeight: 918
-    RegistTypes: 0100000004000000
+    TotalHeight: 756
+    RegistTypes: 010000000400000007000000
     RegistTargets:
     - Name: Title
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224977832684939848, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 1
-    - Name: Content
-      Force: 0
-      Ignore: 0
-      Transform: {fileID: 224190239401635906, guid: c32731d4b49fbd146ae54a3978501d8c,
+      CustomEvent: 0
+      Transform: {fileID: 224947028358140272, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 1
-    - Name: Button
-      Force: 0
-      Ignore: 0
-      Transform: {fileID: 224039332265720712, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 4
-    - Name: NewButton
+    - Name: Button123
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224004470014524054, guid: c32731d4b49fbd146ae54a3978501d8c,
+      CustomEvent: 0
+      Transform: {fileID: 224376657049105432, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 4
-    - Name: Panel
-      Force: 1
-      Ignore: 0
-      Transform: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
-        type: 2}
-      Type: 6

+ 0 - 16
第五期.txt

@@ -1,19 +1,3 @@
-LabelUtility
-{
-  全自动注册有Bug
-  刷新时的名字不对
-  更新标签时可以自动更新Component
-  Bool-是否要自动更新名字
-  Bool-是否要生成事件
-  将可以公用的字符串定义为全局静态变量
-  Text 自动添加多语言
-  虚列表 --
-  CanvasGroup 自动注册动画
-}
-
-ListExt
-
-
 22级有个空档
 
 搭配秀功能音效