liuqilin 7 anos atrás
pai
commit
05a11d0105

+ 163 - 52
Assets/Panel.prefab

@@ -28,6 +28,24 @@ 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
@@ -45,36 +63,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1654504510131344
+--- !u!1 &1528406634465908
 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}
+  - component: {fileID: 224039332265720712}
+  - component: {fileID: 222434975420286526}
+  - component: {fileID: 114936055368922624}
+  - component: {fileID: 114467161086344116}
   m_Layer: 5
-  m_Name: Content
+  m_Name: Button
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1685656166903684
+--- !u!1 &1654504510131344
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 224527758619848776}
-  - component: {fileID: 222326605321166382}
-  - component: {fileID: 114759974216822980}
-  - component: {fileID: 114506942635537576}
+  - component: {fileID: 224190239401635906}
+  - component: {fileID: 222235463764209680}
+  - component: {fileID: 114002878433859344}
   m_Layer: 5
-  m_Name: Button
+  m_Name: Content
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -113,45 +131,53 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: New Text
---- !u!114 &114448897707175658
+--- !u!114 &114060076327655078
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1068751886612132}
+  m_GameObject: {fileID: 1080608065445320}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 1392445389, 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_RaycastTarget: 1
-  m_OnCullStateChanged:
+  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: 114300240974044762}
+  m_OnClick:
     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 &114501709495217876
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
+--- !u!114 &114300240974044762
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1338839275615992}
+  m_GameObject: {fileID: 1080608065445320}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
@@ -165,20 +191,53 @@ MonoBehaviour:
       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_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 &114506942635537576
+--- !u!114 &114448897707175658
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1685656166903684}
+  m_GameObject: {fileID: 1068751886612132}
+  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: 0.19607843, g: 0.19607843, b: 0.19607843, 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 &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}
@@ -208,18 +267,45 @@ MonoBehaviour:
     m_PressedTrigger: Pressed
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 114759974216822980}
+  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 &114759974216822980
+--- !u!114 &114501709495217876
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1685656166903684}
+  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}
@@ -241,6 +327,12 @@ MonoBehaviour:
   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
@@ -253,42 +345,42 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1338839275615992}
---- !u!222 &222326605321166382
+--- !u!222 &222434975420286526
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1685656166903684}
+  m_GameObject: {fileID: 1528406634465908}
 --- !u!222 &222685148270028482
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1068751886612132}
---- !u!224 &224190239401635906
+--- !u!224 &224004470014524054
 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_GameObject: {fileID: 1080608065445320}
+  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_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 &224527758619848776
+--- !u!224 &224039332265720712
 RectTransform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1685656166903684}
+  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}
@@ -301,6 +393,24 @@ RectTransform:
   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_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 &224597384089362468
 RectTransform:
   m_ObjectHideFlags: 1
@@ -313,7 +423,8 @@ RectTransform:
   m_Children:
   - {fileID: 224977832684939848}
   - {fileID: 224190239401635906}
-  - {fileID: 224527758619848776}
+  - {fileID: 224039332265720712}
+  - {fileID: 224004470014524054}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 25 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+    iOS:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 101 - 105
Assets/Resource/Logo.unity

@@ -95,7 +95,7 @@ NavMeshSettings:
 RectTransform:
   m_PrefabParentObject: {fileID: 224597384089362468, guid: c32731d4b49fbd146ae54a3978501d8c,
     type: 2}
-  m_PrefabInternal: {fileID: 1311681672}
+  m_PrefabInternal: {fileID: 361251518}
 --- !u!1 &16072523
 GameObject:
   m_ObjectHideFlags: 0
@@ -189,6 +189,106 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1001 &361251518
+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 &465425181
 GameObject:
   m_ObjectHideFlags: 0
@@ -507,110 +607,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1311681672
-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}
-    - target: {fileID: 1338839275615992, guid: c32731d4b49fbd146ae54a3978501d8c, type: 2}
-      propertyPath: m_Name
-      value: Panel
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: c32731d4b49fbd146ae54a3978501d8c, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1334439472
 GameObject:
   m_ObjectHideFlags: 0

+ 11 - 0
Assets/Script/Extension/ExtList.cs

@@ -265,4 +265,15 @@ public static class ExtList
         }
         return false;
     }
+
+
+    public static int GetMatchAmount<T>(this List<T> list, Func<T, bool> func) //todo 
+    {
+        int matchAmount = 0;
+        for (int i = 0; i < list.Count; i++)
+        {
+            if (func.Invoke(list[i])) matchAmount++;
+        }
+        return matchAmount;
+    }
 }

+ 1 - 0
Assets/TestLabel.cs

