ybx_Gdn 9 месяцев назад
Родитель
Сommit
f96c5dcb85

+ 70 - 61
Assets/Content/Prefabs/UI/GridViewItem/PrivilegeDscItem.prefab

@@ -26,17 +26,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 342916308548039740}
-  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_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6462036088471949293}
+  m_Father: {fileID: 4650788776667413428}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -20, y: -20}
-  m_SizeDelta: {x: 28, y: 28}
+  m_AnchoredPosition: {x: 48, y: -12}
+  m_SizeDelta: {x: 24, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2197082223553207555
 CanvasRenderer:
@@ -55,17 +56,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 342916308548039740}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 0.5882353, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 0ae4103766675f046b3bd01368c080bf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -75,6 +76,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &2592362372682544238
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -126,16 +128,15 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 2822851527909425046}
-  - {fileID: 8620096841799554529}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
   m_Father: {fileID: 4650788776667413428}
-  m_RootOrder: 0
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 620, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2276422849146026669
 CanvasRenderer:
@@ -167,17 +168,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 926359453084886158}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.33333334, g: 0.36862746, b: 0.454902, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 32
@@ -189,9 +190,9 @@ MonoBehaviour:
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
+    m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u554A\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u554A"
+  m_Text: "\u554A\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u6253"
 --- !u!114 &6907130794933592562
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -223,10 +224,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4650788776667413428}
-  - component: {fileID: 3388228149321295940}
-  - component: {fileID: 4574776712831536458}
   - component: {fileID: 4702312345045151400}
   - component: {fileID: 1592707816800721415}
+  - component: {fileID: 4572716704115102625}
+  - component: {fileID: 8956034790977156769}
   m_Layer: 5
   m_Name: PrivilegeDscItem
   m_TagString: Untagged
@@ -244,7 +245,10 @@ RectTransform:
   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: 2822851527909425046}
+  - {fileID: 8620096841799554529}
   - {fileID: 6462036088471949293}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -254,7 +258,7 @@ RectTransform:
   m_AnchoredPosition: {x: 475, y: 0}
   m_SizeDelta: {x: 680, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3388228149321295940
+--- !u!114 &4702312345045151400
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -263,21 +267,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 5662893899897593978}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 10
-    m_Bottom: 10
-  m_ChildAlignment: 0
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
---- !u!114 &4574776712831536458
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UINode
+  - UIGridViewMark
+  - UnityEngine.UI.HorizontalLayoutGroup
+  - UnityEngine.UI.ContentSizeFitter
+  values: 0100000000
+  depObjs: []
+  activeType: 0
+--- !u!114 &1592707816800721415
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -286,12 +289,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 5662893899897593978}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 7747d94e72b614d48892f05308ad2220, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 0
-  m_VerticalFit: 2
---- !u!114 &4702312345045151400
+  GridItemName: PrivilegeDscItem
+  OriName: 
+--- !u!114 &4572716704115102625
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -300,20 +303,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 5662893899897593978}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  UIName: 
-  keys:
-  - UnityEngine.RectTransform
-  - UnityEngine.UI.ContentSizeFitter
-  - UINode
-  - UIGridViewMark
-  - UnityEngine.UI.VerticalLayoutGroup
-  values: 0100000000
-  depObjs: []
-  activeType: 0
---- !u!114 &1592707816800721415
+  m_Padding:
+    m_Left: 10
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 10
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8956034790977156769
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -322,11 +329,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 5662893899897593978}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7747d94e72b614d48892f05308ad2220, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GridItemName: PrivilegeDscItem
-  OriName: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &8619787057487984006
 GameObject:
   m_ObjectHideFlags: 0
@@ -353,17 +360,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8619787057487984006}
-  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_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6462036088471949293}
+  m_Father: {fileID: 4650788776667413428}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -20, y: -20}
-  m_SizeDelta: {x: 24, y: 24}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 24, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2609222500611648399
 CanvasRenderer:
@@ -382,17 +390,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8619787057487984006}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.54901963, g: 0.6627451, b: 0.83137256, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 0ae4103766675f046b3bd01368c080bf, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -402,6 +410,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &586913397159691704
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 84 - 52
Assets/Content/Prefabs/UI/UIDojo/UIDojo2D.prefab

@@ -98,9 +98,9 @@ MonoBehaviour:
   m_fontSize: 24
   m_fontSizeBase: 24
   m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 3
