DESKTOP-FB72PO8\Administrator 3 mesi fa
parent
commit
7e0a27edae

+ 189 - 284
Assets/Res/UI/MainUIPanel.prefab

@@ -477,7 +477,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1276612167795138221}
   - component: {fileID: 1064142111384354065}
-  - component: {fileID: 1262253723378278969}
+  - component: {fileID: 2081743111715011353}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon
@@ -513,7 +513,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 501653731502256918}
   m_CullTransparentMesh: 1
---- !u!114 &1262253723378278969
+--- !u!114 &2081743111715011353
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -522,18 +522,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 501653731502256918}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 2bb159c80d5218f4e8d527118e0f6fac, type: 2}
-  m_Color: {r: 0.449, g: 0.449, b: 0.449, a: 1}
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 06c0bf4af0e024992868e7cebcbe248c, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -543,6 +543,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_SkillIcon02_2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7f6af24b7e68d556cab4cc7ac439f1bb
 --- !u!1 &709490475292508899
 GameObject:
   m_ObjectHideFlags: 0
@@ -920,82 +928,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &1019618551045907487
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5490862801310319621}
-  - component: {fileID: 239914879977752742}
-  - component: {fileID: 4230680898015263907}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Bg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5490862801310319621
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1019618551045907487}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3778428922014953483}
-  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: 1.1}
-  m_SizeDelta: {x: 28, y: 28}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &239914879977752742
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1019618551045907487}
-  m_CullTransparentMesh: 1
---- !u!114 &4230680898015263907
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1019618551045907487}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.14117648, b: 0.24313726, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9209a152c6b45453e9b98b6a1f1f2084, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1052171248389197007
 GameObject:
   m_ObjectHideFlags: 0
@@ -2164,82 +2096,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3433613182256208288
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5944412108433976429}
-  - component: {fileID: 4838901169462861028}
-  - component: {fileID: 8722945087495955615}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Border
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5944412108433976429
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3433613182256208288}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3778428922014953483}
-  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: -1}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4838901169462861028
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3433613182256208288}
-  m_CullTransparentMesh: 1
---- !u!114 &8722945087495955615
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3433613182256208288}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.3254902, g: 0.02745098, b: 0.05882353, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 3c2b27810bdcf4cbf8de6d49424cba9f, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3448175583277746731
 GameObject:
   m_ObjectHideFlags: 0
@@ -2716,82 +2572,6 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!1 &3856578035867639268
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7919522989949582024}
-  - component: {fileID: 3597234037776745320}
-  - component: {fileID: 3491799872198757383}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7919522989949582024
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3856578035867639268}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3778428922014953483}
-  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: 1.6000004}
-  m_SizeDelta: {x: -8, y: -12}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &3597234037776745320
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3856578035867639268}
-  m_CullTransparentMesh: 1
---- !u!114 &3491799872198757383
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3856578035867639268}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.27450982}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e82c58601456d426fa3a71b1daa4a4e1, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4221615929694277604
 GameObject:
   m_ObjectHideFlags: 0
@@ -2839,10 +2619,12 @@ GameObject:
   m_Component:
   - component: {fileID: 2795529932863041108}
   - component: {fileID: 1659965290666304219}
-  - component: {fileID: 7649691318132559334}
+  - component: {fileID: 6161436498757124723}
+  - component: {fileID: 5767449178776792409}
+  - component: {fileID: 2050821885642496250}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Button_Menu
+  m_Name: Button_huiQiu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2861,13 +2643,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1276612167795138221}
-  - {fileID: 3778428922014953483}
   m_Father: {fileID: 5407905478464383173}
   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: 317, y: -1.999961}
-  m_SizeDelta: {x: 100, y: 120}
+  m_AnchoredPosition: {x: 311.1, y: -1.9}
+  m_SizeDelta: {x: 105.8279, y: 108.6129}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1659965290666304219
 CanvasRenderer:
@@ -2877,7 +2658,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4307235955464270579}
   m_CullTransparentMesh: 1
