summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/state.meta8
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.pngbin0 -> 3138 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png.meta96
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.pngbin0 -> 2124 bytes
-rw-r--r--SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.png.meta96
-rw-r--r--SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab266
-rw-r--r--SurvivalTest/Assets/Scenes/UIEditScene.unity68
-rw-r--r--SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs3
-rw-r--r--SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs12
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs16
-rw-r--r--SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs.meta11
11 files changed, 575 insertions, 1 deletions
diff --git a/SurvivalTest/Assets/Resources/Art/ui/state.meta b/SurvivalTest/Assets/Resources/Art/ui/state.meta
new file mode 100644
index 0000000..a52e7c9
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/state.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3aa7099257237a640b7155ab3be5c1d1
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png b/SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png
new file mode 100644
index 0000000..9f43826
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png.meta b/SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png.meta
new file mode 100644
index 0000000..9c711bf
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/state/auto_fire.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 777b52f7d560927428160f2e7f2d861a
+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/state/lock_aim.png b/SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.png
new file mode 100644
index 0000000..427bf5b
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.png
Binary files differ
diff --git a/SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.png.meta b/SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.png.meta
new file mode 100644
index 0000000..bb55b88
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/state/lock_aim.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 93ee4839d97153f4c81f7f4ba160efcd
+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/PanelTopSuffBar.prefab b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
index 0dae81b..16ee443 100644
--- a/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
+++ b/SurvivalTest/Assets/Resources/Prefabs/ui/PanelTopSuffBar.prefab
@@ -837,6 +837,57 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
+--- !u!1 &1714773664
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1714773665}
+ - component: {fileID: 2021917152667161724}
+ m_Layer: 5
+ m_Name: Root_State
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1714773665
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1714773664}
+ 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: 1379949721936321843}
+ m_Father: {fileID: 8494652252006705340}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: -10, y: 15.299988}
+ m_SizeDelta: {x: 344.4, y: 100}
+ m_Pivot: {x: 1, y: 0}
+--- !u!114 &2021917152667161724
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1714773664}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 718f0f01a21e1e546b984ad0739fc76d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_AutoFire: {fileID: 7160401758943412843}
+ m_LockAim: {fileID: 7166105191762546935}
--- !u!1 &1858183873
GameObject:
m_ObjectHideFlags: 0
@@ -1396,6 +1447,220 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Image_Icon: {fileID: 7336229837751899344}
+--- !u!1 &7043254157964506460
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1379949721936321843}
+ - component: {fileID: 7174583349734296112}
+ m_Layer: 5
+ m_Name: InputHint
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1379949721936321843
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7043254157964506460}
+ 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: 3490450073328763949}
+ - {fileID: 189696473695190530}
+ m_Father: {fileID: 1714773665}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 25.620003}
+ m_Pivot: {x: 1, y: 0}
+--- !u!114 &7174583349734296112
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7043254157964506460}
+ 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: 5
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
+--- !u!1 &7160401758943412843
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3490450073328763949}
+ - component: {fileID: 2553449657413764659}
+ - component: {fileID: 8158034384694662443}
+ m_Layer: 5
+ m_Name: AutoFire
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3490450073328763949
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7160401758943412843}
+ 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: 1379949721936321843}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 25, y: 25}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2553449657413764659
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7160401758943412843}
+ m_CullTransparentMesh: 1
+--- !u!114 &8158034384694662443
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7160401758943412843}
+ 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_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: 777b52f7d560927428160f2e7f2d861a, 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 &7166105191762546935
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 189696473695190530}
+ - component: {fileID: 7657179568841568488}
+ - component: {fileID: 1980901808084955185}
+ m_Layer: 5
+ m_Name: LockAim
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &189696473695190530
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7166105191762546935}
+ 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: 1379949721936321843}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 25, y: 25}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7657179568841568488
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7166105191762546935}
+ m_CullTransparentMesh: 1
+--- !u!114 &1980901808084955185
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7166105191762546935}
+ 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_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: 93ee4839d97153f4c81f7f4ba160efcd, 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 &7602728208021490764
GameObject:
m_ObjectHideFlags: 0
@@ -1509,6 +1774,7 @@ RectTransform:
- {fileID: 4914265009318610032}
- {fileID: 563803806}
- {fileID: 1986034769}
+ - {fileID: 1714773665}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/SurvivalTest/Assets/Scenes/UIEditScene.unity b/SurvivalTest/Assets/Scenes/UIEditScene.unity
index f7a06ce..7078943 100644
--- a/SurvivalTest/Assets/Scenes/UIEditScene.unity
+++ b/SurvivalTest/Assets/Scenes/UIEditScene.unity
@@ -604,6 +604,74 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 302779389}
m_Modifications:
+ - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -10
+ objectReference: {fileID: 0}
+ - target: {fileID: 1714773665, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 15.299988
+ objectReference: {fileID: 0}
+ - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 189696473695190530, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1379949721936321843, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3490450073328763949, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8494652252006705340, guid: d0e4118f0d89f4248aad6b7077899e64, type: 3}
propertyPath: m_Pivot.x
value: 0.5
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs
index 381beb8..9a0f9db 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs
@@ -12,9 +12,12 @@ public partial class PlayerManager : Singleton<PlayerManager>
public bool isFire { get; private set; }
+ public bool autoFire {get{return m_AutoFire;}}
private bool m_AutoFire;
private float m_AutoFireDuration = 0.8f;
+ public bool lockAim { get; set; }
+
private float m_LastAxisValue = 0;
void InitWeapons()
diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
index e4e3879..3662daf 100644
--- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
+++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
@@ -77,7 +77,17 @@ public class TestPeaceMaker : CrewScript
private Vector3 m_TargetZoom;
// 锁定瞄准，以移动方向为准
- private bool m_LockAim;
+ private bool m_LockAim
+ {
+ get
+ {
+ return PlayerManager.Instance.lockAim;
+ }
+ set
+ {
+ PlayerManager.Instance.lockAim = value;
+ }
+ }
private enum ControlMode
{
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs
new file mode 100644
index 0000000..991ec3a
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UIStateSection : MonoBehaviour
+{
+ public GameObject m_AutoFire;
+ public GameObject m_LockAim;
+
+ private void Update()
+ {
+ m_AutoFire.SetActive(PlayerManager.Instance.autoFire);
+ m_LockAim.SetActive(PlayerManager.Instance.lockAim);
+ }
+
+} \ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs.meta
new file mode 100644
index 0000000..b29afd9
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIStateSection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 718f0f01a21e1e546b984ad0739fc76d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
generated by cgit v1.1-26-g67d0 at 2025-05-21 05:59:19 +0000