+  m_fontSizeMax: 24
   m_fontStyle: 0
   m_HorizontalAlignment: 4
   m_VerticalAlignment: 512
@@ -1727,8 +1727,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6781280095191390558}
-  - {fileID: 8091869336432223839}
   - {fileID: 1507180743189329640}
+  - {fileID: 7279239439580010042}
   m_Father: {fileID: 1820221647290094011}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2342,7 +2342,6 @@ GameObject:
   - component: {fileID: 5567023531953202844}
   - component: {fileID: 8847566642652679354}
   - component: {fileID: 2616136852962226874}
-  - component: {fileID: 2346798789243300344}
   - component: {fileID: 634005270445283781}
   m_Layer: 5
   m_Name: Lbl
@@ -2363,11 +2362,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8091869336432223839}
-  m_RootOrder: 0
+  m_Father: {fileID: 7279239439580010042}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0, y: 0.5}
@@ -2426,20 +2425,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_key: Seasoncountdown
---- !u!114 &2346798789243300344
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2475983465992134179}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!114 &634005270445283781
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2458,9 +2443,8 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Text
   - UILocalizeScript
-  - UnityEngine.UI.ContentSizeFitter
   - UINode
-  values: 000001000000
+  values: 0000010000
   depObjs:
   - {fileID: 6157224965281936822}
   activeType: 0
@@ -3510,7 +3494,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5563100403214132635}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -6298,6 +6282,71 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6723538997548473984
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7279239439580010042}
+  - component: {fileID: 2909282407974751466}
+  m_Layer: 5
+  m_Name: timeTxt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7279239439580010042
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6723538997548473984}
+  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: 8091869336432223839}
+  - {fileID: 7134552471575428881}
+  m_Father: {fileID: 5563100403214132635}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 34.500008, y: 0}
+  m_SizeDelta: {x: 279, y: 51}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2909282407974751466
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6723538997548473984}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 3
+  m_Spacing: 5
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &6760608028979662368
 GameObject:
   m_ObjectHideFlags: 0
@@ -6638,7 +6687,6 @@ GameObject:
   - component: {fileID: 3568282932148503497}
   - component: {fileID: 7710709198303267377}
   - component: {fileID: 6157224965281936822}
-  - component: {fileID: 3184631929945919996}
   m_Layer: 5
   m_Name: Val
   m_TagString: Untagged
@@ -6653,18 +6701,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6914965266696582040}
-  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_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7134552471575428881}
-  m_Father: {fileID: 5563100403214132635}
-  m_RootOrder: 1
+  m_Children: []
+  m_Father: {fileID: 7279239439580010042}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -100, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3568282932148503497
@@ -6700,7 +6747,7 @@ MonoBehaviour:
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 20
+    m_MinSize: 10
     m_MaxSize: 28
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -6727,24 +6774,9 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Text
   - UINode
-  - UnityEngine.UI.ContentSizeFitter
-  values: 0000010000
+  values: 00000100
   depObjs: []
   activeType: 0
---- !u!114 &3184631929945919996
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6914965266696582040}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &7111320037440594090
 GameObject:
   m_ObjectHideFlags: 0

+ 18 - 48
Assets/Content/Prefabs/UI/UIDojo/UIDojoBuyTimes.prefab

@@ -949,7 +949,6 @@ GameObject:
   - component: {fileID: 3801717364424980082}
   - component: {fileID: 7897037347797897435}
   - component: {fileID: 2278490260328001484}
-  - component: {fileID: 3137148975728692195}
   m_Layer: 5
   m_Name: Lbl1
   m_TagString: Untagged
@@ -972,10 +971,10 @@ RectTransform:
   m_Father: {fileID: 6387986881701941363}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 88, y: -50}
-  m_SizeDelta: {x: 144, y: 60}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3801717364424980082
 CanvasRenderer:
@@ -1022,9 +1021,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 36
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 36
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1032,20 +1031,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u662F\u5426\u82B1\u8D39"
---- !u!114 &3137148975728692195
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3589842581035452695}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &3668098321961119813
 GameObject:
   m_ObjectHideFlags: 0
@@ -1878,7 +1863,6 @@ GameObject:
   - component: {fileID: 7754196742301025903}
   - component: {fileID: 8293354188773773227}
   - component: {fileID: 8354286390572226402}