---- !u!114 &7649691318132559334
+--- !u!114 &6161436498757124723
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2886,19 +2667,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 4307235955464270579}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 2bb159c80d5218f4e8d527118e0f6fac, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.83921576, g: 0.49411768, b: 0.011764707, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 13bb59864f8ee4bd0948e2f4bebb30dd, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 0}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2907,6 +2688,151 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_circle78
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7f6af24b7e68d556cab4cc7ac439f1bb
+--- !u!114 &5767449178776792409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4307235955464270579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6161436498757124723}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2050821885642496250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4307235955464270579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0
+  isUpdate: 0
+  currTime: 0.102648
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 0
+    animName: show
+    isLoop: 0
+    allTargets:
+    - {fileID: 2795529932863041108}
+    - {fileID: 6161436498757124723}
+    TweenAssetInfo: {fileID: 11400000, guid: c601b942c3b643a4c9104d72db955107, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.1
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
 --- !u!1 &4364612932903510120
 GameObject:
   m_ObjectHideFlags: 0
@@ -4613,6 +4539,24 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: Button_huiQiu
+    gameObject: {fileID: 5767449178776792409}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: Button_huiQiu_tween
+    gameObject: {fileID: 2050821885642496250}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -5503,45 +5447,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
---- !u!1 &8372884530707672124
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3778428922014953483}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Alert_Dot_Red
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &3778428922014953483
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8372884530707672124}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5490862801310319621}
-  - {fileID: 7919522989949582024}
-  - {fileID: 5944412108433976429}
-  m_Father: {fileID: 2795529932863041108}
-  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: 41, y: 52}
-  m_SizeDelta: {x: 36, y: 39}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8538615754044359424
 GameObject:
   m_ObjectHideFlags: 0

+ 413 - 0
Assets/Res/UI/TipMessagePanel.prefab

@@ -0,0 +1,413 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &880950410469998858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8939363238171972854}
+  - component: {fileID: 6560399385940932289}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: TipMessagePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8939363238171972854
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 880950410469998858}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6862210015852255166}
+  - {fileID: 6582327781870859720}
+  m_Father: {fileID: 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}
+  m_AnchoredPosition: {x: 567, y: -1968}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6560399385940932289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 880950410469998858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: message
+    gameObject: {fileID: 7516980564574023955}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: dotPoint
+    gameObject: {fileID: 6582327781870859720}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg_icon
+    gameObject: {fileID: 5686848559985893439}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: button_bg
+    gameObject: {fileID: 6345401385885902200}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2463588081883955419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6908189256873560321}
+  - component: {fileID: 607144206561970494}
+  - component: {fileID: 5686848559985893439}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6908189256873560321
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2463588081883955419}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6582327781870859720}
+  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: 378, y: 144.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &607144206561970494
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2463588081883955419}
+  m_CullTransparentMesh: 1
+--- !u!114 &5686848559985893439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2463588081883955419}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_Round09
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 7f6af24b7e68d556cab4cc7ac439f1bb
+--- !u!1 &3191415273797276819
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6862210015852255166}
+  - component: {fileID: 2075337791508516479}
+  - component: {fileID: 5714459790568314135}
+  - component: {fileID: 6345401385885902200}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: button_bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6862210015852255166
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191415273797276819}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8939363238171972854}
+  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!222 &2075337791508516479
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191415273797276819}
+  m_CullTransparentMesh: 1
+--- !u!114 &5714459790568314135
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191415273797276819}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.050980393}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  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
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6345401385885902200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3191415273797276819}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5714459790568314135}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5357924637379588896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6582327781870859720}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: dotPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6582327781870859720
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5357924637379588896}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6908189256873560321}
+  - {fileID: 93381855969869059}
+  m_Father: {fileID: 8939363238171972854}
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8464601678468247561
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 93381855969869059}
+  - component: {fileID: 1634987077912709362}
+  - component: {fileID: 7516980564574023955}
+  - component: {fileID: 4427224063004206928}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: message
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &93381855969869059
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8464601678468247561}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6582327781870859720}
+  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: -1.1, y: 3.3}
+  m_SizeDelta: {x: 342.3, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1634987077912709362
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8464601678468247561}
+  m_CullTransparentMesh: 1
+--- !u!114 &7516980564574023955
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8464601678468247561}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u4E2A\u63CF\u8FF0\u8FD9\u662F"
+--- !u!114 &4427224063004206928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8464601678468247561}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2