@@ -11,6 +11,7 @@ public class TestLabel
 	public static string Title = "Title";
 	public static string Content = "Content";
 	public static string Button = "Button";
+	public static string NewButton = "NewButton";
 	//EndMark-Used by LabelUtility-Do not remove
 
 	#endregion

+ 1 - 1
Assets/TestLabel.cs.meta

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

+ 36 - 21
Assets/TestScript.cs

@@ -4,29 +4,44 @@ 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 Panel;
-	//EndMark-Used by LabelUtility-Do not remove
+    //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
 
-	#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>();
-		Panel = childDictionary[TestLabel.Panel].GetComponent<Button>();
-		//RegistEndMark-Used by LabelUtility-Do not remove
-	}
+    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>();
+        //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
+    }
 
-	//EventStartMark-Used by LabelUtility-Do not remove
-	//EventEndMark-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
 }

+ 1 - 1
Assets/TestScript.cs.meta

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

+ 4 - 2
Assets/Tookits/LabelUtility/Editor/LabelUtilityWindow.cs

@@ -66,8 +66,10 @@ namespace labelUtility
                 Instance.EventStrings = new List<ComponentEventString>();
                 ComponentEventString eventString = new ComponentEventString();
                 eventString.ComponentType = ComponentType.Button;
-                eventString.Strings = new List<string>();
-                eventString.Strings.Add("On#NEWNAMEClick");
+                eventString.RegistStrings = new List<string>();
+                eventString.RegistStrings.Add("#NEWNAME.onClick.AddListener(On#NEWNAMEClick)");
+                eventString.MethodNames = new List<string>();
+                eventString.MethodNames.Add("On#NEWNAMEClick");
                 Instance.EventStrings.Add(eventString);
             }
             EditorGUILayout.PropertyField(DllNames, new GUIContent("DllNames"), true);

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

@@ -31,7 +31,8 @@ namespace labelUtility
     public class ComponentEventString
     {
         public ComponentType ComponentType;
-        public List<string> Strings;
+        public List<string> RegistStrings;
+        public List<string> MethodNames;
     }
 
     [Serializable]
@@ -101,6 +102,8 @@ namespace labelUtility
         public static string RegistEndMark = "//RegistEndMark-Used by LabelUtility-Do not remove"; //todo 更新
         public static string EventStartMark = "//EventStartMark-Used by LabelUtility-Do not remove"; //todo 更新
         public static string EventEndMark = "//EventEndMark-Used by LabelUtility-Do not remove"; //todo 更新
+        public static string RegistEventStartMark = "//RegistEventStartMark-Used by LabelUtility-Do not remove"; //todo 更新
+        public static string RegistEventEndMark = "//RegistEventEndMark-Used by LabelUtility-Do not remove"; //todo 更新
         public static string Prefix = "public static string ";
 
         #endregion
@@ -182,6 +185,8 @@ namespace labelUtility
                 scriptContent += $"\t{labelSet.RegistMethodString}\r\n\t{{\r\n";
                 scriptContent += $"\t\t{RegistStartMark}\r\n";
                 scriptContent += $"\t\t{RegistEndMark}\r\n";
+                scriptContent += $"\t\t{RegistEventStartMark}\r\n";
+                scriptContent += $"\t\t{RegistEventEndMark}\r\n";
                 scriptContent += $"\t}}\r\n";
             }
 
@@ -341,7 +346,8 @@ namespace labelUtility
 
             List<string> defineStrings = new List<string>();
             List<string> registStrings = new List<string>();