-  - component: {fileID: 1876112859072421637}
   m_Layer: 5
   m_Name: Lbl2
   m_TagString: Untagged
@@ -1901,10 +1885,10 @@ RectTransform:
   m_Father: {fileID: 6387986881701941363}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 482, y: -50}
-  m_SizeDelta: {x: 144, y: 60}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7754196742301025903
 CanvasRenderer:
@@ -1951,9 +1935,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 36
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 36
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -1961,20 +1945,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8D2D\u4E70\u6B21\u6570"
---- !u!114 &1876112859072421637
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5587603845891025669}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &5719480997387218139
 GameObject:
   m_ObjectHideFlags: 0
@@ -2088,8 +2058,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 370, y: -50}
-  m_SizeDelta: {x: 70, y: 60}
+  m_AnchoredPosition: {x: 422.885, y: -107.56}
+  m_SizeDelta: {x: 83, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1992366972655941556
 CanvasRenderer:
@@ -2132,7 +2102,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1000
+  m_Text: 10001
 --- !u!114 &1607440914107594522
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3402,8 +3372,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 107.2, y: 0}
-  m_SizeDelta: {x: 570, y: 100}
+  m_AnchoredPosition: {x: 102.12, y: -4.32}
+  m_SizeDelta: {x: 675.77, y: 215.12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7137838047272826463
 MonoBehaviour:
@@ -3996,7 +3966,7 @@ PrefabInstance:
     - target: {fileID: 8354184739729965379, guid: 25d79ce0e6a0bfc49b6572a93c707f35,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -327
+      value: -362
       objectReference: {fileID: 0}
     - target: {fileID: 8354184739729965379, guid: 25d79ce0e6a0bfc49b6572a93c707f35,
         type: 3}

Разница между файлами не показана из-за своего большого размера
+ 129 - 127
Assets/Content/Prefabs/UI/UIDojo/UIDojoReward.prefab


+ 3 - 3
Assets/Content/Prefabs/UI/UIExpedition/SelectedHeroExp.prefab

@@ -998,14 +998,14 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 34.7
+  m_fontSize: 31.85
   m_fontSizeBase: 40
   m_fontWeight: 400
   m_enableAutoSizing: 1
   m_fontSizeMin: 18
   m_fontSizeMax: 40
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -1034,7 +1034,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 1
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 11.172468, z: 0, w: 18.62077}
+  m_margin: {x: 0, y: 14.673073, z: 0, w: 18.62077}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0

+ 10 - 55
Assets/Content/Prefabs/UI/UIHundredDojo/UIHundredDojoGuildRank.prefab

@@ -643,7 +643,6 @@ GameObject:
   - component: {fileID: 5763031163817522139}
   - component: {fileID: 4745017921048460611}
   - component: {fileID: 2927477800848364776}
-  - component: {fileID: 3150316718274351820}
   - component: {fileID: 4911923429853414022}
   m_Layer: 5
   m_Name: Text
@@ -670,7 +669,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -111, y: -0.000015273}
-  m_SizeDelta: {x: 369, y: 44}
+  m_SizeDelta: {x: 500, y: 400}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4745017921048460611
 CanvasRenderer:
@@ -707,27 +706,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 298
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: " \u5F53\u524D\u6CA1\u6709\u4EFB\u4F55\u516C\u6703\u4E0A\u699C11"
---- !u!114 &3150316718274351820
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2518917532655596813}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
+  m_Text: " \u5F53\u524D\u6CA1\u6709\u4EFB\u4F55\u516C\u6703\u4E0A\u699C"
 --- !u!114 &4911923429853414022
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1109,7 +1094,6 @@ GameObject:
   - component: {fileID: 401808103774275669}
   - component: {fileID: 671895454713089817}
   - component: {fileID: 2974401601865274210}
-  - component: {fileID: 7142904435118427527}
   - component: {fileID: 3949956738582668033}
   m_Layer: 5
   m_Name: Text
@@ -1136,7 +1120,7 @@ RectTransform:
   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: 0, y: 0}
+  m_SizeDelta: {x: 480, y: 39}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &671895454713089817
 CanvasRenderer:
@@ -1170,30 +1154,16 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 0
+    m_MaxSize: 32
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u524D8\u540D\u53EF\u83B7\u5F97\u516C\u6703\u6230\u8D44\u683C\r"
---- !u!114 &7142904435118427527
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3056186084313745118}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!114 &3949956738582668033
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1759,7 +1729,6 @@ GameObject:
   - component: {fileID: 4933683819483963335}
   - component: {fileID: 2135275116961623968}
   - component: {fileID: 2813648894404306114}
-  - component: {fileID: 1452151034765851111}
   - component: {fileID: 2523708049384956062}
   m_Layer: 5
   m_Name: Text
@@ -1786,7 +1755,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -111, y: -0.000015273}
-  m_SizeDelta: {x: 360, y: 44}
+  m_SizeDelta: {x: 530, y: 150}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2135275116961623968
 CanvasRenderer:
@@ -1823,27 +1792,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 298
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4F60\u8FD8\u6CA1\u6709\u52A0\u5165\u4EFB\u4F55\u516C\u6703"
---- !u!114 &1452151034765851111
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6192956264115021891}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
 --- !u!114 &2523708049384956062
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1875,7 +1830,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5085858200248926572
 RectTransform:
   m_ObjectHideFlags: 0

+ 5 - 5
Assets/Content/Prefabs/UI/UIRoleMain/UIRoleMain1.prefab

@@ -10062,8 +10062,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 25, y: 10}
-  m_SizeDelta: {x: -150, y: 80}
+  m_AnchoredPosition: {x: 35, y: 10}
+  m_SizeDelta: {x: -110, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2019990405856246968
 CanvasRenderer:
@@ -10137,9 +10137,9 @@ MonoBehaviour:
   m_fontSize: 48
   m_fontSizeBase: 48
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 48
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -17951,7 +17951,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 60, y: 10}
+  m_AnchoredPosition: {x: 50, y: 10}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &668652817024956499

+ 107 - 35
Assets/Content/Prefabs/UI/UIRuneShop/UIBoliShop.prefab

@@ -3258,7 +3258,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7279\u6743\u793C\u5305"
+  m_Text: "\u7279\u6743\u793C\u53051"
 --- !u!1 &2408644433757491282
 GameObject:
   m_ObjectHideFlags: 0
@@ -5992,6 +5992,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7383744215406289420}
+  - component: {fileID: 5346218486276327485}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -6020,6 +6021,32 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 424.94}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &5346218486276327485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4725851186140300095}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 20
+    m_Right: 10
+    m_Top: 20
+    m_Bottom: 10
+  m_ChildAlignment: 0
+  m_Spacing: 20
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &4799380876763069200
 GameObject:
   m_ObjectHideFlags: 0
@@ -6523,7 +6550,7 @@ GameObject:
   - component: {fileID: 2292300093048636591}
   - component: {fileID: 1089609453288236313}
   - component: {fileID: 5624771563890854106}
-  - component: {fileID: 5229452465496910636}
+  - component: {fileID: 1747184161119449312}
   m_Layer: 5
   m_Name: InformationScrollView
   m_TagString: Untagged
@@ -6597,7 +6624,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5034722027756703573}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
   m_Name: 
@@ -6639,11 +6666,11 @@ MonoBehaviour:
   - UnityEngine.UI.Image
   - UnityEngine.UI.ScrollRect
   - UINode
-  - SuperScrollView.LoopGridView
+  - SuperScrollView.LoopListView
   values: 000000010001
   depObjs: []
   activeType: 0
---- !u!114 &5229452465496910636
+--- !u!114 &1747184161119449312
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -6652,29 +6679,22 @@ MonoBehaviour:
   m_GameObject: {fileID: 5034722027756703573}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 17e9881a7bce8124a8f855b96a8ca11a, type: 3}
+  m_Script: {fileID: 11500000, guid: e190d043ef387ee4fad4acea6146931e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   mItemPrefabDataList:
   - mItemPrefab: {fileID: 5629129252604013063}
+    mPadding: 20
     mInitCreateCount: 0
+    mStartPosOffset: 0
   mArrangeType: 0
-  mNeedReverse: 0
-  mKeepFillShow: -1
-  mFixedRowOrColumnCount: 0
-  mPadding:
-    m_Left: 20
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  mItemPadding: {x: 20, y: 10}
-  mItemSize: {x: 680, y: 50}
-  mItemRecycleDistance: {x: 50, y: 50}
+  mSupportScrollBar: 1
   mItemSnapEnable: 0
-  mGridFixedType: 0
   mViewPortSnapPivot: {x: 0, y: 0}
   mItemSnapPivot: {x: 0, y: 0}
-  mSortStartIdx: -1
+  mAutoAdapterSize: 1
+  mStartPadding: 5
+  mEndPadding: 5
 --- !u!1 &5053042303969860810
 GameObject:
   m_ObjectHideFlags: 0
@@ -9598,7 +9618,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6308356677006914250}
   - component: {fileID: 7520123661253762220}