+ 7 - 0
Assets/Res/UI/TipMessagePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DitK5iv7AC9NczJs0wLiXBWvQKlvGK6hp9wJEmDbxF8TtJLf4xkbDEE=
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 192 - 0
Assets/Res/UIAnimRes/TweenAssetInfoButton_huiQiu.asset

@@ -0,0 +1,192 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoButton_huiQiu
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 0.1
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 0.1
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 2
+        TweenLerpType: 1
+        Start: {x: 0, y: 0, z: 0}
+        End: {x: 0, y: 0, z: 0}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0.6050419
+            outSlope: 0.6050419
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.49583334
+            value: 1.3
+            inSlope: 0.005000353
+            outSlope: 0.005000353
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -0.5950412
+            outSlope: -0.5950412
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0.5999999
+            outSlope: 0.5999999
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.5
+            value: 1.3
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: -0.5999999
+            outSlope: -0.5999999
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0.1
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0.1
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+  - Foldout: 1
+    TweenType: 2
+    duration: 0.1
+    delay: 0
+    TweenBasic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos: []
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 1
+      duration: 0.1
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0.83921576, g: 0.49411768, b: 0.011764707, a: 1}
+      endColor: {r: 1, g: 1, b: 1, a: 1}
+      startX:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 0
+          inSlope: 2
+          outSlope: 2
+          tangentMode: 34
+          weightedMode: 0
+          inWeight: 0
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 0.5
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 34
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 0
+          inSlope: -2
+          outSlope: -2
+          tangentMode: 34
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4

+ 8 - 0
Assets/Res/UIAnimRes/TweenAssetInfoButton_huiQiu.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XHwftHikV3k7wE+Za57iC5NDCJVS01GsLSM0Wu5NpTucWLH4fHHFlYE=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 290 - 277
Assets/Scenes/UIBuild.scene


+ 2 - 1
Assets/Scripts/Core/Editor/Tween/UITweenControllerInspector.cs

@@ -119,8 +119,9 @@ public class UITweenControllerInspector : Editor
             GUI.color = new Color(0.24f, 0.03f, 0.06f);
         }
 
-        _tweenAssetGrpupInfo.animName = EditorGUILayout.TextField("片段名", _tweenAssetGrpupInfo.animName);
+     
         EditorGUILayout.EndHorizontal();
+        _tweenAssetGrpupInfo.animName = EditorGUILayout.TextField("片段名", _tweenAssetGrpupInfo.animName);
         if (_tweenAssetGrpupInfo.TweenAssetInfo == null)
         {
             return;

+ 4 - 0
Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -67,5 +67,9 @@ namespace Fort23.Core
       /// 改变战斗英雄
       /// </summary>
       AlterCombatHero,
+      /// <summary>
+      /// 玩家使用技能
+      /// </summary>
+      PlayerUseSkill,
     }
 }

+ 44 - 3
Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs

@@ -31,17 +31,60 @@ namespace Core.UI.UTool.UITween
             }
         }
 