-            List<string> eventStrings = new List<string>();
+            List<string> eventNames = new List<string>();
+            List<string> registEventStrings = new List<string>();
             registStrings.AddRange(labelSet.RegistExtraLines);
             foreach (var registTarget in labelSet.RegistTargets)
             {
@@ -358,17 +364,69 @@ namespace labelUtility
                 {
                     if (eventString.ComponentType == registTarget.Type)
                     {
-                        for (int i = 0; i < eventString.Strings.Count; i++)
+                        for (int i = 0; i < eventString.MethodNames.Count; i++)
                         {
-                            eventStrings.Add($"{labelSet.ComponentPrefix} {eventString.Strings[i].Replace("#NEWNAME", registTarget.Name)}");
-                            eventStrings.Add("{");
-                            eventStrings.Add("}");
+                            eventNames.Add($"{eventString.MethodNames[i].Replace("#NEWNAME", registTarget.Name)}");
                         }
+                        for (int i = 0; i < eventString.RegistStrings.Count; i++)
+                        {
+                            registEventStrings.Add($"{eventString.RegistStrings[i].Replace("#NEWNAME", registTarget.Name)};");
+                        }
+                    }
+                }
+            }
+
+            //foreach (var eventString in eventStrings)
+            //{
+            //    Debug.Log(eventString);
+            //}
+
+            int? startIndex = null;
+            int? endIndex = null;
+            List<string> oldEventMethods = GetScriptContentBetweenMarks(EventStartMark, EventEndMark, labelSet.ComponentScript, ref startIndex, ref endIndex);
+            List<string> newEventMethods = new List<string>();
+            int? tabAmount = GetMarkSpaceAmount(labelSet.ComponentScript, EventStartMark);
+            for (int i = 0; i < eventNames.Count; i++)
+            {
+                List<string> methodStrings = TryGetMethodStrings(eventNames[i], oldEventMethods);
+                if (methodStrings.Valid())
+                {
+                    for (int j = 0; j < methodStrings.Count; j++)
+                    {
+                        if (tabAmount == null)
+                        {
+                            newEventMethods.Add(methodStrings[j]);
+                        }
+                        else
+                        {
+                            //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));
+                        }
+                    }
+                    if (i < eventNames.Count - 1)
+                    {
+                        newEventMethods.Add("");
                     }
                 }
+                else
+                {
+                    newEventMethods.Add($"{labelSet.ComponentPrefix} void {eventNames[i]}()");
+                    newEventMethods.Add("{\r\n");
+                    newEventMethods.Add(i < eventNames.Count - 1 ? "}\r\n" : "}");
+                }
             }
+
             InsertLineToScript(StartMark, EndMark, labelSet.ComponentScript, defineStrings);
             InsertLineToScript(RegistStartMark, RegistEndMark, labelSet.ComponentScript, registStrings);
+            InsertLineToScript(RegistEventStartMark, RegistEventEndMark, labelSet.ComponentScript, registEventStrings);
+            InsertLineToScript(EventStartMark, EventEndMark, labelSet.ComponentScript, newEventMethods);
+
+            //foreach (var registEventString in registEventStrings)
+            //{
+            //    Debug.Log(registEventString);
+            //}
 
             //List <string> typeNames = new List<string>();
             //foreach (var purview in labelSet.RegistTypes)
@@ -424,6 +482,45 @@ namespace labelUtility
             //InsertLineToScript(RegistStartMark, RegistEndMark, labelSet.ComponentScript, registStrings);
         }
 
+        private static List<string> TryGetMethodStrings(string methodName, List<string> strings)
+        {
+            List<string> results = new List<string>();
+            for (int i = 0; i < strings.Count; i++)
+            {
+                if (!strings[i].Contains(methodName)) continue;
+                for (int j = i; j < strings.Count; j++)
+                {
+                    results.Add(strings[j]);
+                    if (strings[j].Trim() == "}")
+                    {
+                        return results;
+                    }
+                }
+            }
+            return results;
+        }
+
+        private static void InsertLineToScript(int startIndex, TextAsset textAsset, List<string> insertLines)
+        {
+            List<string> strings = GetScriptContents(textAsset);
+            int prefixIndex = strings[startIndex].IndexOf("//");
+            string prefix = strings[startIndex].Substring(0, prefixIndex);
+            for (int i = 0; i < insertLines.Count; i++)
+            {
+                strings.Insert(startIndex, prefix + insertLines[i]);
+                startIndex++;
+            }
+            StringBuilder stringBuilder = new StringBuilder();
+            for (int i = 0; i < strings.Count; i++)
+            {
+                stringBuilder.AppendLine(strings[i]);
+            }
+            string content = stringBuilder.ToString();
+            content = content.Substring(0, content.Length - 2);
+            File.WriteAllText(AssetDatabase.GetAssetPath(textAsset), content);
+            AssetDatabase.Refresh();
+        }
+
         private static void InsertLineToScript(string startMark, string endMark, TextAsset textAsset, List<string> insertLines)
         {
             int? startMarkLineIndex = null;
@@ -447,6 +544,85 @@ namespace labelUtility
             AssetDatabase.Refresh();
         }
 
+        private static int? GetMarkIndex(TextAsset textAsset, string mark)
+        {
+            List<string> strings = textAsset.text.Split(new[] { "\r\n" }, StringSplitOptions.None).ToList();
+            for (int i = 0; i < strings.Count; i++)
+            {
+                if (strings[i].Contains(mark))
+                {
+                    return i;
+                }
+            }
+            return null;
+        }
+
+        private static int? GetMarkSpaceAmount(TextAsset textAsset, string mark)
+        {
+            List<string> strings = textAsset.text.Split(new[] { "\r\n" }, StringSplitOptions.None).ToList();
+            for (int i = 0; i < strings.Count; i++)
+            {
+                if (strings[i].Contains(mark))
+                {
+                    if (Regex.Match(strings[i], "^\\s+").Success)
+                    {
+                        //Debug.Log(Regex.Match(strings[i], "^\\s+").Length);
+                        return Regex.Match(strings[i], "^\\s+").Length;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private static List<string> GetScriptContentBetweenMarks(string startMark, string endMark, TextAsset textAsset, ref int? startMarkLineIndex, ref int? endMarkLineIndex)
+        {
+            //Debug.Log(textAsset.text);
+            List<string> strings = textAsset.text.Split(new[] { "\r\n" }, StringSplitOptions.None).ToList();
+            for (int i = 0; i < strings.Count; i++)
+            {
+                if (strings[i].Contains(startMark))
+                {
+                    //Debug.Log(strings[i][0]);
+                    //Debug.LogWarning(strings[i][1]);
+                    //Debug.Log(strings[i][2]);
+                    //Debug.LogWarning(strings[i][3]);
+                    //Debug.Log(strings[i][4]);
+                    //Debug.LogWarning(strings[i][5]);
+
+                    startMarkLineIndex = i;
+                }
+                else if (strings[i].Contains(endMark))
+                {
+                    endMarkLineIndex = i;
+                }
+            }
+
+            List<string> results = new List<string>();
+            for (int i = startMarkLineIndex.Value + 1; i < endMarkLineIndex.Value; i++)
+            {
+                //if (strings[i].Length > 0)
+                //{
+                //    Debug.Log(strings[i][0]);
+                //}
+                //if (strings[i].Length > 1)
+                //{
+                //    Debug.LogWarning(strings[i][1]);
+                //}
+                results.Add(strings[i]);
+            }
+            return results;
+        }
+
+        private static List<string> GetScriptContents(TextAsset textAsset)
+        {
+            List<string> strings = textAsset.text.Split(new[] { "\r\n" }, StringSplitOptions.None).ToList();
+            return strings;
+        }
+
         private static List<string> GetScriptContentAfterClearMarks(string startMark, string endMark, TextAsset textAsset, ref int? startMarkLineIndex, ref int? endMarkLineIndex)
         {
             List<string> strings = textAsset.text.Split(new[] {"\r\n"}, StringSplitOptions.None).ToList();

+ 30 - 10
Assets/Tookits/LabelUtility/LabelUtility.prefab

@@ -57,7 +57,9 @@ MonoBehaviour:
   - System.Collections.Generic
   EventStrings:
   - ComponentType: 4
-    Strings:
+    RegistStrings:
+    - '#NEWNAME.onClick.AddListener(On#NEWNAMEClick)'
+    MethodNames:
     - On#NEWNAMEClick
   LabelSets:
   - Name: CanvasLabel
@@ -97,15 +99,21 @@ MonoBehaviour:
     - Name: Button
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224527758619848776, guid: c32731d4b49fbd146ae54a3978501d8c,
+      Transform: {fileID: 224039332265720712, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 4
-    - Name: Button
+    - 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: 4
+      Type: 6
   - Name: LanguageLabel
     UtilityType: 0
     LabelScriptPath: 
@@ -143,15 +151,21 @@ MonoBehaviour:
     - Name: Button
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224527758619848776, guid: c32731d4b49fbd146ae54a3978501d8c,
+      Transform: {fileID: 224039332265720712, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 4
-    - Name: Button
+    - 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: 4
+      Type: 6
   - Name: "\u6D4B\u8BD5"
     UtilityType: 2
     LabelScriptPath: Assets
@@ -192,12 +206,18 @@ MonoBehaviour:
     - Name: Button
       Force: 0
       Ignore: 0
-      Transform: {fileID: 224527758619848776, guid: c32731d4b49fbd146ae54a3978501d8c,
+      Transform: {fileID: 224039332265720712, guid: c32731d4b49fbd146ae54a3978501d8c,
         type: 2}
       Type: 4
-    - Name: Button
+    - 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: 4
+      Type: 6

+ 16 - 8
第五期.txt

@@ -1,17 +1,25 @@
+LabelUtility
+{
+  全自动注册有Bug
+  刷新时的名字不对
+  更新标签时可以自动更新Component
+  Bool-是否要自动更新名字
+  Bool-是否要生成事件
+  将可以公用的字符串定义为全局静态变量
+  Text 自动添加多语言
+  虚列表 --
+  CanvasGroup 自动注册动画
+}
+
+ListExt
+
+
 22级有个空档
 
 搭配秀功能音效
 
 搭配秀主页Drawcall
 
-LabelUtility
-{
-  将可以公用的字符串定义为全局静态变量
-  如果有Button 自动注册addlistener 自动添加OnClick方法
-        Text 自动添加多语言
-        虚列表 --
-}
-
 ExcelUtility
 {
   导出完成后的回调(导出了语言文档自动更新语言标签)