-  - component: {fileID: 7048024927286513669}
+  - component: {fileID: 3892759528419488721}
   m_Layer: 5
   m_Name: Viewport
   m_TagString: Untagged
@@ -9635,7 +9655,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7282754075096780616}
   m_CullTransparentMesh: 0
---- !u!114 &7048024927286513669
+--- !u!114 &3892759528419488721
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -11605,13 +11625,58 @@ PrefabInstance:
     - target: {fileID: 497830751501061689, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_Text
-      value: "\u554A\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u554A\u5B9E\u6253"
+      value: "\u554A\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u6253\u5B9E\u6253\u5B9E\u5927\u82CF\u554A\u5B9E"
       objectReference: {fileID: 0}
     - target: {fileID: 497830751501061689, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_FontData.m_BestFit
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 497830751501061689, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_FontData.m_VerticalOverflow
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2822851527909425046, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822851527909425046, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822851527909425046, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 24
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822851527909425046, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822851527909425046, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2822851527909425046, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4570573687313457213, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4572716704115102625, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_ChildControlWidth
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4650788776667413428, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_Pivot.x
@@ -11650,7 +11715,7 @@ PrefabInstance:
     - target: {fileID: 4650788776667413428, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 680
+      value: 722
       objectReference: {fileID: 0}
     - target: {fileID: 4650788776667413428, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
@@ -11695,12 +11760,12 @@ PrefabInstance:
     - target: {fileID: 4650788776667413428, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 50
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 4650788776667413428, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0
+      value: -20
       objectReference: {fileID: 0}
     - target: {fileID: 4650788776667413428, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
@@ -11720,12 +11785,12 @@ PrefabInstance:
     - target: {fileID: 4702312345045151400, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: keys.Array.size
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 4702312345045151400, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: values.Array.size
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 4702312345045151400, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
@@ -11740,7 +11805,12 @@ PrefabInstance:
     - target: {fileID: 4702312345045151400, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: keys.Array.data[3]
-      value: UnityEngine.UI.ContentSizeFitter
+      value: UnityEngine.UI.HorizontalLayoutGroup
+      objectReference: {fileID: 0}
+    - target: {fileID: 5391013378120258958, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
+        type: 3}
+      propertyPath: m_ChildControlWidth
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5662893899897593978, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
@@ -11755,35 +11825,37 @@ PrefabInstance:
     - target: {fileID: 6462036088471949293, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6462036088471949293, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6462036088471949293, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 680
+      value: 664
       objectReference: {fileID: 0}
     - target: {fileID: 6462036088471949293, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 36.5625
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6462036088471949293, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 340
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6462036088471949293, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -28.28125
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents:
-    - {fileID: 3388228149321295940, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab, type: 3}
+    - {fileID: 1488384439192143821, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab, type: 3}
+    - {fileID: 3225970254839650693, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab, type: 3}
+    - {fileID: 4570573687313457213, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: f61f1ae4bc5eb4d4e9558074ee5bb2ab, type: 3}
 --- !u!224 &4612502976748450249 stripped
 RectTransform:

+ 5 - 5
Assets/Content/Prefabs/UI/UISkillExpBattle/UIEvil.prefab

@@ -2088,8 +2088,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 12.4, y: 10}
-  m_SizeDelta: {x: 175.1, y: 96}
+  m_AnchoredPosition: {x: 27.72, y: 34.15}
+  m_SizeDelta: {x: 162.56, y: 47.69}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2707963559071329782
 CanvasRenderer:
@@ -2160,7 +2160,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 40
+  m_fontSize: 39.25
   m_fontSizeBase: 36
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -2168,7 +2168,7 @@ MonoBehaviour:
   m_fontSizeMax: 40
   m_fontStyle: 0
   m_HorizontalAlignment: 2
-  m_VerticalAlignment: 256
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -4504,7 +4504,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -70, y: 22}
+  m_AnchoredPosition: {x: -85, y: 22}
   m_SizeDelta: {x: 60, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7249779862699464317

+ 18 - 18
Assets/Lua/UI/GridViewItem/PrivilegeDscItem_Generate.lua

@@ -7,9 +7,9 @@
 ---@field private gameObject UnityEngine.GameObject
 ---@field private transform UnityEngine.Transform
 ---@field private rectTransform UnityEngine.RectTransform
----@field private desTxt PrivilegeDscItem__Generate_desTxt
 ---@field private exist UnityEngine.GameObject
 ---@field private new UnityEngine.GameObject
+---@field private desTxt PrivilegeDscItem__Generate_desTxt
 local PrivilegeDscItemView = class("PrivilegeDscItemView")
 
 function PrivilegeDscItemView:ctor()
@@ -46,49 +46,45 @@ end
 ---@private
 function PrivilegeDscItemView:InitGenerate__2(Root, data)
 --[[
-	DesTxt
+	Exist
 --]]
-	local tmp = Root:Find("DesTxt").gameObject
+	local tmp = Root:Find("Exist").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.desTxt = tmp
-
-	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
-
-	tmp.uILocalizeScript = tmp:GetComponent(Enum.TypeInfo.UILocalizeScript)
+	self.exist = tmp
 end
 
 ---@private
 function PrivilegeDscItemView:InitGenerate__3(Root, data)
 --[[
-	DesTxt/Exist
+	New
 --]]
-	local tmp = Root:Find("DesTxt/Exist").gameObject
+	local tmp = Root:Find("New").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.exist = tmp
+	self.new = tmp
 end
 
 ---@private
 function PrivilegeDscItemView:InitGenerate__4(Root, data)
 --[[
-	DesTxt/New
+	DesTxt
 --]]
-	local tmp = Root:Find("DesTxt/New").gameObject
+	local tmp = Root:Find("DesTxt").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
-	self.new = tmp
+	self.desTxt = tmp
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+
+	tmp.uILocalizeScript = tmp:GetComponent(Enum.TypeInfo.UILocalizeScript)
 end
 
 ---@private
 function PrivilegeDscItemView:GenerateDestroy()
-	if tolua.getpeer(self.desTxt) ~= nil then
-		tolua.setpeer(self.desTxt, nil)
-	end
-	self.desTxt = nil
 	if tolua.getpeer(self.exist) ~= nil then
 		tolua.setpeer(self.exist, nil)
 	end
@@ -97,6 +93,10 @@ function PrivilegeDscItemView:GenerateDestroy()
 		tolua.setpeer(self.new, nil)
 	end
 	self.new = nil
+	if tolua.getpeer(self.desTxt) ~= nil then
+		tolua.setpeer(self.desTxt, nil)
+	end
+	self.desTxt = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

+ 4 - 4
Assets/Lua/UI/UIDojo/UIDojo2DView_Generate.lua

@@ -431,9 +431,9 @@ end
 ---@private
 function UIDojo2DView:InitGenerate__17(Root, data)
 --[[
-	TopView/BattleInfo/Right/RankTime/Val
+	TopView/BattleInfo/Right/RankTime/timeTxt/Val
 --]]
-	local tmp = Root:Find("TopView/BattleInfo/Right/RankTime/Val").gameObject
+	local tmp = Root:Find("TopView/BattleInfo/Right/RankTime/timeTxt/Val").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end
@@ -445,9 +445,9 @@ end
 ---@private
 function UIDojo2DView:InitGenerate__18(Root, data)
 --[[
-	TopView/BattleInfo/Right/RankTime/Val/Lbl
+	TopView/BattleInfo/Right/RankTime/timeTxt/Lbl
 --]]
-	local tmp = Root:Find("TopView/BattleInfo/Right/RankTime/Val/Lbl").gameObject
+	local tmp = Root:Find("TopView/BattleInfo/Right/RankTime/timeTxt/Lbl").gameObject
 	if tolua.getpeer(tmp) == nil then
 		tolua.setpeer(tmp, {})
 	end

+ 15 - 7
Assets/Lua/UI/UIRuneShop/UIBoliShopView.lua

@@ -132,9 +132,9 @@ function UIBoliShopView:InitGridView()
 	self.scrollViewLv.loopGridView:InitGridView(0, function(gridView, itemIndex, row, column)
 		return self:GetItemByRowColumn(gridView, itemIndex, row, column)
 	end, nil)
-	self.informationScrollView.loopGridView:InitGridView(0, function(gridView, itemIndex, row, column)
-		return self:GetVipDescItemByRowColumn(gridView, itemIndex, row, column)
-	end, nil)
+	self.informationScrollView.loopListView:InitListView(0, function(gridView, itemIndex)
+		return self:GetVipDescItemByRowColumn(gridView, itemIndex)
+	end)
 	self.goodsScrollView.loopGridView:InitGridView(0, function(gridView, itemIndex, row, column)
 		return self:GetGoodsItemByRowColumn(gridView, itemIndex, row, column)
 	end, nil)
@@ -325,15 +325,18 @@ function UIBoliShopView:OnClickShopGoodsItem(btn, params)
 	end
 end
 
-function UIBoliShopView:GetVipDescItemByRowColumn(gridView, itemIndex, row, column)
+function UIBoliShopView:GetVipDescItemByRowColumn(gridView, itemIndex)
 	local item = nil
 	item = gridView:NewListViewItem('PrivilegeDscItem')
 	local data = self.controller:GetDescDataByIdx(itemIndex + 1)
 	local itemLua = CommonUtil.BindGridViewItem2Lua(self, 'PrivilegeDscItem', item.gameObject)
 	if data then
 		itemLua.desTxt.text.text = string.formatbykey(data[2],data[3],data[4],data[5])
-		itemLua.new:SetActive(data[1] == 1)
+		local isnew = data[1] == 1
+		itemLua.new:SetActive(isnew)
+		itemLua.exist:SetActive(not isnew)
 	end
+	ManagerContainer.LuaUIMgr:ForceRebuildLayoutImmediate(item.CachedRectTransform)
 	return item
 end
 
@@ -419,8 +422,13 @@ function UIBoliShopView:RefreshVipDescScroll(data)
 	if data then
 		local descData = data.UnlockDes
 		if descData then
+			--LogError('--------------------------------')
 			self.controller:SetDescData(descData)
-			self.informationScrollView.loopGridView:RefreshListByIndex(#descData,0)
+			self.informationScrollView.loopListView:SetListItemCount(0,true) --RefreshAllShownItem  MovePanelToItemIndex  RefreshItemByItemIndex
+			self.informationScrollView.loopListView:SetListItemCount(#descData,true)
+			--self.informationScrollView.loopListView:RefreshAllShownItem()
+			--self.informationScrollView.loopListView:MovePanelToItemIndex(0,0)
+			--self.informationScrollView.loopListView:RefreshItemByItemIndex(#descData-1)
 		end
 	end
 end
@@ -569,7 +577,7 @@ function UIBoliShopView:OnDispose()
 	IsRefreshBtnItem = nil
 	LastItemIdx = nil
 	self.scrollViewLv.loopGridView:Dispose()
-	self.informationScrollView.loopGridView:Dispose()
+	self.informationScrollView.loopListView:Dispose()
 	self.goodsScrollView.loopGridView:Dispose()
 	self:DisposeShopGoodsItemTimer()
 end

+ 2 - 2
Assets/Lua/UI/UIRuneShop/UIBoliShopView_Generate.lua

@@ -191,7 +191,7 @@
 ---@class UIBoliShop__Generate_informationScrollView
 ---@field public gameObject UnityEngine.GameObject
 ---@field public scrollRect UnityEngine.UI.ScrollRect
----@field public loopGridView SuperScrollView.LoopGridView
+---@field public loopListView SuperScrollView.LoopListView
 
 ---@class UIBoliShop__Generate_titletext
 ---@field public gameObject UnityEngine.GameObject
@@ -397,7 +397,7 @@ function UIBoliShopView:InitGenerate__5(Root, data)
 
 	tmp.scrollRect = tmp:GetComponent(Enum.TypeInfo.ScrollRect)
 
-	tmp.loopGridView = tmp:GetComponent(Enum.TypeInfo.LoopGridView)
+	tmp.loopListView = tmp:GetComponent(Enum.TypeInfo.LoopListView)
 end
 
 ---@private

Некоторые файлы не были показаны из-за большого количества измененных файлов