diff options
Diffstat (limited to 'SurvivalTest/Assets/Resources')
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/common/select_prop_bg.png (renamed from SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png) | bin | 1183 -> 1183 bytes | |||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/common/select_prop_bg.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png.meta) | 2 | ||||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon.meta | 8 | ||||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon/nuclear_bomb.png (renamed from SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png) | bin | 6126 -> 6126 bytes | |||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon/nuclear_bomb.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta) | 0 | ||||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon/plane.png (renamed from SurvivalTest/Assets/Resources/Art/ui/itemicon/plane.png) | bin | 6329 -> 6329 bytes | |||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon/plane.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/itemicon/plane.png.meta) | 0 | ||||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon/space_beamer.png (renamed from SurvivalTest/Assets/Resources/Art/ui/itemicon/space_beamer.png) | bin | 6553 -> 6553 bytes | |||
-rw-r--r-- | SurvivalTest/Assets/Resources/Art/ui/propicon/space_beamer.png.meta (renamed from SurvivalTest/Assets/Resources/Art/ui/itemicon/space_beamer.png.meta) | 0 | ||||
-rw-r--r-- | SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab | 18 |
10 files changed, 18 insertions, 10 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png b/SurvivalTest/Assets/Resources/Art/ui/common/select_prop_bg.png Binary files differindex 7668f87..7668f87 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png +++ b/SurvivalTest/Assets/Resources/Art/ui/common/select_prop_bg.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png.meta b/SurvivalTest/Assets/Resources/Art/ui/common/select_prop_bg.png.meta index b17ce05..e84aaf7 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/common/select_prop_bg.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 899f0bb9c626be04390cd94aecead58b +guid: 8630c8ae104e08c428e33792d22ac023 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/SurvivalTest/Assets/Resources/Art/ui/propicon.meta b/SurvivalTest/Assets/Resources/Art/ui/propicon.meta new file mode 100644 index 0000000..b7cb295 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f73132da31336fe49b91b42adb23933e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png b/SurvivalTest/Assets/Resources/Art/ui/propicon/nuclear_bomb.png Binary files differindex 68fa345..68fa345 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon/nuclear_bomb.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta b/SurvivalTest/Assets/Resources/Art/ui/propicon/nuclear_bomb.png.meta index 53f3b74..53f3b74 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon/nuclear_bomb.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon/nuclear_bomb.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/plane.png b/SurvivalTest/Assets/Resources/Art/ui/propicon/plane.png Binary files differindex c558407..c558407 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon/plane.png +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon/plane.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/plane.png.meta b/SurvivalTest/Assets/Resources/Art/ui/propicon/plane.png.meta index 740a92d..740a92d 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon/plane.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon/plane.png.meta diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/space_beamer.png b/SurvivalTest/Assets/Resources/Art/ui/propicon/space_beamer.png Binary files differindex 2b61d5b..2b61d5b 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon/space_beamer.png +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon/space_beamer.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/itemicon/space_beamer.png.meta b/SurvivalTest/Assets/Resources/Art/ui/propicon/space_beamer.png.meta index c5581ad..c5581ad 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/itemicon/space_beamer.png.meta +++ b/SurvivalTest/Assets/Resources/Art/ui/propicon/space_beamer.png.meta diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab index 65d34ed..18acb13 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab @@ -129,9 +129,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 184174568} - - component: {fileID: 184174569} + - component: {fileID: 696148772594564393} m_Layer: 5 - m_Name: ItemTemplate + m_Name: PropTemplate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -159,7 +159,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 1, y: 1} ---- !u!114 &184174569 +--- !u!114 &696148772594564393 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -168,7 +168,7 @@ MonoBehaviour: m_GameObject: {fileID: 184174567} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 677576640bb11e34e961b72e3c139f6a, type: 3} + m_Script: {fileID: 11500000, guid: 4ccf65ebe78138644a8bc5283d21ae1a, type: 3} m_Name: m_EditorClassIdentifier: Image_Icon: {fileID: 81451859} @@ -387,7 +387,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 899f0bb9c626be04390cd94aecead58b, type: 3} + m_Sprite: {fileID: 21300000, guid: 8630c8ae104e08c428e33792d22ac023, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -981,7 +981,7 @@ GameObject: - component: {fileID: 1986034769} - component: {fileID: 1336027010569382835} m_Layer: 5 - m_Name: Root_Item + m_Name: Root_Prop m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1021,8 +1021,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b480696215d6c2a4b8d69edc2946cf3d, type: 3} m_Name: m_EditorClassIdentifier: - m_ItemTempalte: {fileID: 184174569} - m_ItemGrid: {fileID: 710832701} + m_PropTempalte: {fileID: 696148772594564393} + m_PropGrid: {fileID: 710832701} m_TextName: {fileID: 1482618826} --- !u!1 &1996007142 GameObject: @@ -1538,5 +1538,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_WeaponBar: {fileID: 696148772594564389} - m_ItemBar: {fileID: 1336027010569382835} + m_PropBar: {fileID: 1336027010569382835} m_DecorationBar: {fileID: 1323087931109695763} |