-        public void Play(string animName)
+        public void Play(string animName,bool isChildren)
         {
+            _uiTweenControllers.Clear();
+            maxDuration = 0;
             _currPlay.Clear();
+            isLoop = false;
             for (int i = 0; i < GrpupInfos.Count; i++)
             {
                 TweenAssetGrpupInfo tweenAssetGrpupInfo = GrpupInfos[i];
+                tweenAssetGrpupInfo.SetMaxTime();
                 if (tweenAssetGrpupInfo.animName.Equals(animName))
                 {
+                    if (tweenAssetGrpupInfo.maxDuration > maxDuration)
+                    {
+                        maxDuration = tweenAssetGrpupInfo.maxDuration;
+                    }
+
+                    if (tweenAssetGrpupInfo.isLoop)
+                    {
+                        isLoop = true;
+                    }
+
+                    tweenAssetGrpupInfo.StartPlay();
                     _currPlay.Add(tweenAssetGrpupInfo);
+                    
+                    
+                }
+            }
+
+            if (isChildren)
+            {
+                UITweenController[] uiTweenControllers =
+                    gameObject.transform.GetComponentsInChildren<UITweenController>();
+                _uiTweenControllers.AddRange(uiTweenControllers);
+                _uiTweenControllers.Remove(this);
+                for (int i = 0; i < _uiTweenControllers.Count; i++)
+                {
+                    UITweenController uiTweenController = _uiTweenControllers[i];
+                    // if(uiTweenController.)
+                    uiTweenController.StartPlay(false);
+                    if (uiTweenController.maxDuration > maxDuration)
+                    {
+                        maxDuration = uiTweenController.maxDuration;
+                    }
+
+                    if (uiTweenController.isLoop)
+                    {
+                        isLoop = true;
+                    }
                 }
             }
+
+            isUpdate = true;
+            currTime = 0;
         }
 
         public void Stop()
@@ -53,8 +96,6 @@ namespace Core.UI.UTool.UITween
         public void StartPlay(bool isChildren)
         {
             _uiTweenControllers.Clear();
-
-
             maxDuration = 0;
             _currPlay.Clear();
             isLoop = false;

+ 22 - 6
Assets/Scripts/GameLogic/Combat/Hero/PlayerHeroEntity.cs

@@ -1,14 +1,17 @@
 using System;
+using System.Collections.Generic;
 using Animancer;
 using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Skill;
 using UnityEngine;
 using UnityEngine.AI;
+using UnityEngine.EventSystems;
 
 namespace GameLogic.Combat.Hero
 {
@@ -19,7 +22,7 @@ namespace GameLogic.Combat.Hero
 
         private Vector3 lasetHeroPos;
         private float lasetTime;
-
+        List<RaycastResult> results = new List<RaycastResult>();
         public override async CTask<CombatHeroEntity> Init(CombatAIBasic combatAIBasic, CombatHeroInfo combatHeroInfo,
             Vector3 pos, Action<CombatHeroEntity> callBack = null)
         {
@@ -65,7 +68,7 @@ namespace GameLogic.Combat.Hero
                 return;
             }
 
-            if (Input.GetMouseButtonUp(0))
+            if (Input.GetMouseButtonDown(0))
             {
                 float currTime= Time.time;
                 if (currTime - lasetTime < 0.1f)
@@ -73,6 +76,22 @@ namespace GameLogic.Combat.Hero
                     return;
                 }
 
+                PointerEventData pointerEventData = new PointerEventData(UIManager.Instance.current);
+                pointerEventData.position = Input.mousePosition;
+
+              
+                
+
+                
+                UIManager.Instance.current.RaycastAll(pointerEventData, results);
+
+                
+                if (results.Count > 0)
+                {
+                    return;
+                }
+               
+                lasetTime= currTime;
                 S900001 skillBasic = (S900001) CombatHeroSkillControl.GetSkillBasic(900001);
                 BetterList<CombatHeroEntity> allHero =
                     CombatController.currActiveCombat.CombatHeroController.GetHeroList(true);
@@ -94,14 +113,11 @@ namespace GameLogic.Combat.Hero
                 {
                     lasetHeroPos = combatHeroEntity.dotPos;
                 }
-
-
                 endPos = lasetHeroPos + new Vector3(CombatCalculateTool.Instance.GetOdd(-3, 3), 0,
                     CombatCalculateTool.Instance.GetOdd(-3, 3));
-
-
                 startPos = endPos + new Vector3(5, 15, 5);
                 skillBasic.UseSkill();
+                EventManager.Instance.Dispatch(CustomEventType.PlayerUseSkill,null);
                 // CombatHeroSkillControl.AddCommandSkill(skillBasic);
             }
         }

+ 16 - 1
Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -38,8 +38,13 @@ namespace Fort23.Mono
             EventManager.Instance.AddEventListener(CustomEventType.StartBossBattle, StartBossBattle);
             EventManager.Instance.AddEventListener(CustomEventType.ShowDialogue, ShowDialogue);
             EventManager.Instance.AddEventListener(CustomEventType.AlterCombatHero, AlterCombatHero);
