diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_dizi.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_dizi.png index 1c4b876204..b66d96e4f0 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_dizi.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_dizi.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_hunyinditu.jpg b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_hunyinditu.jpg index 2fad6f0cc0..bacba70aa8 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_hunyinditu.jpg and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_hunyinditu.jpg differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_lingshouditu.jpg b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_lingshouditu.jpg index f194be2234..9b36bc8422 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_lingshouditu.jpg and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_lingshouditu.jpg differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mutianheng.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mutianheng.png index 93ab8d9705..be8e571d9b 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mutianheng.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_mutianheng.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shanghengtiaodi.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shanghengtiaodi.png index dbdf8ebda8..ff2176512a 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shanghengtiaodi.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shanghengtiaodi.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shengjiangditu.jpg b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shengjiangditu.jpg index 5c685aa5ec..6fcd630bc2 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shengjiangditu.jpg and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_shengjiangditu.jpg differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_xiaoditouming.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_xiaoditouming.png index 7d8d902e76..1d5f161021 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_xiaoditouming.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_xiaoditouming.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_youcecuzhu.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_youcecuzhu.png index ed25b0052d..b549f75e2c 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_youcecuzhu.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_youcecuzhu.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuibianshangzhu.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuibianshangzhu.png index 972fdd25ec..dcbe783f20 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuibianshangzhu.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuibianshangzhu.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuocecuzhu.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuocecuzhu.png index 9424603f35..56a3cd8e6c 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuocecuzhu.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuocecuzhu.png differ diff --git a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuoyoushangjijiao.png b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuoyoushangjijiao.png index 4dd3f5f4bc..2e2dd5fbf5 100644 Binary files a/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuoyoushangjijiao.png and b/Assets/ManagedResources/Atlas/TianShuMiJuan/t_tianshumijuan_zuoyoushangjijiao.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab b/Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab index dbd4b66474..226c80a6f1 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab @@ -400,13 +400,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: -200} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 8298748580827318525} - m_RootOrder: 1 + m_Father: {fileID: 572757096634856646} + 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: 363, y: -52.98} - m_SizeDelta: {x: 378.47, y: 54.72} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &812751562271846823 CanvasRenderer: @@ -440,14 +440,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 48 m_FontStyle: 0 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 24 m_MaxSize: 48 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u96F7\u706B\u4EA4\u52A0" LanguageIndex: 0 @@ -816,7 +816,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9119434493110128929} - - {fileID: 931482766990349484} + - {fileID: 572757096634856646} m_Father: {fileID: 5391102142789844470} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -882,6 +882,120 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8647072534893564832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 572757096634856646} + - component: {fileID: 858073496513592450} + - component: {fileID: 7998800159382719615} + - component: {fileID: 6454292709231549465} + - component: {fileID: 3914982238122165915} + m_Layer: 5 + m_Name: nameDi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &572757096634856646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8647072534893564832} + 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: 931482766990349484} + m_Father: {fileID: 8298748580827318525} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 180.2} + m_SizeDelta: {x: 0, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &858073496513592450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8647072534893564832} + m_CullTransparentMesh: 0 +--- !u!114 &7998800159382719615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8647072534893564832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: cdeeae8fc5671fb4583798af4523ecc6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6454292709231549465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8647072534893564832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &3914982238122165915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8647072534893564832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 3 + m_Right: 3 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 --- !u!1 &8764192060461733297 GameObject: m_ObjectHideFlags: 0 @@ -917,7 +1031,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.8, y: 15.9} + m_AnchoredPosition: {x: 0.7999878, y: 15.899994} m_SizeDelta: {x: 30.2, y: 28.6} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3912399978798336808 diff --git a/Assets/ManagedResources/~Lua/View/FetterItem.lua b/Assets/ManagedResources/~Lua/View/FetterItem.lua index 0be6338037..8fe83871b7 100644 --- a/Assets/ManagedResources/~Lua/View/FetterItem.lua +++ b/Assets/ManagedResources/~Lua/View/FetterItem.lua @@ -10,7 +10,7 @@ function FetterItem:New(gameObject) end --初始化组件(用于子类重写) function FetterItem:InitComponent() - self.name = Util.GetGameObject(self.gameObject,"bg/nameText"):GetComponent("Text") + self.name = Util.GetGameObject(self.gameObject,"bg/nameDi/nameText"):GetComponent("Text") self.mask = Util.GetGameObject(self.gameObject,"bg/mask") self.grid = Util.GetGameObject(self.gameObject,"scroll") self.tipText = Util.GetGameObject(self.gameObject,"tipText"):GetComponent("Text")