李桃 4 months ago
parent
commit
717994a249

File diff suppressed because it is too large
+ 373 - 367
Assets/Art/test01.scene


+ 93 - 8
Assets/Res/UI/EqRecyclePanel.prefab

@@ -26,7 +26,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 580841226029350977}
   m_GameObject: {fileID: 580841226029350977}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 4}
   m_AnchoredPosition: {x: 0, y: 4}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1521278904985518640
 --- !u!222 &1521278904985518640
 CanvasRenderer:
 CanvasRenderer:
@@ -1099,13 +1099,13 @@ MonoBehaviour:
   m_Padding:
   m_Padding:
     m_Left: 0
     m_Left: 0
     m_Right: 0
     m_Right: 0
-    m_Top: 20
+    m_Top: 32
     m_Bottom: 25
     m_Bottom: 25
   m_ChildAlignment: 0
   m_ChildAlignment: 0
   m_StartCorner: 0
   m_StartCorner: 0
   m_StartAxis: 0
   m_StartAxis: 0
   m_CellSize: {x: 80, y: 80}
   m_CellSize: {x: 80, y: 80}
-  m_Spacing: {x: 65, y: 60}
+  m_Spacing: {x: 65, y: 80.17}
   m_Constraint: 1
   m_Constraint: 1
   m_ConstraintCount: 5
   m_ConstraintCount: 5
 --- !u!114 &7325045172901878179
 --- !u!114 &7325045172901878179
@@ -1241,7 +1241,7 @@ RectTransform:
   - {fileID: 7888102839772529003}
   - {fileID: 7888102839772529003}
   - {fileID: 1390014795054589175}
   - {fileID: 1390014795054589175}
   - {fileID: 6845444926165157629}
   - {fileID: 6845444926165157629}
-  - {fileID: 3183235745019377269}
+  - {fileID: 1548586139235912823}
   - {fileID: 7889035073362966984}
   - {fileID: 7889035073362966984}
   - {fileID: 1377245231049526165}
   - {fileID: 1377245231049526165}
   - {fileID: 1127050360228876458}
   - {fileID: 1127050360228876458}
@@ -2477,6 +2477,91 @@ MonoBehaviour:
   duration: 0.07
   duration: 0.07
   ease: 5
   ease: 5
   animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
   animationSizeDelta: {x: 0.05, y: 0.05, z: 0}
+--- !u!1 &4229202910123243430
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1548586139235912823}
+  - component: {fileID: 4535050339419316413}
+  - component: {fileID: 9180812260804023349}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Recycle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1548586139235912823
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229202910123243430}
+  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: 3183235745019377269}
+  m_Father: {fileID: 7457377603245600986}
+  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, y: -390}
+  m_SizeDelta: {x: 740.6, y: 44.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4535050339419316413
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229202910123243430}
+  m_CullTransparentMesh: 1
+--- !u!114 &9180812260804023349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4229202910123243430}
+  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: 0.6463483, g: 0.7196011, b: 0.76699996, 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: dec_Round12
+  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: a6fab45fc6a5f0b09679bb4eedcdd188
 --- !u!1 &4542493476968125218
 --- !u!1 &4542493476968125218
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2864,11 +2949,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 7457377603245600986}
+  m_Father: {fileID: 1548586139235912823}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -192, y: -390}
+  m_AnchoredPosition: {x: -193, y: 0}
   m_SizeDelta: {x: 280, y: 40}
   m_SizeDelta: {x: 280, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2264125635943602183
 --- !u!222 &2264125635943602183
@@ -5104,7 +5189,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.764685, g: 0.85143906, b: 0.9056604, a: 1}
+  m_Color: {r: 0.59006494, g: 0.65663636, b: 0.699, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1

+ 7 - 7
Assets/Res/UI/WidgetItem.prefab

@@ -122,7 +122,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 90, y: 90}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4404666695256229840
 --- !u!222 &4404666695256229840
 CanvasRenderer:
 CanvasRenderer:
@@ -162,7 +162,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Round12
+  _icon_name: btn_Round09
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
   packInfo:
@@ -1101,7 +1101,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6033858037849463588
 --- !u!224 &6033858037849463588
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1118,7 +1118,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 23.7}
+  m_AnchoredPosition: {x: 0, y: 26.6}
   m_SizeDelta: {x: 90, y: 40.4}
   m_SizeDelta: {x: 90, y: 40.4}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4164539319831174714
 --- !u!222 &4164539319831174714
@@ -1185,7 +1185,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5410523429226151182
 --- !u!224 &5410523429226151182
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1203,7 +1203,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 95.5, y: 97.3}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4212259591542464616
 --- !u!222 &4212259591542464616
 CanvasRenderer:
 CanvasRenderer:
@@ -1451,10 +1451,10 @@ RectTransform:
   m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
   m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
   m_ConstrainProportionsScale: 1
   m_ConstrainProportionsScale: 1
   m_Children:
   m_Children:
+  - {fileID: 5410523429226151182}
   - {fileID: 1835098571422434311}
   - {fileID: 1835098571422434311}
   - {fileID: 1614591406946658395}
   - {fileID: 1614591406946658395}
   - {fileID: 6033858037849463588}
   - {fileID: 6033858037849463588}
-  - {fileID: 5410523429226151182}
   - {fileID: 964352678154303035}
   - {fileID: 964352678154303035}
   - {fileID: 3545244106223690488}
   - {fileID: 3545244106223690488}
   - {fileID: 4688880321879378313}
   - {fileID: 4688880321879378313}

File diff suppressed because it is too large
+ 315 - 461
UserSettings/Layouts/CurrentMaximizeLayout.dwlt


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