+            EventManager.Instance.AddEventListener(CustomEventType.PlayerUseSkill, PlayerUseSkill);
         }
 
+        private void PlayerUseSkill(IEventData iEventData)
+        {
+            Button_huiQiu_tween.Play("show", false);
+        }
 
         private void StartBossBattle(IEventData iEventData)
         {
@@ -54,7 +59,7 @@ namespace Fort23.Mono
             string[] icon = dialogueData.icon;
             System.Action finis = dialogueData.finish;
             ShowDialogueEventData.MessageShowType messageShowTyp = dialogueData.messageShowType;
-            DialoguePanel.OpenDialoguePanel(dialogueMessaga, icon,messageShowTyp, finis);
+            DialoguePanel.OpenDialoguePanel(dialogueMessaga, icon, messageShowTyp, finis);
         }
 
         private void ShowBattleExp(IEventData iEventData)
@@ -92,6 +97,7 @@ namespace Fort23.Mono
             btnHeroBag.onClick.AddListener(OnClickHeroBag);
             Button_battleBoss.onClick.AddListener(OnClickButtonBattleBoss);
             box.onClick.AddListener(OnOpenBox);
+            Button_huiQiu.onClick.AddListener(OnClickPlayerSkill);
         }
 
         private void OnOpenBox()
@@ -110,12 +116,21 @@ namespace Fort23.Mono
             }
         }
 
+        private async void OnClickPlayerSkill()
+        {
+            Debug.Log("显示描述");
+            RectTransform huoQiu = Button_huiQiu.GetComponent<RectTransform>();
+            TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石,对怪物造成1点伤害,并有70%概率获得1枚金币(boss怪必定掉落,金币数量+2)",
+                new Vector2(huoQiu.position.x, huoQiu.position.y + 0.5f));
+        }
+
         private async void OnClickHeroBag()
         {
             HeroBagPanel heroBagPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBagPanel>(null, isFullUI: true);
             heroBagPanel.InitPanel();
         }
 
+
         private void AlterCombatHero(IEventData e)
         {
             InitHeroWidget();

+ 23 - 1
Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -3,6 +3,7 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Core.UI.UTool.UITween;
 using TMPro;
 
 namespace Fort23.Mono
@@ -132,7 +133,6 @@ namespace Fort23.Mono
 	     }
 	   }
 	  private TextMeshProUGUI _txtCoin;
-	  
 	  public TextMeshProUGUI txtCoin
 	   {
 	   get{
@@ -242,6 +242,28 @@ namespace Fort23.Mono
 	      return _box;
 	     }
 	   }
