diff options
46 files changed, 1248 insertions, 391 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/common.meta b/SurvivalTest/Assets/Resources/Art/ui/common.meta new file mode 100644 index 0000000..f88fc76 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 692753d934422a640bc402296d131541 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png b/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png Binary files differnew file mode 100644 index 0000000..30e7384 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png.meta b/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png.meta new file mode 100644 index 0000000..b17ce05 --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/common/select_item_bg.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 899f0bb9c626be04390cd94aecead58b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Art/ui/skillicon/plane.png b/SurvivalTest/Assets/Resources/Art/ui/skillicon/plane.png Binary files differindex 2e8399b..c558407 100644 --- a/SurvivalTest/Assets/Resources/Art/ui/skillicon/plane.png +++ b/SurvivalTest/Assets/Resources/Art/ui/skillicon/plane.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/skillicon/space_beamer.png b/SurvivalTest/Assets/Resources/Art/ui/skillicon/space_beamer.png Binary files differnew file mode 100644 index 0000000..2b61d5b --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/skillicon/space_beamer.png diff --git a/SurvivalTest/Assets/Resources/Art/ui/skillicon/space_beamer.png.meta b/SurvivalTest/Assets/Resources/Art/ui/skillicon/space_beamer.png.meta new file mode 100644 index 0000000..c5581ad --- /dev/null +++ b/SurvivalTest/Assets/Resources/Art/ui/skillicon/space_beamer.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 497ae29a68be7134b9f09804731f7922 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelItemBar.prefab index 976f1e6..220f1a9 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 &1686675600 +--- !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: 1686675601} - - component: {fileID: 1686675602} + - 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 &1686675601 +--- !u!224 &285246677 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686675600} + 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: 1756575940} - m_Father: {fileID: 1847581502} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 5461203906984040156} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0005188, y: 0.00010681} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1686675602 + m_AnchorMin: {x: 1, y: 1} + 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 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1686675600} + 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: 3 - 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: 0.78431374, g: 0.78431374, b: 0.78431374, 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: 1756575942} - 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 &1756575939 + 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,65 +103,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1756575940} - - component: {fileID: 1756575943} - - component: {fileID: 1756575942} - - component: {fileID: 1756575941} + - component: {fileID: 360475750} + - component: {fileID: 360475752} + - component: {fileID: 360475751} m_Layer: 5 - m_Name: Icon_Item + m_Name: Image_SelectBg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1756575940 +--- !u!224 &360475750 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756575939} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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: [] - m_Father: {fileID: 1686675601} - m_RootOrder: 0 + m_Father: {fileID: 2978880214148668830} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1756575943 +--- !u!222 &360475752 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756575939} + m_GameObject: {fileID: 360475749} m_CullTransparentMesh: 1 ---- !u!114 &1756575942 +--- !u!114 &360475751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756575939} + m_GameObject: {fileID: 360475749} 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: 1} + m_Color: {r: 0.8301887, g: 0.11356357, b: 0.11356357, 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: 54562072a24f4294ab8c6d1ff34e989d, type: 3} + m_Sprite: {fileID: 21300000, guid: 899f0bb9c626be04390cd94aecead58b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -157,51 +170,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1756575941 +--- !u!1 &911567325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 911567326} + - component: {fileID: 3947084554722189563} + - component: {fileID: 200263981594531572} + m_Layer: 5 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &911567326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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: 5461203906984040156} + 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.000015258789, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3947084554722189563 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756575939} + m_GameObject: {fileID: 911567325} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 4dbae61f498dde342a95489aca8ff68c, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 1 - 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: 0.78431374, g: 0.78431374, b: 0.78431374, 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: 1756575942} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1847581501 +--- !u!114 &200263981594531572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 911567325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 15 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &2036552918 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -209,47 +253,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1847581502} - - component: {fileID: 1847581503} + - component: {fileID: 2036552919} + - component: {fileID: 2036552921} + - component: {fileID: 2036552920} m_Layer: 5 - m_Name: ItemTemplate (1) + m_Name: Image_Use m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1847581502 +--- !u!224 &2036552919 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847581501} + 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: - - {fileID: 1686675601} - m_Father: {fileID: 8798891066935212560} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 2978880214148668830} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 357.2, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1847581503 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.25006104, y: -2.73} + m_SizeDelta: {x: 44.02, y: 44.36} + 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: 2036552918} + m_CullTransparentMesh: 1 +--- !u!114 &2036552920 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1847581501} + m_GameObject: {fileID: 2036552918} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f54f49e0edb6d0849899dd37c0c02990, type: 3} + 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_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: be5e635b9d3d6f542ad447f7ae74d785, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2025007520569130142 GameObject: m_ObjectHideFlags: 0 @@ -283,10 +353,10 @@ RectTransform: m_Father: {fileID: 1151704573595367937} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + 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 &4523810121954862748 CanvasRenderer: @@ -370,6 +440,44 @@ MonoBehaviour: 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 @@ -379,14 +487,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2978880214148668830} - - component: {fileID: 8798891068732533031} + - component: {fileID: 1892896074} m_Layer: 5 m_Name: ItemTemplate m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2978880214148668830 RectTransform: m_ObjectHideFlags: 0 @@ -394,20 +502,22 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6835417453803328322} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1151704573595367937} - m_Father: {fileID: 8798891066935212560} + - {fileID: 360475750} + - {fileID: 2036552919} + m_Father: {fileID: 5461203906984040156} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 435, y: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8798891068732533031 + m_Pivot: {x: 1, y: 1} +--- !u!114 &1892896074 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -416,9 +526,12 @@ MonoBehaviour: m_GameObject: {fileID: 6835417453803328322} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f54f49e0edb6d0849899dd37c0c02990, type: 3} + 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 @@ -451,10 +564,10 @@ RectTransform: m_Father: {fileID: 2978880214148668830} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0005188, y: 0.00010681} - m_SizeDelta: {x: 50, y: 50} + 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: @@ -469,7 +582,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -529,8 +642,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2978880214148668830} - - {fileID: 1847581502} + - {fileID: 5461203906984040156} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -559,3 +671,6 @@ MonoBehaviour: 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/PanelLevelBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelLevelBar.prefab index 02c1953..2694032 100644 --- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelLevelBar.prefab +++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelLevelBar.prefab @@ -1,5 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2453258651063109282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9203668323792284000} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9203668323792284000 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2453258651063109282} + 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: 5053551693990196168} + - {fileID: 5053551693411879010} + m_Father: {fileID: 5053551695217443173} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.97} + 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!1 &5053551693411879009 GameObject: m_ObjectHideFlags: 0 @@ -29,14 +66,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5053551695217443173} + m_Father: {fileID: 9203668323792284000} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 17.199951, y: 0.000061035156} - m_SizeDelta: {x: 160, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.00024414062, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5053551693411879020 CanvasRenderer: m_ObjectHideFlags: 0 @@ -67,14 +104,14 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 15 m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 3 m_AlignByGeometry: 0 - m_RichText: 1 + m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 @@ -108,14 +145,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5053551695217443173} + m_Father: {fileID: 9203668323792284000} 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.00012207031} - m_SizeDelta: {x: -667.99, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -0.00024414062, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5053551693990196170 CanvasRenderer: m_ObjectHideFlags: 0 @@ -164,7 +201,6 @@ GameObject: m_Component: - component: {fileID: 5053551695217443173} - component: {fileID: 5053551695217443175} - - component: {fileID: 5053551695217443174} - component: {fileID: 5053551695217443168} m_Layer: 5 m_Name: PanelLevelBar @@ -184,8 +220,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5053551693990196168} - - {fileID: 5053551693411879010} + - {fileID: 9203668323792284000} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -202,36 +237,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5053551695217443172} m_CullTransparentMesh: 1 ---- !u!114 &5053551695217443174 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5053551695217443172} - 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.4056604, g: 0.31492344, b: 0.10524209, 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: be5e635b9d3d6f542ad447f7ae74d785, 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!114 &5053551695217443168 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity b/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity index 3bdfefd..0bbf5d8 100644 --- a/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity +++ b/SurvivalTest/Assets/Resources/Scenes/6_PixelCanvas 1.unity @@ -1311,6 +1311,112 @@ MonoBehaviour: m_Shadow: {fileID: 0} m_Coord: {x: 0, y: 0, z: 0} m_Height: 0 +--- !u!1001 &787820389 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1127821130} + 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 &787820390 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} + m_PrefabInstance: {fileID: 787820389} + m_PrefabAsset: {fileID: 0} --- !u!1 &794956711 GameObject: m_ObjectHideFlags: 0 @@ -1833,6 +1939,7 @@ GameObject: - component: {fileID: 1127821129} - component: {fileID: 1127821128} - component: {fileID: 1127821127} + - component: {fileID: 1127821131} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1913,7 +2020,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1523503809} - - {fileID: 1999573813} + - {fileID: 787820390} m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1922,6 +2029,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1127821131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1127821126} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 097b021f29d7fc8468055a35bbc92ca8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1179934516 GameObject: m_ObjectHideFlags: 0 @@ -3804,11 +3923,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!224 &1999573813 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - m_PrefabInstance: {fileID: 8798891068732533029} - m_PrefabAsset: {fileID: 0} --- !u!1 &2099529917 GameObject: m_ObjectHideFlags: 0 @@ -4022,41 +4136,17 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1127821130} m_Modifications: - - target: {fileID: 5053551693411879010, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} - propertyPath: m_AnchoredPosition.x - value: 17.199646 - objectReference: {fileID: 0} - - target: {fileID: 5053551693411879010, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.0000667572 - objectReference: {fileID: 0} - - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} - propertyPath: m_FontData.m_BestFit - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} - propertyPath: m_FontData.m_MinSize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} - propertyPath: m_FontData.m_FontSize - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 5053551693411879011, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} - propertyPath: m_FontData.m_RichText - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5053551695217443172, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_Name value: PanelLevelBar objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_RootOrder @@ -4076,7 +4166,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_AnchorMin.y - value: 0.9777778 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_SizeDelta.x @@ -4084,7 +4174,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_SizeDelta.y - value: -0.5100002 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_LocalPosition.x @@ -4116,7 +4206,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0004272461 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5053551695217443173, guid: 2a06f9fe942aeaf42a71ca82ae5d13d6, type: 3} propertyPath: m_AnchoredPosition.y @@ -4197,104 +4287,3 @@ PrefabInstance: objectReference: {fileID: 976849206} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} ---- !u!1001 &8798891068732533029 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1127821130} - m_Modifications: - - target: {fileID: 7057559090671693336, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_Navigation.m_Mode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_Pivot.y - value: 1 - 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: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_SizeDelta.x - value: 972.61 - objectReference: {fileID: 0} - - target: {fileID: 8798891066935212560, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - 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: -27.999878 - 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} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 302ad0181ac604e46b0a10a9abe687cb, type: 3} diff --git a/SurvivalTest/Assets/Scripts/Devices.meta b/SurvivalTest/Assets/Scripts/Devices.meta new file mode 100644 index 0000000..6a5b0d0 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Devices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4cd3d0fd06d3d949981090c941f9e0f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Devices/DeviceBase.cs b/SurvivalTest/Assets/Scripts/Devices/DeviceBase.cs new file mode 100644 index 0000000..61e347f --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Devices/DeviceBase.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 设备 +/// </summary> +public class DeviceBase : MonoBehaviour +{ + + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Devices/DeviceBase.cs.meta b/SurvivalTest/Assets/Scripts/Devices/DeviceBase.cs.meta new file mode 100644 index 0000000..ba0b4c7 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Devices/DeviceBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b9b9975b634cad43b8e89424dddb2fc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/GameApp.cs b/SurvivalTest/Assets/Scripts/GameApp.cs index d5f9d70..cfc93d9 100644 --- a/SurvivalTest/Assets/Scripts/GameApp.cs +++ b/SurvivalTest/Assets/Scripts/GameApp.cs @@ -8,13 +8,20 @@ public class GameApp : MonoBehaviour void Start() { - + PlayerManager.Instance.Init(); + BattleManager.Instance.Init(); + + } void Update() { + //公共模块 GameLoop.Instance.Update(); TinyCountDown.Instance.Update(); + + BattleManager.Instance.Update(); + PlayerManager.Instance.Update(); } void LateUpdate() diff --git a/SurvivalTest/Assets/Scripts/Items/ItemBase.cs b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs index 91beca8..a19ebcf 100644 --- a/SurvivalTest/Assets/Scripts/Items/ItemBase.cs +++ b/SurvivalTest/Assets/Scripts/Items/ItemBase.cs @@ -8,6 +8,12 @@ using UnityEngine; public abstract class ItemBase { + public abstract string name { get; } + + public abstract string iconPath { get; } + public abstract void OnUse(GameObject owner); + public virtual void Update() { } + }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs index eb870b0..5301d85 100644 --- a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs @@ -7,10 +7,18 @@ using UnityEngine; /// </summary> public class Item_B2Phone : ItemBase { + public override string name => "B2轰炸机"; + + public override string iconPath => "art/ui/skillicon/plane"; + + string prefabPath = "prefabs/weapon/b2"; public override void OnUse(GameObject owner) { + TestB2 b2 = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load<TestB2>(prefabPath)); + Vector3 pos3D = owner.GetComponent<TopDownTransform>().GetProjectedPosition(); + b2.Set(pos3D + new Vector3(-15, 0, 0), pos3D + new Vector3(15, 0, 0), 20f, 3f); } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs index 2ccbb9c..73492ee 100644 --- a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs @@ -4,10 +4,18 @@ using UnityEngine; public class Item_SpaceBeamer : ItemBase { + public override string name => "太空射线"; + + public override string iconPath => "art/ui/skillicon/space_beamer"; + + string prefabPath = "prefabs/weapon/space_beam"; public override void OnUse(GameObject owner) { + TestSpaceBeam beam = UnityEngine.Object.Instantiate<TestSpaceBeam>(ResourceManager.Instance.Load<TestSpaceBeam>(prefabPath)); + Vector3 pos3D = owner.GetComponent<TopDownTransform>().position; + beam.Set(pos3D + new Vector3(3, 0, 0)); } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs new file mode 100644 index 0000000..102bc34 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BattleManager : Singleton<BattleManager> +{ + + public void Init() + { + UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); + } + + public void Update() + { + } + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs.meta b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs.meta new file mode 100644 index 0000000..ce61fdc --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0625fb778ee3237468a8f99fc92c37bd +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 new file mode 100644 index 0000000..59593b0 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public partial class PlayerManager : Singleton<PlayerManager> +{ + + // 角色 + private CrewScript m_Crew; + + // 持有的装备 + public List<EquipBase> equips { get { return m_Equips; } } + private List<EquipBase> m_Equips = new List<EquipBase>(); + + // 持有的饰品 + public List<DecorationBase> decorations { get { return m_Decorations; } } + private List<DecorationBase> m_Decorations = new List<DecorationBase>(); + + public void Init() + { + InitItems(); + + } + + public void Update() + { + UpdateItems(); + } + + public void SetCrew(CrewScript crew) + { + m_Crew = crew; + } + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs.meta new file mode 100644 index 0000000..848ec64 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c2c3da009e0d8114597080ecff2e380c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs new file mode 100644 index 0000000..ce85849 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +public partial class PlayerManager : Singleton<PlayerManager> +{ + + +}
\ 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 new file mode 100644 index 0000000..3cc2dc3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs.meta @@ -0,0 +1,11 @@ +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_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs new file mode 100644 index 0000000..ce85849 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +public partial class PlayerManager : Singleton<PlayerManager> +{ + + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta new file mode 100644 index 0000000..c43b512 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 19dc8d657411e8d47a563a47442d687d +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..a0cfe52 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -0,0 +1,51 @@ +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>(); + + // 当前选中的物品 + ItemBase m_CurrentItem = null; + + void InitItems() + { + m_Items.Add(new Item_B2Phone()); + m_Items.Add(new Item_SpaceBeamer()); + } + + /// <summary> + /// 选中物品 + /// </summary> + public void SetCurrentItem(ItemBase item) + { + if (!items.Contains(item)) + { + Debug.LogError("No such item"); + return; + } + m_CurrentItem = item; + } + + /// <summary> + /// 使用当前道具 + /// </summary> + public void UseCurrentItem() + { + if (m_CurrentItem == null) + return; + + m_CurrentItem.OnUse(m_Crew.gameObject); + } + + void UpdateItems() + { + for(int i = 0; i < items.Count; ++i) + { + items[i].Update(); + } + } +}
\ 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/Resources/ResourceManager.cs b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs index ddd3225..193d8b3 100644 --- a/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs +++ b/SurvivalTest/Assets/Scripts/Resources/ResourceManager.cs @@ -4,7 +4,7 @@ using UnityEngine; public class ResourceManager : Singleton<ResourceManager> { - T Load<T>(string path) where T : UnityEngine.Object + public T Load<T>(string path) where T : UnityEngine.Object { return Resources.Load<T>(path); } diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs index 2a7af2f..033f198 100644 --- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs +++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -public class TestPeaceMaker : MonoBehaviour +public class TestPeaceMaker : CrewScript { [SerializeField] private Transform m_Camera; @@ -16,8 +16,6 @@ public class TestPeaceMaker : MonoBehaviour [SerializeField] private Vector2 m_Zoom; [SerializeField] private GameObject m_LaunchVfx; [SerializeField] private Transform m_LaunchPoint; - [SerializeField] private TestB2 m_B2; - [SerializeField] private TestSpaceBeam m_SpaceBeam; private Vector3 zoomIn { @@ -56,6 +54,11 @@ public class TestPeaceMaker : MonoBehaviour } private ControlMode m_ControlMode; + private void Awake() + { + PlayerManager.Instance.SetCrew(this); + } + void Start() { m_SpriteRenderer = GetComponent<SpriteRenderer>(); @@ -77,9 +80,6 @@ public class TestPeaceMaker : MonoBehaviour bool isFire = Fire(); bool isGrenade = LaunchGrenade(); - bool isBeam = SpaceBeam(); - - CallB2(); CameraFollow(); @@ -290,30 +290,4 @@ public class TestPeaceMaker : MonoBehaviour } } - void CallB2() - { - if(Input.GetButtonDown("Fire3")) - { - TestB2 b2 = Instantiate<TestB2>(m_B2); - - Vector3 pos3D = m_Coord.GetProjectedPosition(); - b2.Set(pos3D + new Vector3(-15, 0,0 ), pos3D + new Vector3(15, 0,0 ), 20f, 3f); - } - } - - bool SpaceBeam() - { - if (Input.GetButtonDown("SpaceBeam")) - { - TestSpaceBeam beam = Instantiate<TestSpaceBeam>(m_SpaceBeam); - - Vector3 pos3D = m_Coord.position; - beam.Set(pos3D + new Vector3(3, 0, 0)); - - TinyCountDown.Instance.Set("SpaceBeam", 0.1f); - return true; - } - return TinyCountDown.Instance.Get("SpaceBeam") > 0; - } - } diff --git a/SurvivalTest/Assets/Scripts/UI/Common/UIGridItemBase.cs b/SurvivalTest/Assets/Scripts/UI/Common/UIGridItemBase.cs new file mode 100644 index 0000000..8e5ff24 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Common/UIGridItemBase.cs @@ -0,0 +1,10 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class UIGridItemBase : MonoBehaviour +{ + + public abstract void Set(object param); + +} diff --git a/SurvivalTest/Assets/Scripts/UI/Common/UIGridItemBase.cs.meta b/SurvivalTest/Assets/Scripts/UI/Common/UIGridItemBase.cs.meta new file mode 100644 index 0000000..a3f1f69 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Common/UIGridItemBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e490364ec1d9c8419f9bece4e2ab365 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs index 3081d97..9d1157c 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelBase.cs @@ -2,26 +2,41 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +[ExecuteInEditMode] [DisallowMultipleComponent] -public class PanelBase : MonoBehaviour +public abstract class PanelBase : MonoBehaviour { - public virtual void Set(object param) + public abstract void Set(object param); + + public virtual void OnEnable() { + InitRectTransform(); } - void Start() - { - - } + public void InitRectTransform() + { + RectTransform rect = gameObject.GetComponent<RectTransform>(); + rect.anchorMin = new Vector2(0, 0); + rect.anchorMax = new Vector2(1, 1); + + rect.localScale = new Vector3(1, 1, 1); + + rect.anchoredPosition3D = Vector3.zero; + + rect.offsetMin = new Vector2(0, 0); + rect.offsetMax = new Vector2(0, 0); - protected virtual void Update() - { - } + rect.pivot = new Vector2(0.5f, 0.5f); + } + + protected virtual void Update() + { + } protected virtual void OnSecondUpdate() { } -} +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs index 61f99e5..dbec362 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs @@ -2,17 +2,9 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class PanelEquipBar : MonoBehaviour +public class PanelEquipBar : PanelBase { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } + public override void Set(object param) + { + } } diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs index 55898f2..552672a 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/ItemWidget.cs @@ -1,9 +1,123 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; -public class ItemWidget : MonoBehaviour +public struct ItemWidgetParam { - + // 主动点击 + public System.Action<ItemWidget> onSelected; + public ItemBase item; +} + +public class ItemWidget : UIGridItemBase +{ + public Image Image_Icon; + public Image Image_SelectBg; + + public Image Image_Use; + + private System.Action<ItemWidget> onSelected; + + public ItemBase item { get { return m_Item; } } + private ItemBase m_Item; + + private Coroutine m_CoUse; + + private int m_PendingUse = 0; + + public void SetSelectBg(bool selected) + { + Image_SelectBg.gameObject.SetActive(selected); + } + + public override void Set(object param) + { + ItemWidgetParam info = (ItemWidgetParam)param; + onSelected = info.onSelected; + m_Item = info.item; + + Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.item.iconPath); + + SetSelectBg(false); + + Image_Use.gameObject.SetActive(false); + } + + public void OnSelectCallback() + { + SetSelectBg(true); + } + + public void OnDeselectCallback() + { + SetSelectBg(false); + } + + public void OnUseCallback() + { + m_PendingUse++; + PlayUseAnimation(); + } + + private void PlayUseAnimation() + { + if (m_CoUse != null) + return; + Image_Use.gameObject.SetActive(true); + m_CoUse = StartCoroutine(CoUseAnimation()); + } + + IEnumerator CoUseAnimation() + { + float speed = 5f; + + while(m_PendingUse > 0) + { + Image_Use.fillOrigin = (int)Image.OriginVertical.Bottom; + float t = 0; + while (true) + { + t += speed * Time.deltaTime; + + if (t > 1) + break; + + Image_Use.fillAmount = Mathf.Lerp(0, 1, t); + + yield return null; + } + + Image_Use.fillOrigin = (int)Image.OriginVertical.Top; + t = 0; + while (true) + { + t += speed * Time.deltaTime; + + if (t > 1) + break; + + Image_Use.fillAmount = Mathf.Lerp(1, 0, t); + + yield return null; + } + m_PendingUse--; + } + + Image_Use.gameObject.SetActive(false); + + m_CoUse = null; + + yield break; + } + + private void StopUseAnimation() + { + if (m_CoUse != null) + { + StopCoroutine(m_CoUse); + } + Image_Use.gameObject.SetActive(false); + } } diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs index 00acafc..74f90c3 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs @@ -1,13 +1,31 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class PanelItemBar : PanelBase { - /// <summary> - /// 当前持有的Items - /// </summary> - public List<ItemWidget> m_Items = new List<ItemWidget>(); + public ItemWidget m_ItemTempalte; + + public UISimpleGrid m_ItemGrid; + + public Text m_TextName; + + // 当前持有的Items + private List<ItemWidget> m_Items = new List<ItemWidget>(); + + private int m_CurrentIndex = 0; + + public override void Set(object param) + { + for(int i = 0; i < PlayerManager.Instance.items.Count; ++i) + { + ItemWidget widget = MakeItemWidget(PlayerManager.Instance.items[i]); + m_Items.Add(widget); + } + + SelectItemWidget(0); + } bool SwitchToLeft() { @@ -19,14 +37,58 @@ public class PanelItemBar : PanelBase return Input.GetButtonDown("RightItem"); } + bool UseItem() + { + return Input.GetButtonDown("Fire3"); + } + + ItemWidget MakeItemWidget(ItemBase item) + { + ItemWidget widget = Instantiate<ItemWidget>(m_ItemTempalte); + widget.transform.SetParent(m_ItemGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0); + + ItemWidgetParam param = new ItemWidgetParam(); + //param.onSelected = OnSelectItemWidget; + param.item = item; + widget.Set(param); + return widget; + } + protected override void Update() { if (SwitchToLeft()) { + int newIndex = Mathf.Clamp(m_CurrentIndex - 1, 0, m_Items.Count - 1); + SelectItemWidget(newIndex); } if (SwitchToRight()) { + int newIndex = Mathf.Clamp(m_CurrentIndex + 1, 0, m_Items.Count - 1); + SelectItemWidget(newIndex); } + if (UseItem()) + { + m_Items[m_CurrentIndex].OnUseCallback(); + PlayerManager.Instance.UseCurrentItem(); + } + } + + void SelectItemWidget(int index) + { + if(index < 0 || index > m_Items.Count - 1) + { + return ; + } + m_Items[m_CurrentIndex].OnDeselectCallback(); + m_Items[index].OnSelectCallback(); + + m_TextName.text = m_Items[index].item.name; + + m_CurrentIndex = index; + + PlayerManager.Instance.SetCurrentItem(m_Items[index].item); } } diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs index 049f733..d29c24a 100644 --- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs +++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs @@ -1,18 +1,27 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public enum PanelType { - None, + None, - PanelLevelBar, + PanelLevelBar, PanelItemBar, } public partial class UIManager : Singleton<UIManager> { private Dictionary<PanelType, string> m_Panels = new Dictionary<PanelType, string>(); + private Dictionary<PanelType, PanelBase> m_OpenedPanels = new Dictionary<PanelType, PanelBase>(); + + private Canvas m_Canvas; + + public void SetRootCanvas(Canvas canvas) + { + m_Canvas = canvas; + } void SetPanels() { @@ -25,9 +34,27 @@ public partial class UIManager : Singleton<UIManager> m_Panels.Add(type, "prefabs/ui/" + path); } - void OpenPanel(PanelType type, object param) + public PanelBase OpenPanel(PanelType type, object param = null) { - + if(m_OpenedPanels.ContainsKey(type)) + { + return m_OpenedPanels[type]; + } + + PanelBase prefab = ResourceManager.Instance.Load<PanelBase>(m_Panels[type]); + if (prefab == null) + { + Debug.LogError("UI Prefab in not available, path=" + m_Panels[type]); + return null; + } + PanelBase panel = UnityEngine.Object.Instantiate<PanelBase>(prefab); + panel.name = prefab.name; + panel.transform.SetParent(m_Canvas.transform); + panel.Set(param); + panel.InitRectTransform(); + panel.gameObject.SetActive(true); + + return panel; } -} +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/UIRootCanvas.cs b/SurvivalTest/Assets/Scripts/UI/UIRootCanvas.cs new file mode 100644 index 0000000..541d21a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/UIRootCanvas.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIRootCanvas : MonoBehaviour +{ + + private void Awake() + { + UIManager.Instance.SetRootCanvas(gameObject.GetComponent<Canvas>()); + } + +} diff --git a/SurvivalTest/Assets/Scripts/UI/UIRootCanvas.cs.meta b/SurvivalTest/Assets/Scripts/UI/UIRootCanvas.cs.meta new file mode 100644 index 0000000..5423e4e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/UIRootCanvas.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 097b021f29d7fc8468055a35bbc92ca8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Widget.meta b/SurvivalTest/Assets/Scripts/UI/Widgets.meta index c0a26ea..c0a26ea 100644 --- a/SurvivalTest/Assets/Scripts/UI/Widget.meta +++ b/SurvivalTest/Assets/Scripts/UI/Widgets.meta diff --git a/SurvivalTest/Assets/Scripts/UI/Widget/UIButton.cs b/SurvivalTest/Assets/Scripts/UI/Widgets/UIButton.cs index 616b69d..616b69d 100644 --- a/SurvivalTest/Assets/Scripts/UI/Widget/UIButton.cs +++ b/SurvivalTest/Assets/Scripts/UI/Widgets/UIButton.cs diff --git a/SurvivalTest/Assets/Scripts/UI/Widget/UIButton.cs.meta b/SurvivalTest/Assets/Scripts/UI/Widgets/UIButton.cs.meta index 41e16d0..41e16d0 100644 --- a/SurvivalTest/Assets/Scripts/UI/Widget/UIButton.cs.meta +++ b/SurvivalTest/Assets/Scripts/UI/Widgets/UIButton.cs.meta diff --git a/SurvivalTest/Assets/Scripts/UI/Widgets/UIGrid.cs b/SurvivalTest/Assets/Scripts/UI/Widgets/UIGrid.cs new file mode 100644 index 0000000..5eeee61 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Widgets/UIGrid.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIGrid : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SurvivalTest/Assets/Scripts/UI/Widgets/UIGrid.cs.meta b/SurvivalTest/Assets/Scripts/UI/Widgets/UIGrid.cs.meta new file mode 100644 index 0000000..c3570c0 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Widgets/UIGrid.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e0cbe5d6d2aaef54dba4bb837871787f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Widgets/UISimpleGrid.cs b/SurvivalTest/Assets/Scripts/UI/Widgets/UISimpleGrid.cs new file mode 100644 index 0000000..a4e480a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Widgets/UISimpleGrid.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +/// <summary> +/// 简易Grid +/// </summary> +public class UISimpleGrid : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SurvivalTest/Assets/Scripts/UI/Widgets/UISimpleGrid.cs.meta b/SurvivalTest/Assets/Scripts/UI/Widgets/UISimpleGrid.cs.meta new file mode 100644 index 0000000..e071d58 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Widgets/UISimpleGrid.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4dbae61f498dde342a95489aca8ff68c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs new file mode 100644 index 0000000..6532317 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CrewScript : MonoBehaviour +{ + +} diff --git a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs.meta b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs.meta new file mode 100644 index 0000000..0e1ebed --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9601f63e791a9974fbc9cd04c352b442 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: |
