diff options
| author | chai <chaifix@163.com> | 2022-04-25 10:19:09 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2022-04-25 10:19:09 +0800 |
| commit | 7eb9351d905ddf6316fd6b177fff967fbac6fc94 (patch) | |
| tree | 4ef3844fba1a2ff719178a96b37780b29faacd7c | |
| parent | 8131033510c711248de1904649cfa1dbe4bbe69f (diff) | |
* rename decoration to item
68 files changed, 835 insertions, 958 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration.meta b/SurvivalTest/Assets/Resources/Art/ui/item.meta index c0a0890..42bc745 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/item.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5326ea18e6e58ef4ea5a4efdb04f62ca +guid: 72a55ab271755c24d86516c6605e3f7b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png b/SurvivalTest/Assets/Resources/Art/ui/item/battery.png Binary files differindex 6e7e32f..6e7e32f 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png +++ b/SurvivalTest/Assets/Resources/Art/ui/item/battery.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/battery.png.meta index 0c5d3b1..0c5d3b1 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/item/battery.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png b/SurvivalTest/Assets/Resources/Art/ui/item/horn.png Binary files differindex 3142021..3142021 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png +++ b/SurvivalTest/Assets/Resources/Art/ui/item/horn.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/horn.png.meta index 7ba6c2c..7ba6c2c 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/horn.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/item/horn.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png b/SurvivalTest/Assets/Resources/Art/ui/item/mestry_mask.png Binary files differindex 9c7318d..9c7318d 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png +++ b/SurvivalTest/Assets/Resources/Art/ui/item/mestry_mask.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/mestry_mask.png.meta index 60ed56d..60ed56d 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/mestry_mask.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/item/mestry_mask.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png b/SurvivalTest/Assets/Resources/Art/ui/item/power_ring.png Binary files differindex 1c17710..1c17710 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png +++ b/SurvivalTest/Assets/Resources/Art/ui/item/power_ring.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/power_ring.png.meta index ab5c8fb..ab5c8fb 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/power_ring.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/item/power_ring.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png b/SurvivalTest/Assets/Resources/Art/ui/item/spectrum.png Binary files differindex 7013128..7013128 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png +++ b/SurvivalTest/Assets/Resources/Art/ui/item/spectrum.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png.meta b/SurvivalTest/Assets/Resources/Art/ui/item/spectrum.png.meta index 135c91f..135c91f 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/item/spectrum.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon.meta b/SurvivalTest/Assets/Resources/Art/ui/itemicon.meta deleted file mode 100644 index 07da78f..0000000 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b3de6ce6b3012e6469449df0534692bc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab index 8fa26e4..d5a1d68 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &285246676 +--- !u!1 &175293527029796164 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,94 +8,80 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 285246677} - - component: {fileID: 285246680} - - component: {fileID: 285246679} - - component: {fileID: 285246678} + - component: {fileID: 7777673960576313765} + - component: {fileID: 424755561397779900} m_Layer: 5 - m_Name: Text_Name + m_Name: Button_Item m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &285246677 +--- !u!224 &7777673960576313765 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285246676} + m_GameObject: {fileID: 175293527029796164} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 5461203906984040156} - m_RootOrder: 2 + m_Children: + - {fileID: 2164190173218440156} + m_Father: {fileID: 5567416378235391546} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -58.899963} - m_SizeDelta: {x: 669.28, y: 30} - m_Pivot: {x: 1, y: 1} ---- !u!222 &285246680 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285246676} - m_CullTransparentMesh: 1 ---- !u!114 &285246679 + m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &424755561397779900 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285246676} + m_GameObject: {fileID: 175293527029796164} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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_Navigation: + m_Mode: 0 + 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: 1, g: 0, b: 0, 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: 1018679542609155544} + m_OnClick: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 2 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Item Name ---- !u!114 &285246678 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285246676} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 2, y: -2} - m_UseGraphicAlpha: 1 ---- !u!1 &360475749 +--- !u!1 &2166095880114612661 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -103,74 +89,148 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 360475750} - - component: {fileID: 360475752} - - component: {fileID: 360475751} + - component: {fileID: 2166095880114612660} + - component: {fileID: 2166095880114612662} + - component: {fileID: 7717878532810368556} m_Layer: 5 - m_Name: Image_SelectBg + m_Name: PanelItemBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &360475750 +--- !u!224 &2166095880114612660 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360475749} + m_GameObject: {fileID: 2166095880114612661} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2978880214148668830} - m_RootOrder: 2 + m_Children: + - {fileID: 3449313608950777208} + m_Father: {fileID: 0} + m_RootOrder: 0 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 &360475752 +--- !u!222 &2166095880114612662 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360475749} + m_GameObject: {fileID: 2166095880114612661} m_CullTransparentMesh: 1 ---- !u!114 &360475751 +--- !u!114 &7717878532810368556 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360475749} + m_GameObject: {fileID: 2166095880114612661} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f1382539f3296aa47b7e2d7f269f9007, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19188325, g: 0.2673993, b: 0.8301887, 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: 899f0bb9c626be04390cd94aecead58b, 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 &911567325 + m_EquipTemplate: {fileID: 7717878531945168385} + m_EquipGrid: {fileID: 5968017217576072031} +--- !u!1 &4235692083465093350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5567416378235391546} + - component: {fileID: 7717878531945168385} + m_Layer: 5 + m_Name: EquipTemplate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5567416378235391546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4235692083465093350} + 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: 7777673960576313765} + - {fileID: 7717878531210855632} + m_Father: {fileID: 3449313608950777208} + 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: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0, y: 1} +--- !u!114 &7717878531945168385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4235692083465093350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83ab90093bb5312428311a589a4fe90f, type: 3} + m_Name: + m_EditorClassIdentifier: + Image_Icon: {fileID: 1018679542609155544} + Image_CD: {fileID: 7717878531210855635} +--- !u!1 &6067553246905428835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3449313608950777208} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3449313608950777208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6067553246905428835} + 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: 5567416378235391546} + - {fileID: 7211516958917376634} + m_Father: {fileID: 2166095880114612660} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.83176523} + m_AnchorMax: {x: 0.4, y: 0.8987004} + m_AnchoredPosition: {x: 18, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!1 &7211516958917376633 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -178,9 +238,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 911567326} - - component: {fileID: 3947084554722189563} - - component: {fileID: 200263981594531572} + - component: {fileID: 7211516958917376634} + - component: {fileID: 5968017217576072031} + - component: {fileID: 7409282789047240016} m_Layer: 5 m_Name: Grid m_TagString: Untagged @@ -188,18 +248,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &911567326 +--- !u!224 &7211516958917376634 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 911567325} + m_GameObject: {fileID: 7211516958917376633} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5461203906984040156} + m_Father: {fileID: 3449313608950777208} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -207,25 +267,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -0.000015258789, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3947084554722189563 +--- !u!114 &5968017217576072031 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 911567325} + m_GameObject: {fileID: 7211516958917376633} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4dbae61f498dde342a95489aca8ff68c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &200263981594531572 +--- !u!114 &7409282789047240016 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 911567325} + m_GameObject: {fileID: 7211516958917376633} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} @@ -236,7 +296,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 2 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -245,7 +305,7 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &2036552918 +--- !u!1 &7717878531210855633 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -253,57 +313,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2036552919} - - component: {fileID: 2036552921} - - component: {fileID: 2036552920} + - component: {fileID: 7717878531210855632} + - component: {fileID: 7717878531210855634} + - component: {fileID: 7717878531210855635} m_Layer: 5 - m_Name: Image_Use + m_Name: Image_CD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2036552919 +--- !u!224 &7717878531210855632 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036552918} + m_GameObject: {fileID: 7717878531210855633} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2978880214148668830} + m_Father: {fileID: 5567416378235391546} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.010000229, y: -2.02} - m_SizeDelta: {x: 35.09, y: 35.884} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &2036552921 + 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 &7717878531210855634 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036552918} + m_GameObject: {fileID: 7717878531210855633} m_CullTransparentMesh: 1 ---- !u!114 &2036552920 +--- !u!114 &7717878531210855635 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036552918} + m_GameObject: {fileID: 7717878531210855633} 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.33333334} + m_Color: {r: 0, g: 0, b: 0, a: 0.13333334} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -315,12 +375,12 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 0 + m_FillAmount: 1 m_FillClockwise: 1 - m_FillOrigin: 0 + m_FillOrigin: 1 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2025007520569130142 +--- !u!1 &8650906820126748474 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -328,10 +388,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8799131009086869624} - - component: {fileID: 4523810121954862748} - - component: {fileID: 7653700247146841724} - - component: {fileID: 6929925230626081688} + - component: {fileID: 2164190173218440156} + - component: {fileID: 6544778234947663160} + - component: {fileID: 1018679542609155544} + - component: {fileID: 304131722135525436} m_Layer: 5 m_Name: Icon_Item m_TagString: Untagged @@ -339,40 +399,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8799131009086869624 +--- !u!224 &2164190173218440156 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2025007520569130142} + m_GameObject: {fileID: 8650906820126748474} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1151704573595367937} + m_Father: {fileID: 7777673960576313765} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.20400047, y: 0.16799927} + m_AnchoredPosition: {x: -0.20401001, y: 0.16799927} m_SizeDelta: {x: -5.855, y: -5.927} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4523810121954862748 +--- !u!222 &6544778234947663160 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2025007520569130142} + m_GameObject: {fileID: 8650906820126748474} m_CullTransparentMesh: 1 ---- !u!114 &7653700247146841724 +--- !u!114 &1018679542609155544 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2025007520569130142} + m_GameObject: {fileID: 8650906820126748474} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -386,7 +446,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 54562072a24f4294ab8c6d1ff34e989d, type: 3} + m_Sprite: {fileID: 21300000, guid: e1b736de4152d434d8fb757fac16f223, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -396,13 +456,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6929925230626081688 +--- !u!114 &304131722135525436 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2025007520569130142} + m_GameObject: {fileID: 8650906820126748474} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -436,241 +496,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 7653700247146841724} + m_TargetGraphic: {fileID: 1018679542609155544} m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &3467828821447424199 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5461203906984040156} - m_Layer: 5 - m_Name: Root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5461203906984040156 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3467828821447424199} - 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: 2978880214148668830} - - {fileID: 911567326} - - {fileID: 285246677} - m_Father: {fileID: 8798891066935212560} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.65141463, y: 0.9227778} - m_AnchorMax: {x: 1, y: 0.9710001} - m_AnchoredPosition: {x: -18, y: -11} - m_SizeDelta: {x: 0.000061035156, y: 0} - m_Pivot: {x: 1, y: 1} ---- !u!1 &6835417453803328322 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2978880214148668830} - - component: {fileID: 1892896074} - m_Layer: 5 - m_Name: ItemTemplate - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2978880214148668830 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6835417453803328322} - 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: 1151704573595367937} - - {fileID: 2036552919} - - {fileID: 360475750} - m_Father: {fileID: 5461203906984040156} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1892896074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6835417453803328322} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 677576640bb11e34e961b72e3c139f6a, type: 3} - m_Name: - m_EditorClassIdentifier: - Image_Icon: {fileID: 7653700247146841724} - Image_SelectBg: {fileID: 360475751} - Image_Use: {fileID: 2036552920} ---- !u!1 &7384409151774236384 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1151704573595367937} - - component: {fileID: 7057559090671693336} - m_Layer: 5 - m_Name: Button_Item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1151704573595367937 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7384409151774236384} - 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: 8799131009086869624} - m_Father: {fileID: 2978880214148668830} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7057559090671693336 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7384409151774236384} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - 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: 1, g: 0, b: 0, 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: 7653700247146841724} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &8798891066935212561 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8798891066935212560} - - component: {fileID: 8798891066935212562} - - component: {fileID: 8798891066935212563} - m_Layer: 5 - m_Name: PanelItemBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8798891066935212560 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8798891066935212561} - 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: 5461203906984040156} - m_Father: {fileID: 0} - m_RootOrder: 0 - 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 &8798891066935212562 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8798891066935212561} - m_CullTransparentMesh: 1 ---- !u!114 &8798891066935212563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8798891066935212561} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3e9f15745561dd4f9119ac8f893dbfc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ItemTempalte: {fileID: 1892896074} - m_ItemGrid: {fileID: 3947084554722189563} - m_TextName: {fileID: 285246679} diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab.meta b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab.meta index 7ffd59a..538ef3a 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab.meta +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 302ad0181ac604e46b0a10a9abe687cb +guid: 385d08ea764f1cf4a951094951320e98 PrefabImporter: externalObjects: {} userData: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelDecorationBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelPropBar.prefab index 6b2fb4a..8fa26e4 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelDecorationBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelPropBar.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &175293527029796164 +--- !u!1 &285246676 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,80 +8,94 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7777673960576313765} - - component: {fileID: 424755561397779900} + - component: {fileID: 285246677} + - component: {fileID: 285246680} + - component: {fileID: 285246679} + - component: {fileID: 285246678} m_Layer: 5 - m_Name: Button_Item + m_Name: Text_Name m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7777673960576313765 +--- !u!224 &285246677 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175293527029796164} + m_GameObject: {fileID: 285246676} 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: 2164190173218440156} - m_Father: {fileID: 5567416378235391546} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 5461203906984040156} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &424755561397779900 + m_AnchoredPosition: {x: 0, y: -58.899963} + m_SizeDelta: {x: 669.28, y: 30} + m_Pivot: {x: 1, y: 1} +--- !u!222 &285246680 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 285246676} + m_CullTransparentMesh: 1 +--- !u!114 &285246679 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175293527029796164} + m_GameObject: {fileID: 285246676} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - 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: 1, g: 0, b: 0, 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: 1018679542609155544} - m_OnClick: + 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: [] ---- !u!1 &2166095880114612661 + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Item Name +--- !u!114 &285246678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 285246676} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &360475749 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -89,148 +103,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2166095880114612660} - - component: {fileID: 2166095880114612662} - - component: {fileID: 7717878532810368556} + - component: {fileID: 360475750} + - component: {fileID: 360475752} + - component: {fileID: 360475751} m_Layer: 5 - m_Name: PanelDecorationBar + m_Name: Image_SelectBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2166095880114612660 +--- !u!224 &360475750 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2166095880114612661} + m_GameObject: {fileID: 360475749} 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: 3449313608950777208} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 2978880214148668830} + m_RootOrder: 2 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 &2166095880114612662 +--- !u!222 &360475752 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2166095880114612661} + m_GameObject: {fileID: 360475749} m_CullTransparentMesh: 1 ---- !u!114 &7717878532810368556 +--- !u!114 &360475751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2166095880114612661} + m_GameObject: {fileID: 360475749} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f1382539f3296aa47b7e2d7f269f9007, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EquipTemplate: {fileID: 7717878531945168385} - m_EquipGrid: {fileID: 5968017217576072031} ---- !u!1 &4235692083465093350 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5567416378235391546} - - component: {fileID: 7717878531945168385} - m_Layer: 5 - m_Name: EquipTemplate - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5567416378235391546 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4235692083465093350} - 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: 7777673960576313765} - - {fileID: 7717878531210855632} - m_Father: {fileID: 3449313608950777208} - 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: 0, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0, y: 1} ---- !u!114 &7717878531945168385 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4235692083465093350} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83ab90093bb5312428311a589a4fe90f, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - Image_Icon: {fileID: 1018679542609155544} - Image_CD: {fileID: 7717878531210855635} ---- !u!1 &6067553246905428835 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3449313608950777208} - m_Layer: 5 - m_Name: Root - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3449313608950777208 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6067553246905428835} - 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: 5567416378235391546} - - {fileID: 7211516958917376634} - m_Father: {fileID: 2166095880114612660} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.83176523} - m_AnchorMax: {x: 0.4, y: 0.8987004} - m_AnchoredPosition: {x: 18, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!1 &7211516958917376633 + m_Material: {fileID: 0} + m_Color: {r: 0.19188325, g: 0.2673993, b: 0.8301887, 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: 899f0bb9c626be04390cd94aecead58b, 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 &911567325 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -238,9 +178,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7211516958917376634} - - component: {fileID: 5968017217576072031} - - component: {fileID: 7409282789047240016} + - component: {fileID: 911567326} + - component: {fileID: 3947084554722189563} + - component: {fileID: 200263981594531572} m_Layer: 5 m_Name: Grid m_TagString: Untagged @@ -248,18 +188,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7211516958917376634 +--- !u!224 &911567326 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7211516958917376633} + m_GameObject: {fileID: 911567325} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3449313608950777208} + m_Father: {fileID: 5461203906984040156} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -267,25 +207,25 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -0.000015258789, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5968017217576072031 +--- !u!114 &3947084554722189563 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7211516958917376633} + m_GameObject: {fileID: 911567325} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4dbae61f498dde342a95489aca8ff68c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7409282789047240016 +--- !u!114 &200263981594531572 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7211516958917376633} + m_GameObject: {fileID: 911567325} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} @@ -296,7 +236,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 2 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -305,7 +245,7 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &7717878531210855633 +--- !u!1 &2036552918 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -313,57 +253,57 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7717878531210855632} - - component: {fileID: 7717878531210855634} - - component: {fileID: 7717878531210855635} + - component: {fileID: 2036552919} + - component: {fileID: 2036552921} + - component: {fileID: 2036552920} m_Layer: 5 - m_Name: Image_CD + m_Name: Image_Use m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7717878531210855632 +--- !u!224 &2036552919 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7717878531210855633} + m_GameObject: {fileID: 2036552918} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5567416378235391546} + m_Father: {fileID: 2978880214148668830} m_RootOrder: 1 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 &7717878531210855634 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.010000229, y: -2.02} + m_SizeDelta: {x: 35.09, y: 35.884} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2036552921 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7717878531210855633} + m_GameObject: {fileID: 2036552918} m_CullTransparentMesh: 1 ---- !u!114 &7717878531210855635 +--- !u!114 &2036552920 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7717878531210855633} + m_GameObject: {fileID: 2036552918} 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.13333334} + m_Color: {r: 1, g: 1, b: 1, a: 0.33333334} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -375,12 +315,12 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 1 - m_FillAmount: 1 + m_FillAmount: 0 m_FillClockwise: 1 - m_FillOrigin: 1 + m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8650906820126748474 +--- !u!1 &2025007520569130142 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -388,10 +328,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2164190173218440156} - - component: {fileID: 6544778234947663160} - - component: {fileID: 1018679542609155544} - - component: {fileID: 304131722135525436} + - component: {fileID: 8799131009086869624} + - component: {fileID: 4523810121954862748} + - component: {fileID: 7653700247146841724} + - component: {fileID: 6929925230626081688} m_Layer: 5 m_Name: Icon_Item m_TagString: Untagged @@ -399,40 +339,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2164190173218440156 +--- !u!224 &8799131009086869624 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650906820126748474} + m_GameObject: {fileID: 2025007520569130142} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7777673960576313765} + m_Father: {fileID: 1151704573595367937} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.20401001, y: 0.16799927} + m_AnchoredPosition: {x: -0.20400047, y: 0.16799927} m_SizeDelta: {x: -5.855, y: -5.927} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6544778234947663160 +--- !u!222 &4523810121954862748 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650906820126748474} + m_GameObject: {fileID: 2025007520569130142} m_CullTransparentMesh: 1 ---- !u!114 &1018679542609155544 +--- !u!114 &7653700247146841724 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650906820126748474} + m_GameObject: {fileID: 2025007520569130142} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -446,7 +386,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e1b736de4152d434d8fb757fac16f223, type: 3} + m_Sprite: {fileID: 21300000, guid: 54562072a24f4294ab8c6d1ff34e989d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -456,13 +396,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &304131722135525436 +--- !u!114 &6929925230626081688 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8650906820126748474} + m_GameObject: {fileID: 2025007520569130142} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -496,7 +436,241 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1018679542609155544} + m_TargetGraphic: {fileID: 7653700247146841724} m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3467828821447424199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5461203906984040156} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5461203906984040156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3467828821447424199} + 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: 2978880214148668830} + - {fileID: 911567326} + - {fileID: 285246677} + m_Father: {fileID: 8798891066935212560} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.65141463, y: 0.9227778} + m_AnchorMax: {x: 1, y: 0.9710001} + m_AnchoredPosition: {x: -18, y: -11} + m_SizeDelta: {x: 0.000061035156, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!1 &6835417453803328322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2978880214148668830} + - component: {fileID: 1892896074} + m_Layer: 5 + m_Name: ItemTemplate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2978880214148668830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6835417453803328322} + 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: 1151704573595367937} + - {fileID: 2036552919} + - {fileID: 360475750} + m_Father: {fileID: 5461203906984040156} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1892896074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6835417453803328322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 677576640bb11e34e961b72e3c139f6a, type: 3} + m_Name: + m_EditorClassIdentifier: + Image_Icon: {fileID: 7653700247146841724} + Image_SelectBg: {fileID: 360475751} + Image_Use: {fileID: 2036552920} +--- !u!1 &7384409151774236384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1151704573595367937} + - component: {fileID: 7057559090671693336} + m_Layer: 5 + m_Name: Button_Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1151704573595367937 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384409151774236384} + 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: 8799131009086869624} + m_Father: {fileID: 2978880214148668830} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7057559090671693336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7384409151774236384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + 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: 1, g: 0, b: 0, 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: 7653700247146841724} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8798891066935212561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8798891066935212560} + - component: {fileID: 8798891066935212562} + - component: {fileID: 8798891066935212563} + m_Layer: 5 + m_Name: PanelItemBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8798891066935212560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8798891066935212561} + 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: 5461203906984040156} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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 &8798891066935212562 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8798891066935212561} + m_CullTransparentMesh: 1 +--- !u!114 &8798891066935212563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8798891066935212561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3e9f15745561dd4f9119ac8f893dbfc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ItemTempalte: {fileID: 1892896074} + m_ItemGrid: {fileID: 3947084554722189563} + m_TextName: {fileID: 285246679} diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelDecorationBar.prefab.meta b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelPropBar.prefab.meta index 538ef3a..4ed8adb 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelDecorationBar.prefab.meta +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelPropBar.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 385d08ea764f1cf4a951094951320e98 +guid: 1e52c0598e232ad479614af52e305eb7 PrefabImporter: externalObjects: {} userData: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab index 18acb13..0dae81b 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab @@ -1305,7 +1305,7 @@ GameObject: - component: {fileID: 4914265009318610032} - component: {fileID: 1323087931109695763} m_Layer: 5 - m_Name: Root_Decoration + m_Name: Root_Item m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1344,8 +1344,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d41adc469fe729a488b68790c33b6856, type: 3} m_Name: m_EditorClassIdentifier: - m_DecorationTemplate: {fileID: 3489816292168880914} - m_DecorationGrid: {fileID: 4124801948345348695} + m_ItemTemplate: {fileID: 3489816292168880914} + m_ItemGrid: {fileID: 4124801948345348695} --- !u!1 &5846980789188739566 GameObject: m_ObjectHideFlags: 0 @@ -1357,7 +1357,7 @@ GameObject: - component: {fileID: 2787721831540739890} - component: {fileID: 3489816292168880914} m_Layer: 5 - m_Name: DecorationTemplate + m_Name: ItemTemplate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1539,4 +1539,4 @@ MonoBehaviour: m_EditorClassIdentifier: m_WeaponBar: {fileID: 696148772594564389} m_PropBar: {fileID: 1336027010569382835} - m_DecorationBar: {fileID: 1323087931109695763} + m_ItemBar: {fileID: 1323087931109695763} diff --git a/SurvivalTest/Assets/Scenes/UIEditScene.unity b/SurvivalTest/Assets/Scenes/UIEditScene.unity index d947f78..f7a06ce 100644 --- a/SurvivalTest/Assets/Scenes/UIEditScene.unity +++ b/SurvivalTest/Assets/Scenes/UIEditScene.unity @@ -215,7 +215,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1483248238} - - {fileID: 602242366} - {fileID: 377736797} - {fileID: 1305071187953809465} - {fileID: 8956013319459067295} @@ -340,7 +339,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8436628705391075521, guid: 6f8f312a90e5b264eb2db0c1bf204471, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8436628705391075521, guid: 6f8f312a90e5b264eb2db0c1bf204471, type: 3} propertyPath: m_AnchorMax.x @@ -421,112 +420,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8436628705391075521, guid: 6f8f312a90e5b264eb2db0c1bf204471, type: 3} m_PrefabInstance: {fileID: 377736796} m_PrefabAsset: {fileID: 0} ---- !u!1001 &602242365 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 302779389} - m_Modifications: - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212561, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_Name - value: PanelItemBar - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212561, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} ---- !u!224 &602242366 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - m_PrefabInstance: {fileID: 602242365} - m_PrefabAsset: {fileID: 0} --- !u!224 &642081543 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1765710737091365530, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3} @@ -721,7 +614,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8494652252006705340, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8494652252006705340, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3} propertyPath: m_AnchorMax.x @@ -818,7 +711,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2166095880114612660, guid: 385d08ea764f1cf4a951094951320e98, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2166095880114612660, guid: 385d08ea764f1cf4a951094951320e98, type: 3} propertyPath: m_AnchorMax.x @@ -928,7 +821,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1765710737091365530, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1765710737091365530, guid: f7e86ba455ca20d4a940269f96b2a62b, type: 3} propertyPath: m_AnchorMax.x diff --git a/SurvivalTest/Assets/Scripts/Decorations.meta b/SurvivalTest/Assets/Scripts/Decorations.meta deleted file mode 100644 index 8c9736b..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aa2a546ebc805a349adf837fc40a8b9d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs deleted file mode 100644 index 0d1a22c..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Decoration_DefenseGem : Decoration_GemBase -{ - - -} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta deleted file mode 100644 index 0fdc4ea..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 82650d48a9bafb2408e00ff6cdceeb0a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta deleted file mode 100644 index 0991538..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 96a5f4ce988299c4683d64b3b8d41852 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta deleted file mode 100644 index 4aa051e..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: be6aa712c77087d49b88c1479d98b2b0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta deleted file mode 100644 index 1f7bbcf..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ade20bcdbc8fee54fb992733a6d123c9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta deleted file mode 100644 index b9de910..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f800d56501978e247896b4a3b4978f5f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta deleted file mode 100644 index 2050c65..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 84a4837fdcbd630499d11e34e6b51f9a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta deleted file mode 100644 index 469d520..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6a4dc5304fcb7fd4eaceaa9f31ec491b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta deleted file mode 100644 index 54f130e..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b364714184a532a49b5aaaea6d1518a5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta deleted file mode 100644 index 1dc4d34..0000000 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1c73c7e0a378c30408a7f06bb38bf06f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs index 0a7c735..7e4414f 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs @@ -5,7 +5,7 @@ using UnityEngine; /// <summary> /// 饰品，加BUFF /// </summary> -public class DecorationBase : MonoBehaviour +public class ItemBase : MonoBehaviour { public virtual string name { get; } diff --git a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta index 9f1912a..97b7e17 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/DecorationBase.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 72da216a6b7eca344bbc15fbae26c2a3 +guid: a1be6fd9c07374849acc8fe23dd6a6d0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs index e8814cd..faac345 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs @@ -2,10 +2,10 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_Battery : DecorationBase +public class Item_Battery : ItemBase { public override string name => "电池"; - public override string iconPath => "art/ui/decoration/battery"; + public override string iconPath => "art/ui/item/battery"; }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta index ab1ca1d..5459bc3 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/Item_Battery.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18bc88c977364ba4db2e0b1499a839be +guid: b3cc389af6c83cc4990afa7a15169ebb MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs index 5f156b1..1421a35 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs @@ -5,7 +5,7 @@ using UnityEngine; /// <summary> /// 靴子 /// </summary> -public class Decoration_Boot : DecorationBase +public class Item_Boot : ItemBase { diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta index 4a2bc5b..58f7961 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Boot.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/Item_Boot.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ebcc96daf380bd8468f21598f8b9ce2d +guid: 673b04089a9020146b93e2cfbf2aa451 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs index 6d701f7..dd347d4 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_GemBase.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs @@ -2,8 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_GemBase : DecorationBase +public class Item_DefenseGem : Item_GemBase { -}
\ No newline at end of file +} diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta index c0964a1..308130f 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_DefenseGem.cs.meta +++ b/SurvivalTest/Assets/Scripts/Items/Item_DefenseGem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 88a39027075cea64198761d1c8d0dd02 +guid: 215f309cc57670748802ed791345978b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs index 536fa98..6e68b47 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LifeGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_LifeGem : Decoration_GemBase +public class Item_GemBase : ItemBase { diff --git a/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta new file mode 100644 index 0000000..3921dec --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_GemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 531f0bb50cd7dc745be6198b52db7e08 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs index 78192e2..6092267 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Horn.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs @@ -5,10 +5,10 @@ using UnityEngine; /// <summary> /// 兽角，提升攻击力 /// </summary> -public class Decoration_Horn : DecorationBase +public class Item_Horn : ItemBase { public override string name => "角"; - public override string iconPath => "art/ui/decoration/horn"; + public override string iconPath => "art/ui/item/horn"; } diff --git a/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta new file mode 100644 index 0000000..f6e3e67 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_Horn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d0c00302d35eaad48b79578b5ea49663 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs index e72d73b..8d14bb5 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs @@ -2,7 +2,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_PowerGem : Decoration_GemBase +public class Item_LifeGem : Item_GemBase { + }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta new file mode 100644 index 0000000..24d77dd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_LifeGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bf53a4fbb29d85548a1a8b2408ea1df3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs index 3d684d3..b56e126 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SpeedGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_SpeedGem : Decoration_GemBase +public class Item_LuckyGem : Item_GemBase { } diff --git a/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta new file mode 100644 index 0000000..ce72016 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_LuckyGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c164cdc0c77616d4ba76be4d01664726 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs index fe1868e..512b598 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_MystreyMask.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs @@ -5,10 +5,10 @@ using UnityEngine; /// <summary> /// 神秘面罩 /// </summary> -public class Decoration_MystreyMask : DecorationBase +public class Item_MystreyMask : ItemBase { public override string name => "神秘面罩"; - public override string iconPath => "art/ui/decoration/mestry_mask"; + public override string iconPath => "art/ui/item/mestry_mask"; } diff --git a/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta new file mode 100644 index 0000000..3fa40a2 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_MystreyMask.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 704898a642a3a474daf48137329f9b88 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs new file mode 100644 index 0000000..3dc811b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Item_PowerGem : Item_GemBase +{ + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta new file mode 100644 index 0000000..2d4b9d9 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 46ca2a019c35e664c8b21a4e6563b55f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs index 79befce..b796103 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_PowerRing.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs @@ -5,11 +5,11 @@ using UnityEngine; /// <summary> /// 力量戒指 /// </summary> -public class Decoration_PowerRing : DecorationBase +public class Item_PowerRing : ItemBase { public override string name => "力量戒指"; - public override string iconPath => "art/ui/decoration/power_ring"; + public override string iconPath => "art/ui/item/power_ring"; } diff --git a/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta new file mode 100644 index 0000000..9350060 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_PowerRing.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8b03b0571c4901a40a17868bb8407018 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs index 3c0c8f4..2da6cf6 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_LuckyGem.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Decoration_LuckyGem : Decoration_GemBase +public class Item_SpeedGem : Item_GemBase { } diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta new file mode 100644 index 0000000..c0554a5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpeedGem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ee66876f85cc1924ea6f70b9a0e30786 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs index 1ebb021..788126b 100644 --- a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs @@ -5,11 +5,11 @@ using UnityEngine; /// <summary> /// 剑谱，持有之后按照招式舞动会有剑气等附加效果 /// </summary> -public class Decoration_SwordSpectrum : DecorationBase +public class Item_SwordSpectrum : ItemBase { public override string name => "剑术大师的剑谱"; - public override string iconPath => "art/ui/decoration/spectrum"; + public override string iconPath => "art/ui/item/spectrum"; }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta new file mode 100644 index 0000000..96ff438 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Items/Item_SwordSpectrum.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ac49f77645545340826633e01e49126 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index ce27739..9bb3f87 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -12,7 +12,7 @@ public partial class PlayerManager : Singleton<PlayerManager> { InitProps(); InitWeapons(); - InitDecorations(); + InitItems(); } public void Update() @@ -21,7 +21,7 @@ public partial class PlayerManager : Singleton<PlayerManager> UpdateProps(); UpdateWeapons(); - UpdateDecorations(); + UpdateItems(); } public void SetCrew(CrewScript crew) diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs deleted file mode 100644 index ea4ba78..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - - -public partial class PlayerManager : Singleton<PlayerManager> -{ - // 当前饰品 - public List<DecorationBase> decorations { get { return m_Decorations; } } - private List<DecorationBase> m_Decorations = new List<DecorationBase>(); - - - void InitDecorations() - { - m_Decorations.Add(new Decoration_MystreyMask()); - m_Decorations.Add(new Decoration_PowerRing()); - m_Decorations.Add(new Decoration_Horn()); - m_Decorations.Add(new Decoration_Battery()); - m_Decorations.Add(new Decoration_SwordSpectrum()); - } - - void UpdateDecorations() - { - - } -}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta deleted file mode 100644 index 3cc2dc3..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6f2b538b1ec21a548b41fe478e5b3bd3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs new file mode 100644 index 0000000..6ee4969 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +public partial class PlayerManager : Singleton<PlayerManager> +{ + // 当前饰品 + public List<ItemBase> items { get { return m_Items; } } + private List<ItemBase> m_Items = new List<ItemBase>(); + + + void InitItems() + { + m_Items.Add(new Item_MystreyMask()); + m_Items.Add(new Item_PowerRing()); + m_Items.Add(new Item_Horn()); + m_Items.Add(new Item_Battery()); + m_Items.Add(new Item_SwordSpectrum()); + } + + void UpdateItems() + { + + } +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta new file mode 100644 index 0000000..c0307e5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b31f1faa8e2c6a4085213ca15e56220 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs deleted file mode 100644 index c9d9312..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public struct UIDecorationWidgetParam -{ - public DecorationBase decoration; -} - -public class UIDecorationWidget : UIGridPropBase -{ - public Image Image_Icon; - - public DecorationBase decoration { get { return m_Decoration; } } - private DecorationBase m_Decoration; - - public override void Set(object param) - { - UIDecorationWidgetParam info = (UIDecorationWidgetParam)param; - m_Decoration = info.decoration; - - Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.decoration.iconPath); - } - - private void Update() - { - } - -}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta index 01fa061..01fa061 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar.meta diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs new file mode 100644 index 0000000..0f9d623 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public struct UIItemWidgetParam +{ + public ItemBase item; +} + +public class UIItemWidget : UIGridPropBase +{ + public Image Image_Icon; + + public ItemBase item { get { return m_Item; } } + private ItemBase m_Item; + + public override void Set(object param) + { + UIItemWidgetParam info = (UIItemWidgetParam)param; + m_Item = info.item; + + Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.item.iconPath); + } + + private void Update() + { + } + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta index 893e695..893e695 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelDecorationBar/UIDecorationWidget.cs.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/UIItemWidget.cs.meta diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs index 98ff288..c523152 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs @@ -6,12 +6,12 @@ public class PanelTopStuffBar : PanelBase { public UIWeaponBar m_WeaponBar; public UIPropBar m_PropBar; - public UIDecorationBar m_DecorationBar; + public UIItemBar m_ItemBar; public override void Set(object param) { m_WeaponBar.Set(); m_PropBar.Set(); - m_DecorationBar.Set(); + m_ItemBar.Set(); } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs deleted file mode 100644 index 6dce384..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UIDecorationBar : MonoBehaviour -{ - public UIDecorationWidget m_DecorationTemplate; - - public UISimpleGrid m_DecorationGrid; - - private List<UIDecorationWidget> m_Decorations = new List<UIDecorationWidget>(); - - public void Set() - { - m_DecorationTemplate.gameObject.SetActive(false); - - for (int i = 0; i < PlayerManager.Instance.decorations.Count; ++i) - { - UIDecorationWidget widget = MakeDecorationWidget(PlayerManager.Instance.decorations[i]); - m_Decorations.Add(widget); - } - } - - UIDecorationWidget MakeDecorationWidget(DecorationBase decoration) - { - UIDecorationWidget widget = Instantiate<UIDecorationWidget>(m_DecorationTemplate); - widget.transform.SetParent(m_DecorationGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0); -#if UNITY_EDITOR - widget.name = "decoration (" + decoration.name + ")"; -#endif - - UIDecorationWidgetParam param = new UIDecorationWidgetParam(); - param.decoration = decoration; - widget.Set(param); - return widget; - } - - - -}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs new file mode 100644 index 0000000..1269c0a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIItemBar : MonoBehaviour +{ + public UIItemWidget m_ItemTemplate; + + public UISimpleGrid m_ItemGrid; + + private List<UIItemWidget> m_Items = new List<UIItemWidget>(); + + public void Set() + { + m_ItemTemplate.gameObject.SetActive(false); + + for (int i = 0; i < PlayerManager.Instance.items.Count; ++i) + { + UIItemWidget widget = MakeItemWidget(PlayerManager.Instance.items[i]); + m_Items.Add(widget); + } + } + + UIItemWidget MakeItemWidget(ItemBase item) + { + UIItemWidget widget = Instantiate<UIItemWidget>(m_ItemTemplate); + widget.transform.SetParent(m_ItemGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "item (" + item.name + ")"; +#endif + + UIItemWidgetParam param = new UIItemWidgetParam(); + param.item = item; + widget.Set(param); + return widget; + } + + + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta index ac771c3..ac771c3 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIDecorationBar.cs.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIItemBar.cs.meta |