+	  private Button _Button_huiQiu;
+	  public Button Button_huiQiu
+	   {
+	   get{
+	      if (_Button_huiQiu == null)
+	       {
+	         _Button_huiQiu  = GetUIUnit<Button>("Button_huiQiu"); 
+	       }
+	      return _Button_huiQiu;
+	     }
+	   }
+	  private UITweenController _Button_huiQiu_tween;
+	  public UITweenController Button_huiQiu_tween
+	   {
+	   get{
+	      if (_Button_huiQiu_tween == null)
+	       {
+	         _Button_huiQiu_tween  = GetUIUnit<UITweenController>("Button_huiQiu_tween"); 
+	       }
+	      return _Button_huiQiu_tween;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 8 - 0
Assets/Scripts/GameUI/UI/TipMessage.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XSsWvSuuU3tZos5fgU9o6G8aH2Bgg5wf7fCL4wD45DG6niXE5+ncivs=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 90 - 0
Assets/Scripts/GameUI/UI/TipMessage/TipMessagePanel.cs

@@ -0,0 +1,90 @@
+using Fort23.Core;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "TipMessagePanel")]
+    public partial class TipMessagePanel : UIPanel
+    {
+        public static async void OpenTipMessagePanel(string meg, Vector2 worldPos)
+        {
+            TipMessagePanel tipMessagePanel =
+                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top);
+            tipMessagePanel.SetTipMessage(meg, worldPos);
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            button_bg.onClick.AddListener(OnClickButton_bg);
+        }
+
+        private void OnClickButton_bg()
+        {
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        public void SetTipMessage(string msg, Vector2 pos)
+        {
+            pos = this.transform.worldToLocalMatrix * pos;
+            if (pos.x > 186)
+            {
+                pos.x = 186;
+            }
+
+            if (pos.x < -186)
+            {
+                pos.x = -186;
+            }
+
+            message.text = msg;
+            RectTransform rectTransform = message.GetComponent<RectTransform>();
+            message.SetLayoutDirty();
+            LayoutRebuilder.MarkLayoutForRebuild(rectTransform);
+            LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
+            rectTransform.GetComponent<ContentSizeFitter>().SetLayoutVertical();
+            RectTransform bgTran = bg_icon.GetComponent<RectTransform>();
+            // await TimerComponent.Instance.WaitAsync(30);
+
+            // float y=  LayoutUtility.GetPreferredSize(massge.GetComponent<RectTransform>(), 0)+40;
+            // massge.
+            // massge.OnRebuildRequested();
+            float y = rectTransform.sizeDelta.y + 40;
+            if (y < 100)
+            {
+                y = 100;
+            }
+
+            bgTran.sizeDelta = new Vector2(bgTran.sizeDelta.x, y);
+
+            float maxY = this.transform.sizeDelta.y / 2;
+            float my2 = y / 2;
+           
+            if (pos.y > maxY - my2)
+            {
+                pos.y = maxY - my2;
+            }
+
+            if (pos.y < my2 - maxY)
+            {
+                pos.y = my2 - maxY;
+            }
+
+            dotPoint.anchoredPosition = pos;
+            LayoutRebuilder.MarkLayoutForRebuild(bgTran);
+            LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/TipMessage/TipMessagePanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: C3sb5CiqBi3cCteasg3LDt3RlD8SQUiw8splQsDPwscsvRJo/SeYLY4=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 62 - 0
Assets/Scripts/GameUI/UI/TipMessage/TipMessagePanelData.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class TipMessagePanel 
+	{
+	  #region 自定义数据 
+	  private Text _message;
+	  public Text message
+	   {
+	   get{
+	      if (_message == null)
+	       {
+	         _message  = GetUIUnit<Text>("message"); 
+	       }
+	      return _message;
+	     }
+	   }
+	  private RectTransform _dotPoint;
+	  public RectTransform dotPoint
+	   {
+	   get{
+	      if (_dotPoint == null)
+	       {
+	         _dotPoint  = GetUIUnit<RectTransform>("dotPoint"); 
+	       }
+	      return _dotPoint;
+	     }
+	   }
+	  private MyImage _bg_icon;
+	  public MyImage bg_icon
+	   {
+	   get{
+	      if (_bg_icon == null)
+	       {
+	         _bg_icon  = GetUIUnit<MyImage>("bg_icon"); 
+	       }
+	      return _bg_icon;
+	     }
+	   }
+	  private Button _button_bg;
+	  public Button button_bg
+	   {
+	   get{
+	      if (_button_bg == null)
+	       {
+	         _button_bg  = GetUIUnit<Button>("button_bg"); 
+	       }
+	      return _button_bg;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/TipMessage/TipMessagePanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WylLsyn/AC/yH2fUwXbWnqo0nROr7CFJKUXFU8+Gx3rSqQRElbjtd5E=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 12 - 12
UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 0009555e5400515f590b097412770f1140161d2b7d2977642e2b4a63b1e5636d
+      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0509560200060a0c5908552040750b44444f1a7a2a7827327c2a1e63b3b4603c
+      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 020600005157590b5e595b7313215b44424e4b7f7b2b70337479486be6b46d39
+      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
+      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
+      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 0052555e0156080d0b0c097b4726594443154b287c7f76617b2b1830e1b5613b
+      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
@@ -57,10 +57,10 @@ EditorUserSettings:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd81908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9195908797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

+ 160 - 109
UserSettings/Layouts/default-2022.dwlt

@@ -19,12 +19,64 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 2}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
 --- !u!114 &2
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 333
+    width: 503
+    height: 966
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 22}
+  m_Panes:
+  - {fileID: 22}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 13}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 1617
+    y: 0
+    width: 503
+    height: 1299
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 41568
+  draggingID: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,9 +89,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
   - {fileID: 5}
-  - {fileID: 4}
+  - {fileID: 7}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -52,7 +104,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -74,7 +126,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -95,7 +147,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -108,11 +160,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 9}
-  - {fileID: 10}
+  - {fileID: 8}
   - {fileID: 11}
   - {fileID: 12}
+  - {fileID: 3}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -124,7 +176,7 @@ MonoBehaviour:
   vertical: 0
   controlID: 165
   draggingID: 0
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -137,8 +189,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 8}
+  - {fileID: 9}
+  - {fileID: 10}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -148,9 +200,9 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 39
+  controlID: 23
   draggingID: 0
