*decorations

21 files changed, 427 insertions, 124 deletions

diff --git a/SurvivalTest/Assets/Resources/Art/sprites/weapons/railgun.png b/SurvivalTest/Assets/Resources/Art/sprites/weapons/railgun.png
new file mode 100644
index 0000000..6d3d2f6
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/sprites/weapons/railgun.png
diff --git a/SurvivalTest/Assets/Resources/Art/sprites/weapons/railgun.png.meta b/SurvivalTest/Assets/Resources/Art/sprites/weapons/railgun.png.meta
new file mode 100644
index 0000000..d0a83cb
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/sprites/weapons/railgun.png.meta
@@ -0,0 +1,108 @@
+fileFormatVersion: 2
+guid: d97bfe482d8a73540a53d7716173fd3e
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.6588868, y: 0.6031313}
+  spritePixelsToUnits: 32
+  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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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/decoration/battery.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png
new file mode 100644
index 0000000..a587a11
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png.meta b/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png.meta
new file mode 100644
index 0000000..0c5d3b1
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/decoration/battery.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: b485ebcc562870c4285da85c72f4c9a0
+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/decoration/spectrum.png b/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png
new file mode 100644
index 0000000..1c9c7ef
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png
diff --git a/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png.meta b/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png.meta
new file mode 100644
index 0000000..135c91f
--- /dev/null
+++ b/SurvivalTest/Assets/Resources/Art/ui/decoration/spectrum.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: c272239369412374489a9d84a868ff95
+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/Scenes/Demo.unity b/SurvivalTest/Assets/Resources/Scenes/Demo.unity
index e6aa2e3..b1a24b2 100644
--- a/SurvivalTest/Assets/Resources/Scenes/Demo.unity
+++ b/SurvivalTest/Assets/Resources/Scenes/Demo.unity
@@ -734,67 +734,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Color: {r: 0, g: 0, b: 0, a: 0.22745098}
   m_Scale: {x: 1, y: 0.5}
---- !u!1001 &440628563
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_RootOrder
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 7.5824533
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 2.2287643
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -3.0223687
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106985, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106990, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_Name
-      value: space_beam
-      objectReference: {fileID: 0}
-    - target: {fileID: 2384770310529106990, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: aaee1eb6bb697a34c822ff018eca2fdf, type: 3}
 --- !u!1 &500022324
 GameObject:
   m_ObjectHideFlags: 0
@@ -2760,67 +2699,6 @@ MonoBehaviour:
   m_Shadow: {fileID: 0}
   m_Coord: {x: 0, y: 0, z: 0}
   m_Height: 0
---- !u!1001 &1646258316
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_RootOrder
-      value: 21
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403811, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403814, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_Name
-      value: light_saber
-      objectReference: {fileID: 0}
-    - target: {fileID: 1854691599017403814, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 623411d00337fe742bd232b547dfaf01, type: 3}
 --- !u!1 &1655800953
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs
new file mode 100644
index 0000000..e8814cd
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs
@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Decoration_Battery : DecorationBase
+{
+	public override string name => "电池";
+
+	public override string iconPath => "art/ui/decoration/battery";
+
+}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta
new file mode 100644
index 0000000..ab1ca1d
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 18bc88c977364ba4db2e0b1499a839be
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs
new file mode 100644
index 0000000..1ebb021
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/// <summary>
+/// 剑谱，持有之后按照招式舞动会有剑气等附加效果
+/// </summary>
+public class Decoration_SwordSpectrum : DecorationBase
+{
+
+	public override string name => "剑术大师的剑谱";
+
+	public override string iconPath => "art/ui/decoration/spectrum";
+
+}
\ No newline at end of file
diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta
new file mode 100644
index 0000000..1dc4d34
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1c73c7e0a378c30408a7f06bb38bf06f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun.meta
new file mode 100644
index 0000000..901bfca
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Equips/RailGun.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58852a4f6155748468fd8812fd61446d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs
new file mode 100644
index 0000000..e83614c
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Equip_RailGun : EquipBase
+{
+	public override string name => "轨道炮";
+
+	public override string iconPath => "";
+
+	public override AutoMode autoMode => AutoMode.Interval;
+
+	public override void OnTrigger(GameObject owner)
+	{
+	}
+}
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta
new file mode 100644
index 0000000..6d71ccc
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a9a37b2731565934eb4ef0f95a64aaea
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs
new file mode 100644
index 0000000..0ffb5eb
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class RailGun : 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/Equips/RailGun/RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta
new file mode 100644
index 0000000..28040c3
--- /dev/null
+++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 840b1c98faf9e654abb4f09bf46fb3f5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs
index 681e87b..701f27c 100644
--- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs
@@ -8,7 +8,7 @@ public class BattleManager : Singleton<BattleManager>
 	public void Init()
 	{
 		UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null);
-		UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null);
+		//UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null);
 		//UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null);
 		//UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null);
 	}
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs
index 5076dea..ea4ba78 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs
@@ -15,6 +15,8 @@ public partial class PlayerManager : Singleton<PlayerManager>
 		m_Decorations.Add(new Decoration_MystreyMask());
 		m_Decorations.Add(new Decoration_PowerRing());
 		m_Decorations.Add(new Decoration_Horn());
+		m_Decorations.Add(new Decoration_Battery());
+		m_Decorations.Add(new Decoration_SwordSpectrum());
 	}
 
 	void UpdateDecorations()
diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
index d921545..7f50ea9 100644
--- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
+++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs
@@ -19,12 +19,12 @@ public partial class PlayerManager : Singleton<PlayerManager>
 
 	void InitEquips()
 	{
+		m_Equips.Add(new Equip_LightSaber());
 		m_Equips.Add(new Equip_Gun());
 		m_Equips.Add(new Equip_GrenadeLauncher());
 		m_Equips.Add(new Equip_Boomerang());
 		m_Equips.Add(new Equip_TeslaCoil());
 		m_Equips.Add(new Equip_MightyGlove());
-		m_Equips.Add(new Equip_LightSaber());
 
 		m_AutoFire = false;
 
diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
index 775b913..57bd46f 100644
--- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
+++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
@@ -15,6 +15,14 @@ public class TestPeaceMaker : CrewScript
 	[SerializeField] private Vector2 m_Zoom;
 	[SerializeField] private Transform m_LaunchPoint;
 
+	public override Transform centre
+	{
+		get
+		{
+			return m_Centre;
+		}
+	}
+
 	public override Vector2 aimDirection
 	{
 		get
diff --git a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs
index 348e793..bb7bd22 100644
--- a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs
+++ b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs
@@ -5,6 +5,9 @@ using UnityEngine;
 public class CrewScript : MonoBehaviour
 {
 
+	//  几何中心锚点（作为arrow，武器的对准中心，3D空间下）
+	public virtual Transform centre { get;  }
+
 	// 朝向
 	public virtual Vector2 aimDirection { get; }