---- !u!114 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -169,16 +221,16 @@ MonoBehaviour:
     y: 0
     width: 940
     height: 504
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 14}
-  - {fileID: 15}
   - {fileID: 16}
+  - {fileID: 17}
+  - {fileID: 18}
   m_Selected: 2
   m_LastSelected: 1
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -199,12 +251,12 @@ MonoBehaviour:
     height: 795
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -225,12 +277,12 @@ MonoBehaviour:
     height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -247,16 +299,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1168
     y: 0
-    width: 100
+    width: 449
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -271,19 +323,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1268
+    x: 0
     y: 0
-    width: 809
-    height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+    width: 503
+    height: 333
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 20}
+  - {fileID: 15}
   m_Selected: 0
-  m_LastSelected: 1
---- !u!114 &12
+  m_LastSelected: 0
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -298,18 +349,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2077
+    x: 2120
     y: 0
-    width: 483
+    width: 440
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 21}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -329,10 +380,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -30732
-    y: -31970
-    width: 807
-    height: 1278
+    x: 1617
+    y: 73
+    width: 501
+    height: 312
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -633,7 +684,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -216, y: -172}
+      snapOffset: {x: -216, y: -177}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: AINavigationOverlay
@@ -699,14 +750,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -11.956981, y: 7.8110433, z: 0.045213882}
+    m_Target: {x: 2.2977035, y: -0.27745375, z: -0.023702398}
     speed: 2
-    m_Value: {x: -11.956981, y: 7.8110433, z: 0.045213882}
+    m_Value: {x: 942.5925, y: -1153.5254, z: -0.09096816}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -752,17 +803,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.02130805, y: 0.00778119, z: -0.00015690028, w: -0.99975634}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: -0.02130776, y: 0.007781084, z: -0.00015689814, w: -0.99974275}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.7411823
+    m_Target: 2.6514373
     speed: 2
-    m_Value: 1.7411823
+    m_Value: 211.24904
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -778,14 +829,14 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.02130805, y: 0.00778119, z: -0.00015690028, w: -0.99975634}
+  m_LastSceneViewRotation: {x: -0.08834205, y: 0.20057847, z: -0.018156419, w: -0.9755325}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &14
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -923,7 +974,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &15
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1053,7 +1104,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &16
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1096,7 +1147,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &17
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1130,7 +1181,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &18
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1169,23 +1220,23 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 94cefbff98cefbff28cffbffd8cffbffb647fcffc447fcff02eeffff22efffff28efffff48efffff4cefffff56efffff84faffff
+      m_ExpandedIDs: f077f5ff0078f5ffa6a5f5ffb8a5f5ffc4caf5ffd4caf5ffbcfaf5ffcefaf5ff6012f6ff7012f6ff5650f6ff5c50f6ff7850f6ff7c50f6ff8a50f6ff686af6ff786af6ff3e97f6ff5097f6ff529af6ff92dffbff02ebfbff6220fcff1021fcff642afcff662afcff722afcffd635fcff16dcfdff469ffeffea9ffeff12a1feff32a1feff40a1feff74faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: fx_shouDong
-        m_OriginalName: fx_shouDong
+        m_Name: TipMessagePanel
+        m_OriginalName: TipMessagePanel
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -1406
+        m_UserData: 118116
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 9}
+        m_ClientGUIView: {fileID: 11}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1193,7 +1244,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 9cd1477dbcc46d642bdb31d35b82cd83
---- !u!114 &19
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1215,7 +1266,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1168
     y: 73
-    width: 98
+    width: 447
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1238,7 +1289,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/Aduio
+    - Assets/Res/UIAtlas
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1246,16 +1297,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/Aduio
+  - Assets/Res/UIAtlas
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 838}
-    m_SelectedIDs: 9ea90000
-    m_LastClickedID: 43422
-    m_ExpandedIDs: 0000000026a9000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a900004aa900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a9000084a9000086a9000088a900008aa900008ca900008ea9000090a9000092a9000094a9000096a9000098a900009aa900009ca900009ea90000a0a90000a2a90000a4a90000a6a90000a8a90000aaa90000aca90000aea90000b0a9000058ac000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 1174}
+    m_SelectedIDs: b4ad0000
+    m_LastClickedID: 44468
+    m_ExpandedIDs: 0000000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a9000084a9000086a9000088a900008aa900008ca900008ea9000090a9000092a9000094a9000096a9000098a900009aa900009ca900009ea90000a0a90000a2a90000a4a90000a6a90000a8a90000aaa90000aca90000aea90000b0a90000b2a900005aac000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1271,7 +1322,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 10}
+      m_ClientGUIView: {fileID: 12}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1283,7 +1334,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000026a9000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a9000084a9000086a9000088a900008aa900008ca900008ea9000090a9000092a9000094a9000096a9000098a900009aa900009ca900009ea90000a0a90000a2a90000a4a90000a6a90000a8a90000aaa90000aca90000aea90000b0a90000
+    m_ExpandedIDs: 0000000028a900002aa900002ca900002ea9000030a9000032a9000034a9000036a9000038a900003aa900003ca900003ea9000040a9000042a9000044a9000046a9000048a900004aa900004ca900004ea9000050a9000052a9000054a9000056a9000058a900005aa900005ca900005ea9000060a9000062a9000064a9000066a9000068a900006aa900006ca900006ea9000070a9000072a9000074a9000076a9000078a900007aa900007ca900007ea9000080a9000082a9000084a9000086a9000088a900008aa900008ca900008ea9000090a9000092a9000094a9000096a9000098a900009aa900009ca900009ea90000a0a90000a2a90000a4a90000a6a90000a8a90000aaa90000aca90000aea90000b0a90000b2a90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1310,24 +1361,24 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010054a300002435010070d000000c9e00006e180100561b0100fc1a01006ca200008ea00000000000005aa7000010bc000068a70000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: TipMessagePanel
+      m_OriginalName: TipMessagePanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 113618
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 10}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1338,8 +1389,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 50
---- !u!114 &20
+  m_DirectoriesAreaWidth: 195
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1359,10 +1410,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1268
-    y: 73
-    width: 807
-    height: 1278
+    x: 1617
+    y: 406
+    width: 501
+    height: 945
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1406,7 +1457,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -1415,29 +1466,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 807
-      height: 1257
-    m_Scale: {x: 0.7740148, y: 0.7740148}
-    m_Translation: {x: 403.5, y: 628.5}
+      width: 501
+      height: 924
+    m_Scale: {x: 0.5689655, y: 0.5689655}
+    m_Translation: {x: 250.5, y: 462.00003}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -521.30786
-      y: -812
-      width: 1042.6157
-      height: 1624
+      x: -440.27274
+      y: -812.00006
+      width: 880.5455
+      height: 1624.0001
     m_MinimalGUI: 1
-  m_defaultScale: 0.7740148
-  m_LastWindowPixelSize: {x: 807, y: 1278}
+  m_defaultScale: 0.5689655
+  m_LastWindowPixelSize: {x: 501, y: 945}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &21
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1457,9 +1508,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2077
+    x: 2120
     y: 73
-    width: 482
+    width: 439
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0

Some files were not shown because too many files changed in this diff