法杖，武器切换

Assets/External VFXs/Piloto Studio/Materials/Arcane/PortalCore_1.mat

@@ -79,7 +79,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailNoise:
-        m_Texture: {fileID: 2800000, guid: 3ac70e7ced6d23946ac37f602b2bc573, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DistortionVectorMap:
@@ -103,7 +103,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 3ac70e7ced6d23946ac37f602b2bc573, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTexture:
@@ -200,7 +200,7 @@ Material:
     - _DistortionDepthTest: 1
     - _DistortionDstBlend: 1
     - _DistortionEnable: 0
-    - _DistortionIntensity: 0.1
+    - _DistortionIntensity: 0
     - _DistortionOnly: 0
     - _DistortionScale: 1
     - _DistortionSrcBlend: 1
@@ -331,8 +331,8 @@ Material:
     - _LastColor: {r: 1, g: 0, b: 0, a: 0}
     - _MainAlphaChannel: {r: 0, g: 0, b: 0, a: 1}
     - _MainAlphaPanning: {r: 1, g: 1, b: 0, a: 0}
-    - _MainTextureChannel: {r: 4, g: 1, b: 0, a: 0}
-    - _MainTexturePanning: {r: -0.5, g: 0.5, b: 0, a: 0}
+    - _MainTextureChannel: {r: 1, g: 0.25, b: 0, a: 0}
+    - _MainTexturePanning: {r: 0, g: 0, b: 0, a: 0}
     - _MidColor: {r: 1, g: 0.44479147, b: 0, a: 0}
     - _Resolution: {r: 64, g: 64, b: 0, a: 0}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}

Assets/External VFXs/Piloto Studio/Materials/Shared/MeshLight_DoubleSided.mat

@@ -25,13 +25,15 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: MeshLight_DoubleSided
   m_Shader: {fileID: 4800000, guid: d985403ea514e7c46bf7c2fab31b9d95, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _SURFACE_TYPE_TRANSPARENT
   - _USEALPHAOVERRIDE_ON
   m_InvalidKeywords:
   - _DISABLE_SSR
   - _DISABLE_SSR_TRANSPARENT
   - _DOUBLESIDED_ON
+  - _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
@@ -43,6 +45,7 @@ Material:
   - DistortionVectors
   - MOTIONVECTORS
   - TransparentBackface
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -142,6 +145,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
     - _AORemapMax: 1
@@ -159,7 +174,7 @@ Material:
     - _Anisotropy: 0
     - _BlendMode: 0
     - _CoatMask: 0
-    - _CullMode: 0
+    - _CullMode: 1
     - _CullModeForward: 0
     - _Culling: 0
     - _Cutoff: 0.5
@@ -233,6 +248,9 @@ Material:
     - _PPDMinSamples: 5
     - _PPDPrimitiveLength: 1
     - _PPDPrimitiveWidth: 1
+    - _QueueControl: -1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
     - _ReceivesSSR: 0
     - _ReceivesSSRTransparent: 0
     - _RefractionModel: 0
@@ -324,3 +342,4 @@ Material:
     - _UnlitColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
     - _WhiteColor: {r: 1, g: 1, b: 1, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/External VFXs/Piloto Studio/Rocky VFX Models/RockWall/m_RockWall_DoomBlue.mat

@@ -26,7 +26,6 @@ Material:
     MotionVector: User
   disabledShaderPasses:
   - TransparentBackface
-  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -140,3 +139,4 @@ Material:
     - _EmissiveTint: {r: 2.8735878, g: 2.8735878, b: 2.8735878, a: 1}
     - _PanningSpeed: {r: 0.05, g: 0.1, b: 0, a: 0}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Input/PlayerInputActions.cs

@@ -562,7 +562,7 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable
                     ""name"": """",
                     ""id"": ""2690141f-c8c8-4171-a115-9aee303742ed"",
                     ""path"": ""<Keyboard>/r"",
-                    ""interactions"": ""Press(behavior=1)"",
+                    ""interactions"": ""Press"",
                     ""processors"": """",
                     ""groups"": ""KeyboardMouse"",
                     ""action"": ""SwitchPreviousMainWeapon"",
@@ -573,7 +573,7 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable
                     ""name"": """",
                     ""id"": ""3d0ed8b7-a930-4ae4-8357-5c9ad407c03c"",
                     ""path"": ""<Keyboard>/f"",
-                    ""interactions"": ""Press(behavior=1)"",
+                    ""interactions"": ""Press"",
                     ""processors"": """",
                     ""groups"": ""KeyboardMouse"",
                     ""action"": ""SwitchNextMainWeapon"",

Assets/Input/PlayerInputActions.inputactions

@@ -476,7 +476,7 @@
                     "name": "",
                     "id": "2690141f-c8c8-4171-a115-9aee303742ed",
                     "path": "<Keyboard>/r",
-                    "interactions": "Press(behavior=1)",
+                    "interactions": "Press",
                     "processors": "",
                     "groups": "KeyboardMouse",
                     "action": "SwitchPreviousMainWeapon",
@@ -487,7 +487,7 @@
                     "name": "",
                     "id": "3d0ed8b7-a930-4ae4-8357-5c9ad407c03c",
                     "path": "<Keyboard>/f",
-                    "interactions": "Press(behavior=1)",
+                    "interactions": "Press",
                     "processors": "",
                     "groups": "KeyboardMouse",
                     "action": "SwitchNextMainWeapon",

Assets/InputSystem.inputsettings.asset

@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
+  m_Name: InputSystem.inputsettings
+  m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputSettings
+  m_SupportedDevices: []
+  m_UpdateMode: 1
+  m_ScrollDeltaBehavior: 0
+  m_MaxEventBytesPerUpdate: 5242880
+  m_MaxQueuedEventsPerUpdate: 1000
+  m_CompensateForScreenOrientation: 1
+  m_BackgroundBehavior: 0
+  m_EditorInputBehaviorInPlayMode: 0
+  m_InputActionPropertyDrawerMode: 0
+  m_DefaultDeadzoneMin: 0.125
+  m_DefaultDeadzoneMax: 0.925
+  m_DefaultButtonPressPoint: 0.2
+  m_ButtonReleaseThreshold: 0.75
+  m_DefaultTapTime: 0.2
+  m_DefaultSlowTapTime: 0.5
+  m_DefaultHoldTime: 0.4
+  m_TapRadius: 5
+  m_MultiTapDelayTime: 0.75
+  m_DisableRedundantEventsMerging: 0
+  m_ShortcutKeysConsumeInputs: 0
+  m_iOSSettings:
+    m_MotionUsage:
+      m_Enabled: 0
+      m_Description: 

Assets/InputSystem.inputsettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e191fdaf365af64db5c6b7e42fafa9a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/BasePrefabsCollection.asset

@@ -16,8 +16,8 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 3106269974086679045, guid: 4e31129482ba8e64cbac8c30b6f79f66, type: 3}
     - {fileID: 3106269974086679045, guid: 25b182fff7bb2ae4f86f969998fa1c2b, type: 3}
+    - {fileID: 3106269974086679045, guid: 4e31129482ba8e64cbac8c30b6f79f66, type: 3}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_AO_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 906ee4cb34a31b04d99128f222bfc26e
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_AO_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_AO_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_BaseColor_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 5bd91b77c4c43f2499f2d50d84611b0c
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_BaseColor_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_BaseColor_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_Emissive_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 539f725579b020545945aa3b8d935690
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_Emissive_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_Emissive_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_MetallGloss_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 7c346ae28984c21409773ae96ae662e1
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_MetallGloss_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_MetallGloss_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_Normal_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: e6d38474ab97d2a4fafd8d64521b2f93
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_Normal_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Armor_Normal_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_AO_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 71f8831a7d0e1894989c1cb1e612b952
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_AO_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_AO_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_BaseColor_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 00de50479ae673c4b8beffd2d85c5024
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_BaseColor_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,11 +71,12 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 4096
+    maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_BaseColor_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_Emissive_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 35ef09d31d568c6469f64fa9269ca966
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_Emissive_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,11 +71,12 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 4096
+    maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_Emissive_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_MetallGloss_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: f8a6aabe0def416499aafa331447322b
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_MetallGloss_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_MetallGloss_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_Normal_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 056141eda84602f46b7bae475c889a4f
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_Normal_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,11 +71,12 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 4096
+    maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Body_Normal_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_AO_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: df36e56176c08be40bd0854fc5afc86a
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_AO_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_AO_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_BaseColor_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 7cc53d84046349a47b031e8c4562dac9
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_BaseColor_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,11 +71,12 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 4096
+    maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_BaseColor_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_Emissive_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 0cc87bf31efc4b7479da6114497f2c8b
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_Emissive_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,11 +71,12 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 4096
+    maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_Emissive_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_MetallGloss_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 689ede752fadf484e9fba70e0bd87b18
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_MetallGloss_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,9 +71,10 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_MetallGloss_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Automata/NexusCrab/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_Normal_Skin1.tga.meta

@@ -1,9 +1,16 @@
 fileFormatVersion: 2
 guid: 81171de6a330a27469195c88292cbcf7
+AssetOrigin:
+  serializedVersion: 1
+  productId: 292447
+  packageName: Sci-Fi Boss pack
+  packageVersion: 1.1
+  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_Normal_Skin1.tga
+  uploadId: 756235
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +27,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -63,11 +71,12 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 4096
+    maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -75,9 +84,10 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -87,12 +97,40 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 4096
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 
@@ -102,17 +140,11 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 292447
-  packageName: Sci-Fi Boss pack
-  packageVersion: 1.1
-  assetPath: Assets/Sci-Fi Boss pack/SciFi_Crab/Textures/Skin1/T_SciFi_Crab_Claw_Normal_Skin1.tga
-  uploadId: 756235

Assets/Prefabs/Characters/Player/PlayerOverride.overrideController

@@ -10,23 +10,23 @@ AnimatorOverrideController:
   m_Controller: {fileID: 9100000, guid: fda18c69e5ccb554d8ae8867ca37c7cd, type: 2}
   m_Clips:
   - m_OriginalClip: {fileID: 7400000, guid: 99d9faf139ff6064c8e7d4d9d63f58e0, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: db4e03a90cfcbca4a80335177ce4377e, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: d95d162166de6ef43b1b02fd81bfac5f, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: ed2676607db0d6a4c99fa5df36dd09b7, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: a6530c5433035d040974f3cf8572fe7c, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 5c1c87a6d19434d4fa8401a700723ca0, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: b24a11ee47f88ff4eb978d5aca0ae93a, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 2ca224e0bb91d7f4bb55fbb05ba6acf2, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 006c64cfe8d1ff74a95609b30c08226f, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 25258b12f158def43a56416b73f94d80, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 2f2de8fb421af5d479106b8ef9505348, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 55fc8ba7f6ff77c43b6fa2a248dc76ef, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: e6caba10fc3a02649821183412ab5d27, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 2ac88efeeb1f1134bad19886bfd66dd5, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 6fe92b2195a121740a2634989e0f716c, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: a67e0dc7ee6cae741899189ffa2ddc92, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: e9235e894ec47e84fb276beef822777e, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: d70ab478c40d9624280e39279a520606, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 7fde74c9e60900e4ca19db67cf173155, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 6cb94489c10e6124b91527e6a9c6680f, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 22480f2a265d8f64fa8011be5fa360de, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 608dfee9855dc694aa1ea89a29de4d21, type: 2}
     m_OverrideClip: {fileID: 7400000, guid: 579a1d70478c8d8488f9286bd7a09b03, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 3943c8602c6198544a485240dc3e4dc5, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 25fb28e7b50984942bd9ef5d0f77507c, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: c2cba0ef2c3112d4d9818c080a5e3c0e, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 44a4a4e66482cdf4a90dfe1a2b8dcf9f, type: 2}
     m_OverrideClip: {fileID: 7400000, guid: bccc7dbf92c6758469065884fc3a092c, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 03b1b65aa412abb40a823ccb29db5e68, type: 2}
@@ -34,25 +34,25 @@ AnimatorOverrideController:
   - m_OriginalClip: {fileID: 7400000, guid: 60e1d16bb1bf0d34ca9779213d1de121, type: 2}
     m_OverrideClip: {fileID: 7400000, guid: 541480da4a0c0fe408415f85f80913d0, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 16e418b0431434e45aceb776e47e4049, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: c74a768f9d6c1e5458114c8460fd15f2, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: a129760818165994bb7e83c0607e5476, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 16fe7b5baf0b4484d82bdf6e65f7f764, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: eae7a8313d5cc0c4381594a0c32d26b7, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: fcbbe6ec48ef21241a5f6aa22b14239c, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: c4be64c0aa99e8d46b18bb9bbfe50b51, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: d6b2e580f7360384d988dd4391b99ee4, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 202ce03b821f1484eba6ca782ce2e090, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: d6cd30a547339cf4ab437b1cf287b3b6, type: 2}
     m_OverrideClip: {fileID: 7400000, guid: 08b015479a559c0488469e03da8b6d57, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: a22305c6448bd0944b3abdd9642af5af, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: f11b21589c8864d4688a80bdcba683de, type: 2}
+    m_OverrideClip: {fileID: 0}
   - m_OriginalClip: {fileID: 7400000, guid: a1ddc6114281ae5478f4aa3b07f8e8db, type: 2}
-    m_OverrideClip: {fileID: 7400000, guid: 0ebe99e0b48b2844eb5e4e4405172a81, type: 2}
+    m_OverrideClip: {fileID: 0}
   - m_OriginalClip: {fileID: 7400000, guid: 1b1eee0d3d253354ca6863fcb54df53d, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: f884d6ba9b2527c4787c4776c877bb09, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: ed83dc6fe102a5d408821f0bc4eee48d, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 259ece44f6e51e34ba26334acc58d06f, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: efd49665f3fee004bbe048e6abd6e0c8, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: f80923dac64f5e14da92e4cc84b2905a, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 57ef23dd45a87584ca15392760c91e82, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 3f62032e978ff7e488e4c94078e1dd37, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 05f2b4f5d2510214082249b0844ee9cd, type: 2}
     m_OverrideClip: {fileID: 0}
   - m_OriginalClip: {fileID: 7400000, guid: dcd7af8ef9758e347bb997d4f58a9409, type: 2}
@@ -76,12 +76,12 @@ AnimatorOverrideController:
   - m_OriginalClip: {fileID: 7400000, guid: c1a20f998e23155458548b50a2e4ef78, type: 2}
     m_OverrideClip: {fileID: 7400000, guid: 2f380bb002ea01d4a8aefaa762f78170, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 81cb8ecb343e3cd439e11f575d9f8787, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 9ff66b6c70876334d9af5cf6bac92d28, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 468d58630242eb54b8c247544e709556, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 4f48af8068b84d04082b8aa1898fd617, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 7f9bfcedea7f3c24998db68b0ed92fa6, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 33a85906eed9cc540b311b7df97e601f, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 65e497bb7cf6d72499ca7517982edc19, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 3834ae9dff00e09408a073edf78226d7, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: be2660eb64d0a60498242c08fc4143f6, type: 2}
-    m_OverrideClip: {fileID: 0}
+    m_OverrideClip: {fileID: 7400000, guid: 9ff66b6c70876334d9af5cf6bac92d28, type: 2}

Assets/Prefabs/Environment.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2f5e1f98c05d7e499238931b0c4cb97
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/MainWeapons/Collection/FutureWand/Animations/Skill_05.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b3ed9eadd2b65ff4a97820585b831400
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/MainWeapons/Collection/FutureWand/Data/FuncAnims.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a15fa47f09dcac54981500729b30fd03
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/MainWeapons/Collection/FutureWand/Data/FuncAnims/FutureWand_Equip.asset

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aad7ba1072fa344088a099ea9469a38, type: 3}
+  m_Name: FutureWand_Equip
+  m_EditorClassIdentifier: Assembly-CSharp::SLSUtilities.FunctionalAnimation.FuncAnimData
+  serializationData:
+    SerializedFormat: 2
+    SerializedBytes: 
+    ReferencedUnityObjects: []
+    SerializedBytesString: 
+    Prefab: {fileID: 0}
+    PrefabModificationsReferencedUnityObjects: []
+    PrefabModifications: []
+    SerializationNodes:
+    - Name: variableCollection
+      Entry: 6
+      Data: 
+  timeMode: 1
+  animationClip: {fileID: 7400000, guid: b3ed9eadd2b65ff4a97820585b831400, type: 2}
+  animInfo:
+    animationName: Equip
+    stateName: MainWeapon10
+    useRootMotion: 1
+    disruptionType: 500
+    overridePlaySpeed: 1
+    overrideStartFrame: 0
+    isAffectedBySpeedMultiplier: 1
+    description: 
+  intervals:
+  - intervalType: 0
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 10
+    intervalName: 
+    timeRange: {x: 0, y: 0.41666666}
+  - intervalType: 11
+    intervalName: 
+    timeRange: {x: 0, y: 0.41666666}
+  - intervalType: 20
+    intervalName: 
+    timeRange: {x: 0.41666666, y: 1.3}
+  - intervalType: 21
+    intervalName: 
+    timeRange: {x: 0, y: 0}
+  - intervalType: 22
+    intervalName: 
+    timeRange: {x: 0.8333333, y: 1.3}
+  - intervalType: 30
+    intervalName: 
+    timeRange: {x: 1.3, y: 1.5166667}
+  - intervalType: 31
+    intervalName: 
+    timeRange: {x: 1.5166667, y: 1.8833333}
+  - intervalType: 40
+    intervalName: 
+    timeRange: {x: 0, y: 1.8833333}
+  eventCollection:
+    animEvents:
+    - triggerTime: 0.41666666
+      isEnd: 0
+      payload:
+        rid: 5266334297665568905
+    startEvents: []
+    disruptionEvents: []
+    updateEvents: []
+    updateUntilEvents: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 5266334297665568905
+      type: {class: InvokeAnimScFunction, ns: Cielonos.MainGame.FunctionalAnimation, asm: Assembly-CSharp}
+      data:
+        eventName: AnimInvokeAnimScFunction0
+        functionKey: ReleaseAura

Assets/Prefabs/Items/MainWeapons/Collection/FutureWand/Data/FuncAnims/FutureWand_Equip.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2ade289f2956acc4aa42ef79025ef2b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/MainWeapons/Collection/FutureWand/Data/FutureWand_VFXData.asset

@@ -22,6 +22,7 @@ MonoBehaviour:
     - {fileID: 2052445705238054817, guid: 94bd1e812b0c65e408a655a1c3939e01, type: 3}
     - {fileID: 5553698955190518062, guid: f2812d931f27abf418d8f913cde51582, type: 3}
     - {fileID: 773025609738991800, guid: 9eed8f5480cb09f469e603110592e6b4, type: 3}
+    - {fileID: 4456404545105859923, guid: 644d7cacf551487488384010ad51aad1, type: 3}
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -33,7 +34,7 @@ MonoBehaviour:
         Assembly-CSharp]], SoftCircuits.OrderedDictionary
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 4
     - Name: 
       Entry: 7
       Data: System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib],[Cielonos.MainGame.VFXUnit,
@@ -64,7 +65,7 @@ MonoBehaviour:
       Data: 0
     - Name: 
       Entry: 4
-      Data: 1
+      Data: 1.5
     - Name: 
       Entry: 4
       Data: 0.5
@@ -140,7 +141,7 @@ MonoBehaviour:
       Data: 0
     - Name: 
       Entry: 4
-      Data: 1
+      Data: 1.5
     - Name: 
       Entry: 4
       Data: 0.5
@@ -272,6 +273,82 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib],[Cielonos.MainGame.VFXUnit,
+        Assembly-CSharp]], mscorlib
+    - Name: 
+      Entry: 1
+      Data: SquareExpandingAura
+    - Name: 
+      Entry: 7
+      Data: 5|Cielonos.MainGame.VFXUnit, Assembly-CSharp
+    - Name: mainVFX
+      Entry: 10
+      Data: 6
+    - Name: muzzleVFX
+      Entry: 10
+      Data: 1
+    - Name: hitVFX
+      Entry: 6
+      Data: 
+    - Name: otherVFXList
+      Entry: 6
+      Data: 
+    - Name: localPosition
+      Entry: 7
+      Data: UnityEngine.Vector3, UnityEngine.CoreModule
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: localEulerAngles
+      Entry: 7
+      Data: UnityEngine.Vector3, UnityEngine.CoreModule
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 4
+      Data: 0
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: localScale
+      Entry: 7
+      Data: UnityEngine.Vector3, UnityEngine.CoreModule
+    - Name: 
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 4
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: keepLocalTransform
+      Entry: 5
+      Data: false
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 

Assets/Prefabs/Items/MainWeapons/Collection/FutureWand/VFX/Aura_Ground_Tech.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 644d7cacf551487488384010ad51aad1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_BlockData.asset

@@ -67,7 +67,7 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
-  blockName: Chinamida_Block
+  blockName: Polychrome_Block
   blockPriority: 0
   isLimitedTime: 0
   defaultBlockTime: Infinity

Assets/Prefabs/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_EquipBlockData.asset

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4c1374059baffee4eaad6ecb87402c00, type: 3}
+  m_Name: Polychrome_EquipBlockData
+  m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Inventory.BlockData
+  serializationData:
+    SerializedFormat: 2
+    SerializedBytes: 
+    ReferencedUnityObjects:
+    - {fileID: 5795760434086401390, guid: 615f0b50c2f06544a920278ef9cafe0a, type: 3}
+    - {fileID: 5795760434086401390, guid: 78e1fc3b4fc13e642aad8b9fd84f68f4, type: 3}
+    SerializedBytesString: 
+    Prefab: {fileID: 0}
+    PrefabModificationsReferencedUnityObjects: []
+    PrefabModifications: []
+    SerializationNodes:
+    - Name: blockEffects
+      Entry: 7
+      Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UnityEngine.GameObject,
+        UnityEngine.CoreModule]], mscorlib
+    - Name: comparer
+      Entry: 7
+      Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
+        mscorlib]], mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 12
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: NormalBlock
+    - Name: $v
+      Entry: 10
+      Data: 0
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: PerfectBlock
+    - Name: $v
+      Entry: 10
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+  blockName: Polychrome_EquipBlock
+  blockPriority: 0
+  isLimitedTime: 1
+  defaultBlockTime: 0.4
+  perfectTime: 0.4
+  weakHitFuncAnims: []
+  mediumHitFuncAnims: []

Assets/Prefabs/Items/MainWeapons/Collection/Polychrome/Data/Polychrome_EquipBlockData.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d048b76b8828b4b4d885dc0957b31150
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Items/MainWeapons/FutureWand.prefab

@@ -356,6 +356,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: cc7be8e826d20cc41a72c20f55350257, type: 2}
   - {fileID: 11400000, guid: 5dae8552f60f2c04b8ec6bd5c070772e, type: 2}
   - {fileID: 11400000, guid: a31727863ab7d8b46964840f10d6688e, type: 2}
+  - {fileID: 11400000, guid: 2ade289f2956acc4aa42ef79025ef2b4, type: 2}
   viewObjectData: {fileID: 11400000, guid: 0418af7cddfaad149a449c950a9d6e4c, type: 2}
   vfxData: {fileID: 11400000, guid: 5d145d0d0b68e6b499526e1a13f066a8, type: 2}
   comboData: {fileID: 11400000, guid: ea9965ca658cdcc45b128a62a54945bd, type: 2}

Assets/Resources/Items/MainWeapons/Polychrome.prefab

@@ -6452,10 +6452,10 @@ MonoBehaviour:
     - Name: ammoSm
       Entry: 6
       Data: 
-    - Name: weaponObjects
+    - Name: viewObjects
       Entry: 7
-      Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UnityEngine.GameObject,
-        UnityEngine.CoreModule]], mscorlib
+      Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Cielonos.MainGame.Inventory.ItemViewObject,
+        Assembly-CSharp]], mscorlib
     - Name: comparer
       Entry: 7
       Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
@@ -6472,7 +6472,6 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
-  viewObject: {fileID: 0}
   fullBodyFuncAnims:
   - {fileID: 11400000, guid: 66d7c97acde74ce4e899ad9b96187c0e, type: 2}
   - {fileID: 11400000, guid: f5d72584f2746ae488124c0f03cf3bee, type: 2}
@@ -6486,7 +6485,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 22f3bd8004835c846b9b71c010ecd5e4, type: 2}
   - {fileID: 11400000, guid: 77b2b9f117528f74590f162cd6a632ab, type: 2}
   - {fileID: 11400000, guid: 00f41d4451088774bad58271ff0097bc, type: 2}
-  objectData: {fileID: 11400000, guid: 401e2bde415f34443ab14f20fe48f017, type: 2}
+  viewObjectData: {fileID: 11400000, guid: 401e2bde415f34443ab14f20fe48f017, type: 2}
   vfxData: {fileID: 11400000, guid: f3ff888e4a6e2804fbd6faa8a732a2f2, type: 2}
   comboData: {fileID: 11400000, guid: 11936c91a83eaf940b1c3c2d97f20132, type: 2}
   attackData: {fileID: 11400000, guid: a422243c6dbe4d54aa72d4fb8b96d639, type: 2}
@@ -6500,6 +6499,7 @@ MonoBehaviour:
   disableSecondaryPreinput: 0
   disableSpecialAPreinput: 0
   disableSpecialBPreinput: 0
+  equipBlockData: {fileID: 11400000, guid: d048b76b8828b4b4d885dc0957b31150, type: 2}
   perfectBlockedTimer: 0
 --- !u!114 &2420951624592306011
 MonoBehaviour:

Assets/Scenes/Character.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 445960b889752b34ebe58154ed1619a5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MainGame/AttackArea/AttackAreaBase.cs

@@ -14,7 +14,7 @@ using Random = UnityEngine.Random;
 
 namespace Cielonos.MainGame
 {
-    public abstract partial class AttackAreaBase : MonoBehaviour
+    public abstract partial class AttackAreaBase : SerializedMonoBehaviour
     {
         private static Dictionary<string, int> areaNameCountDictionary = new Dictionary<string, int>();
         
@@ -34,6 +34,7 @@ namespace Cielonos.MainGame
         public Action updateAction;
 
         [Title("Submodules")] 
+        [HideInEditorMode] public TransformSubmodule transformSm;
         [HideInEditorMode] public AttackSubmodule attackSm;
         [HideInEditorMode] public TimeSubmodule timeSm;
         [HideInEditorMode] public HitSubmodule hitSm;
@@ -96,12 +97,19 @@ namespace Cielonos.MainGame
             }
 
             this.SetReactionSubmodule<T>();
+
+            BattleManager.AttackAreaSm.Register(this);
+            topParent.GetComponent<VFXObject>().onDespawnAction = () =>
+            {
+                BattleManager.AttackAreaSm.Unregister(this);
+            };
             
             return this as T;
         }
         
         protected virtual void Update()
         {
+            transformSm?.Update();
             raycastSm?.Update();
             updateAction?.Invoke();
             hitSm?.Update();
@@ -112,6 +120,16 @@ namespace Cielonos.MainGame
 
     public partial class AttackAreaBase
     {
+        #region TransformSubmodule
+
+        public T SetTransformSubmodule<T>(Transform target = null, float delay = 0) where T : AttackAreaBase
+        {
+            transformSm = new TransformSubmodule(this, target, delay);
+            return this as T;
+        }
+
+        #endregion
+        
         #region AttackSubmodule
         public T SetAttackSubmodule<T>(AttackUnit attackUnit, GameObject hitVFX = null) where T : AttackAreaBase
                 {
@@ -163,10 +181,41 @@ namespace Cielonos.MainGame
 
         #region TraceMoveModule
 
-        public T SetTraceMoveModule<T>(CharacterBase target, float moveSpeed, float moveAcceleration,
+        /// <summary>
+        /// 设置自适应追踪移动子模块，根据和目标的距离自动连接和断开追踪
+        /// 断开追踪后，自动选择范围内最近的目标进行追踪
+        /// </summary>
+        public T SetAdaptiveTraceMoveModule<T>(CharacterBase target, float moveSpeed, float moveAcceleration,
+            float angularSpeed, float angularAcceleration, Vector3 initialDirection, 
+            bool autoConnect = true, bool autoDisconnect = true, float detectRadius = 10f, bool stopWhenHit = true) where T : AttackAreaBase
+        {
+            moveSm = new TraceMoveSubmodule(this, target, moveSpeed, moveAcceleration, angularSpeed, 
+                angularAcceleration, initialDirection, autoConnect, autoDisconnect, detectRadius, stopWhenHit);
+            return this as T;
+        }
+
+        /// <summary>
+        /// 设置不可更改目标的追踪移动子模块
+        /// 永远追踪指定目标，不会断开
+        /// </summary>
+        public T SetUnchangeableTraceMoveModule<T>(CharacterBase target, float moveSpeed, float moveAcceleration,
             float angularSpeed, float angularAcceleration, Vector3 initialDirection, bool stopWhenHit = true) where T : AttackAreaBase
         {
-            moveSm = new TraceMoveSubmodule(this, target, moveSpeed, moveAcceleration, angularSpeed, angularAcceleration, initialDirection, stopWhenHit);
+            moveSm = new TraceMoveSubmodule(this, target, moveSpeed, moveAcceleration, angularSpeed, 
+                angularAcceleration, initialDirection, false, false, 0, stopWhenHit);
+            return this as T;
+        }
+        
+        /// <summary>
+        /// 设置可分离目标的追踪移动子模块
+        /// 一旦目标超出检测范围则断开追踪，断开后不再追踪其他目标
+        /// </summary>
+        public T SeDetachableTraceMoveModule<T>(CharacterBase target, float moveSpeed, float moveAcceleration,
+            float angularSpeed, float angularAcceleration, Vector3 initialDirection, 
+            float detectRadius = 10f, bool stopWhenHit = true) where T : AttackAreaBase
+        {
+            moveSm = new TraceMoveSubmodule(this, target, moveSpeed, moveAcceleration, angularSpeed, 
+                angularAcceleration, initialDirection, false, true, detectRadius, stopWhenHit);
             return this as T;
         }
         

Assets/Scripts/MainGame/AttackArea/Collection/Projectile.cs

@@ -96,8 +96,13 @@ namespace Cielonos.MainGame
             }
         }
 
-        public void Explode(Vector3 hitPosition)
+        public void Explode(Vector3 hitPosition = default)
         {
+            if (hitPosition == default)
+            {
+                hitPosition = transform.position;
+            }
+            
             GenerateHitEffect(hitPosition);
             PlaySoundFX(hitPosition);
             LeanPool.Despawn(topParent.gameObject);

Assets/Scripts/MainGame/AttackArea/Submodules/RaycastSubmodule.cs

@@ -47,7 +47,7 @@ namespace Cielonos.MainGame
                 Vector3 point1 = owner.transform.position - rayDirection.normalized * capsuleHeight;
                 Collider[] hitColliders = new Collider[8];
                 int size = Physics.OverlapCapsuleNonAlloc(point0, point1, capsuleRadius, hitColliders,
-                    LayerMask.GetMask("Player", "Enemy", "Default", "FadableEnvironment", "UnfadableEnvironment", "Wall", "Ground"));
+                    LayerMask.GetMask("HurtBox", "Default", "FadableEnvironment", "UnfadableEnvironment", "Wall", "Ground"));
                 if (size >= 1)
                 {
                     Debug.Log("RaycastSubmodule detected colliders: " + size);
@@ -74,7 +74,7 @@ namespace Cielonos.MainGame
             else
             {
                 if (Physics.Raycast(ray, out RaycastHit hit, rayLength,
-                        LayerMask.GetMask("Player", "Enemy", "Default", "FadableEnvironment", "UnfadableEnvironment", "Wall", "Ground")))
+                        LayerMask.GetMask("HurtBox", "Default", "FadableEnvironment", "UnfadableEnvironment", "Wall", "Ground")))
                 {
                     onHit?.Invoke(hit.collider, hit.point);
                 }

Assets/Scripts/MainGame/AttackArea/Submodules/TraceMoveSubmodule.cs

@@ -3,26 +3,34 @@ using UnityEngine;
 
 namespace Cielonos.MainGame
 {
-    public class TraceMoveSubmodule : MoveSubmoduleBase
+    public partial class TraceMoveSubmodule : MoveSubmoduleBase
     {
         public Transform projectile => owner.topParent;
         public CharacterBase target;
-        public Transform targetTransform;
         public float angularSpeed;
         public float angularAcceleration;
         public float moveSpeed;
         public float moveAcceleration;
+
+        public bool autoConnect;
+        public bool autoDisconnect;
+        public float detectRadius;
+
+        private float deltaTime => owner.creator.selfTimeSm.DeltaTime;
         private Vector3 step;
         
-        public TraceMoveSubmodule(AttackAreaBase attackArea, CharacterBase target, float moveSpeed, float moveAcceleration, 
-            float angularSpeed, float angularAcceleration, Vector3 initialDirection, bool stopWhenHit) : base(attackArea, stopWhenHit)
+        public TraceMoveSubmodule(AttackAreaBase attackArea, CharacterBase target, 
+            float moveSpeed, float moveAcceleration, float angularSpeed, float angularAcceleration, Vector3 initialDirection, 
+            bool autoConnect, bool autoDisconnect, float detectRadius, bool stopWhenHit) : base(attackArea, stopWhenHit)
         {
             this.target = target;
-            this.targetTransform = target != null ? target.transform : null;
             this.angularSpeed = angularSpeed;
             this.angularAcceleration = angularAcceleration;
             this.moveSpeed = moveSpeed;
             this.moveAcceleration = moveAcceleration;
+            this.autoConnect = autoConnect;
+            this.autoDisconnect = autoDisconnect;
+            this.detectRadius = detectRadius;
             projectile.forward = initialDirection;
         }
 
@@ -30,16 +38,29 @@ namespace Cielonos.MainGame
         {
             if (target == null || target.statusSm.isDead)
             {
-                moveSpeed += moveAcceleration * Time.deltaTime;
+                moveSpeed += moveAcceleration * deltaTime;
                 moveSpeed = Mathf.Max(moveSpeed, 0f);
                 unscaledVelocity = projectile.forward * moveSpeed;
-                scaledVelocity = unscaledVelocity * timeScaleCoefficient; //attackArea.creator.selfTimeModule
-                projectile.position += scaledVelocity * Time.deltaTime;
+                scaledVelocity = timeScaleCoefficient * unscaledVelocity;
+                projectile.position += scaledVelocity * deltaTime;
+
+                if (autoConnect)
+                {
+                    if (owner.creator == MainGameManager.Player)
+                    {
+                        CharacterBase detectEnemy = BattleManager.EnemySm.GetNearestEnemy(detectRadius, owner.transform);
+                        if (detectEnemy != null)
+                        {
+                            target = detectEnemy;
+                        }
+                    }
+                }
+
                 return;
             }
 
-            angularSpeed += angularAcceleration * Time.deltaTime;
-            moveSpeed += moveAcceleration * Time.deltaTime;
+            angularSpeed += angularAcceleration * deltaTime;
+            moveSpeed += moveAcceleration * deltaTime;
             angularSpeed = Mathf.Max(angularSpeed, 0f);
             moveSpeed = Mathf.Max(moveSpeed, 0f);
                 
@@ -48,12 +69,21 @@ namespace Cielonos.MainGame
             {
                 Quaternion targetRotation = Quaternion.LookRotation(direction);
                 // RotateTowards 保证恒定转速，不会因为角度小而变慢
-                projectile.rotation = Quaternion.RotateTowards(projectile.rotation, targetRotation, angularSpeed * Time.deltaTime);
+                projectile.rotation = Quaternion.RotateTowards(projectile.rotation, targetRotation, angularSpeed * deltaTime);
             }
             
             unscaledVelocity = projectile.forward * moveSpeed;
-            scaledVelocity = unscaledVelocity * timeScaleCoefficient; //attackArea.creator.selfTimeModule.EntityDeltaTime);
-            projectile.position += scaledVelocity * Time.deltaTime;
+            scaledVelocity = unscaledVelocity * timeScaleCoefficient;
+            projectile.position += scaledVelocity * deltaTime;
+
+            if (autoDisconnect)
+            {
+                float distanceToTarget = Vector3.Distance(projectile.position, target.flexibleCenterPoint.position);
+                if (distanceToTarget > detectRadius)
+                {
+                    target = null;
+                }
+            }
         }
     }
 }

Assets/Scripts/MainGame/AttackArea/Submodules/TransformSubmodule.cs

@@ -0,0 +1,114 @@
+using SLSFramework.General;
+using UnityEngine;
+
+namespace Cielonos.MainGame
+{
+    public partial class TransformSubmodule : AttackAreaSubmoduleBase
+    {
+        public Transform targetTransform;
+        public float delay;
+        public float timer;
+        
+        public bool applyPosition;
+        public float positionMoveDuration;
+        public EaseType positionEaseType;
+        public Vector3 startPosition;
+        public Vector3 endPosition;
+        private AnimationCurve positionCurve;
+        
+        public bool applyRotation;
+        public float rotationMoveDuration;
+        public EaseType rotationEaseType;
+        public Vector3 startEulerAngles;
+        public Vector3 endEulerAngles;
+        private AnimationCurve rotationCurve;
+        
+        public bool applyScale;
+        public float scaleMoveDuration;
+        public EaseType scaleEaseType;
+        public Vector3 startScale;
+        public Vector3 endScale;
+        private AnimationCurve scaleCurve;
+        
+        public TransformSubmodule(AttackAreaBase attackArea, Transform targetTransform = null, float delay = 0f) : base(attackArea)
+        {
+            this.targetTransform = targetTransform ?? attackArea.topParent.transform;
+            this.delay = delay;
+        }
+        
+        public AttackAreaBase ApplyPositionMove(Vector3 startPosition, Vector3 endPosition, float duration, EaseType easeType = EaseType.Linear)
+        {
+            this.applyPosition = true;
+            this.startPosition = startPosition;
+            this.endPosition = endPosition;
+            this.positionMoveDuration = duration;
+            this.positionEaseType = easeType;
+            this.positionCurve = Ease.GetCurve(easeType);
+            return attackArea;
+        }
+        
+        public AttackAreaBase ApplyRotationMove(Vector3 startEulerAngles, Vector3 endEulerAngles, float duration, EaseType easeType = EaseType.Linear)
+        {
+            this.applyRotation = true;
+            this.startEulerAngles = startEulerAngles;
+            this.endEulerAngles = endEulerAngles;
+            this.rotationMoveDuration = duration;
+            this.rotationEaseType = easeType;
+            this.rotationCurve = Ease.GetCurve(easeType);
+            return attackArea;
+        }
+        
+        public AttackAreaBase ApplyScaleMove(Vector3 startScale, Vector3 endScale, float duration, EaseType easeType = EaseType.Linear)
+        {
+            this.applyScale = true;
+            this.startScale = startScale;
+            this.endScale = endScale;
+            this.scaleMoveDuration = duration;
+            this.scaleEaseType = easeType;
+            this.scaleCurve = Ease.GetCurve(easeType);
+            return attackArea;
+        }
+    }
+
+    public partial class TransformSubmodule
+    {
+        public virtual void Update()
+        {
+            if(timer > Mathf.Max(positionMoveDuration, rotationMoveDuration, scaleMoveDuration))
+            {
+                return;
+            }
+            
+            float deltaTime = attackArea.creator != null ? attackArea.creator.selfTimeSm.DeltaTime : Time.deltaTime;
+            if (delay > 0f)
+            {
+                delay -= deltaTime;
+                return;
+            }
+            
+            timer += deltaTime;
+
+            if (applyPosition)
+            {
+                float t = Mathf.Clamp01(timer / positionMoveDuration);
+                t = positionCurve.Evaluate(t);
+                attackArea.topParent.transform.localPosition = Vector3.LerpUnclamped(startPosition, endPosition, t);
+            }
+            
+            if (applyRotation)
+            {
+                float t = Mathf.Clamp01(timer / rotationMoveDuration);
+                t = rotationCurve.Evaluate(t);
+                Vector3 currentEulerAngles = Vector3.LerpUnclamped(startEulerAngles, endEulerAngles, t);
+                attackArea.topParent.transform.localRotation = Quaternion.Euler(currentEulerAngles);
+            }
+            
+            if (applyScale)
+            {
+                float t = Mathf.Clamp01(timer / scaleMoveDuration);
+                t = scaleCurve.Evaluate(t);
+                attackArea.topParent.transform.localScale = Vector3.LerpUnclamped(startScale, endScale, t);
+            }
+        }
+    }
+}

Assets/Scripts/MainGame/AttackArea/Submodules/TransformSubmodule.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3fab41e279f53e64581303af20901fbd

Assets/Scripts/MainGame/Characters/Automata/Enemies/NexusCrab.cs

@@ -211,7 +211,7 @@ namespace Cielonos.MainGame.Characters
                 .SetAttackSubmodule<Projectile>(attackData["ShockwaveMissile"])
                 .SetTimeSubmodule<Projectile>(5f)
                 .SetHitSubmodule<Projectile>()
-                .SetTraceMoveModule<Projectile>(player, 20f, -2f, 60f, -10f, bulletSpawnerTransform.forward, false)
+                .SeDetachableTraceMoveModule<Projectile>(player, 20f, -2f, 60f, -10f, bulletSpawnerTransform.forward)
                 .SetRaycastSubmodule<Projectile>(default, 0.1f, 0.2f)
                 .SetForceSubmodule<Projectile>(1f)
                 .SetReactionSubmodule<Projectile>(false, false, false, true, false, false);

Assets/Scripts/MainGame/Characters/Player/Inventory/PlayerEquipmentSubmodule.cs

@@ -32,8 +32,9 @@ namespace Cielonos.MainGame.Characters
         public void EquipMainWeapon(MainWeaponBase newWeapon)
         {
             currentMainWeapon = newWeapon;
-            currentMainWeapon.OnEquipped();
             currentMainWeapon.RegisterFullBodyFuncAnims();
+            currentMainWeapon.OnEquipped();
+            
             
             PlayerCanvas.Instance.mainWeaponUIArea.Initialize(currentMainWeapon);
         }

Assets/Scripts/MainGame/Items/Base/ItemBase.cs

@@ -20,8 +20,6 @@ namespace Cielonos.MainGame.Inventory
         public List<FuncAnimData> fullBodyFuncAnims = new List<FuncAnimData>();
         [HideInInspector]
         private List<string> registeredFunctionNames = new List<string>();
-        
-        [FormerlySerializedAs("objectData")] 
         public ViewObjectData viewObjectData;
         public VFXData vfxData;
         public ComboData comboData;

Assets/Scripts/MainGame/Items/MainWeapons/FutureWand.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using Cielonos.MainGame.Characters;
+using SLSFramework.General;
 using UnityEngine;
 
 namespace Cielonos.MainGame.Inventory
@@ -9,7 +11,9 @@ namespace Cielonos.MainGame.Inventory
         public override void OnEquipped()
         {
             base.OnEquipped();
-            RegisterFunctionsToAnimSc(SwingForward, SwingDown, LightAttack0, LightAttack1_0, LightAttack1_1, LightAttack2, LightAttack3, HeavyAttack);
+            RegisterFunctionsToAnimSc(SwingForward, SwingDown, LightAttack0, LightAttack1_0, LightAttack1_1, 
+                LightAttack2, LightAttack3, HeavyAttack, ReleaseAura);
+            PlayTargetedAnimation("Equip");
         }
         
         public override void OnPrimaryPress()
@@ -25,7 +29,7 @@ namespace Cielonos.MainGame.Inventory
                 }
                 else
                 {
-                    PlayTargetedAnimation("LightAttack" + comboSm.GetCurrentNodeName(), null, 5f);
+                    PlayTargetedAnimation("LightAttack" + comboSm.GetCurrentNodeName());
                 }
             }
         }
@@ -57,6 +61,7 @@ namespace Cielonos.MainGame.Inventory
         private void LightAttack2() => GenerateProjectile("NormalProjectile", currentTarget, 10f);
         private void LightAttack3() => GenerateProjectile("HeavyProjectile", currentTarget, 10f);
         private void HeavyAttack() => GenerateGroundArea("GroundArea");
+        private void ReleaseAura() => GenerateSquareExpandingAura("SquareExpandingAura");
     }
 
     public partial class FutureWand : MainWeaponBase
@@ -69,7 +74,6 @@ namespace Cielonos.MainGame.Inventory
         private void SwingForward()
         {
             Swing("Swing", "Swing", Vector3.forward * 0.2f);
-            Debug.Log("SwingForward executed");
         }
 
         private void SwingDown() => Swing("Swing", "Swing", Vector3.down * 0.3f);
@@ -93,8 +97,8 @@ namespace Cielonos.MainGame.Inventory
                 .SetAttackSubmodule<Projectile>(attackUnit)
                 .SetTimeSubmodule<Projectile>(10f)
                 .SetHitSubmodule<Projectile>()
-                .SetTraceMoveModule<Projectile>(currentTarget, speed, 5f, 20f, 20f, direction)
-                .SetRaycastSubmodule<Projectile>()
+                .SetAdaptiveTraceMoveModule<Projectile>(currentTarget, speed, 5f, 20f, 20f, direction)
+                .SetRaycastSubmodule<Projectile>(default, 0.25f, 0.5f)
                 .SetForceSubmodule<Projectile>(5f);
             
             audioContainer.PlaySoundFX(vfxName + "Release", projectile.gameObject, true);
@@ -113,7 +117,7 @@ namespace Cielonos.MainGame.Inventory
 
             area.Initialize<NormalArea>(player, this, Fraction.Enemy)
                 .SetAttackSubmodule<NormalArea>(attackUnit)
-                .SetTimeSubmodule<NormalArea>(1f, 0.8f, 0.2f)
+                .SetTimeSubmodule<NormalArea>(1f, 0.2f, 0.8f)
                 .SetHitSubmodule<NormalArea>(0.1f, 5)
                 .SetForceSubmodule<NormalArea>(5f, false);
             
@@ -122,5 +126,44 @@ namespace Cielonos.MainGame.Inventory
             area.hitSm.AddHitSound("NormalHit")
                 .AddHitEvent((enemy, hitPosition) => feedbackSc["Hit"].Play());
         }
+
+        private void GenerateSquareExpandingAura(string vfxName)
+        {
+            vfxData.SpawnMuzzleVFX(vfxName, muzzle);
+            NormalArea area = vfxData.SpawnVFX(vfxName).GetComponentInChildren<NormalArea>();
+            
+            AttackUnit attackUnit = attackData["LightAttack"].Clone();
+            attackUnit.hitVFX = vfxData.Get(vfxName).hitVFX;
+
+            area.Initialize<NormalArea>(player, this, Fraction.Enemy)
+                .SetAttackSubmodule<NormalArea>(attackUnit)
+                .SetTimeSubmodule<NormalArea>(4f, 0.2f, 2.8f)
+                .SetHitSubmodule<NormalArea>()
+                .SetTransformSubmodule<NormalArea>();
+
+            area.transformSm.ApplyScaleMove(Vector3.one, Vector3.one * 50, 1f, EaseType.OutQuart);
+            area.updateAction = () =>
+            {
+                if (area.timeSm.enablingTime > 3f)
+                {
+                    return;
+                }
+                
+                List<Projectile> toBeRemoved = new List<Projectile>();
+                
+                foreach (Projectile projectile in BattleManager.AttackAreaSm.enemyAttackAreas.activeProjectiles)
+                {
+                    if (area.areaCollider.IsPointInside(projectile.topParent.transform.position))
+                    {
+                        toBeRemoved.Add(projectile);
+                    }
+                }
+
+                foreach (Projectile projectile in toBeRemoved)
+                {
+                    projectile.Explode();
+                }
+            };
+        }
     }
 }

Assets/Scripts/MainGame/Items/MainWeapons/Polychrome.cs

@@ -8,6 +8,7 @@ namespace Cielonos.MainGame.Inventory
 {
     public partial class Polychrome : MainWeaponBase
     {
+        public BlockData equipBlockData;
         public float perfectBlockedTimer;
 
         protected override void Update()
@@ -26,8 +27,11 @@ namespace Cielonos.MainGame.Inventory
                 LightAttack0, LightAttack1, LightAttack2, LightAttack3, 
                 TripleAttack_0, TripleAttack_1, TripleAttack_2,
                 DisruptAttack, HeavyAttack, RunAttack, ParryAttack, StayBlocking);
+
+            SetBlock(equipBlockData);
         }
         
+        
         public override void OnPrimaryPress()
         {
             if (player.inputSc.IsHoldingSpecialA && functionSm["TripleAttack"].IsAvailable() && fullBodyFuncAnimSm.CheckPlayability())
@@ -296,8 +300,9 @@ namespace Cielonos.MainGame.Inventory
         
         string parryAnimName = "ParryL";
         
-        private void SetBlock()
+        private void SetBlock(BlockData blockData = null)
         {
+            blockData ??= this.blockData;
             BlockSource blockSource = blockData.CreateBlockSource(player, this);
             blockSource.onNormalBlock = (attackArea) =>
             {

Assets/Scripts/MainGame/Managers/BattleManager.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 227a01888e283184ca2c520daf8ac212
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MainGame/Managers/BattleManager/AttackAreaSubmodule.cs

@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+using Cielonos.MainGame.Characters;
+using UnityEngine;
+
+namespace Cielonos.MainGame
+{
+    public partial class BattleManager
+    {
+        public class AttackAreaSubmodule : SubmoduleBase<BattleManager>
+        {
+            public AttackAreaCollection playerAttackAreas;
+            public AttackAreaCollection enemyAttackAreas;
+            
+            public AttackAreaSubmodule(BattleManager owner) : base(owner)
+            {
+                playerAttackAreas = new AttackAreaCollection();
+                enemyAttackAreas = new AttackAreaCollection();
+            }
+
+            public void Register(AttackAreaBase attackArea)
+            {
+                if (attackArea.creator.fraction == Fraction.Player)
+                {
+                    Debug.Log($"Registered AttackArea: {attackArea.areaName}");
+                    playerAttackAreas.Add(attackArea);
+                }
+                else if (attackArea.creator.fraction == Fraction.Enemy)
+                {
+                    enemyAttackAreas.Add(attackArea);
+                }
+            }
+
+            public void Unregister(AttackAreaBase attackArea)
+            {
+                if (attackArea.creator.fraction == Fraction.Player)
+                {
+                    Debug.Log($"Unregistered AttackArea: {attackArea.areaName}");
+                    playerAttackAreas.Remove(attackArea);
+                }
+                else if (attackArea.creator.fraction == Fraction.Enemy)
+                {
+                    enemyAttackAreas.Remove(attackArea);
+                }
+            }
+        }
+
+        public class AttackAreaCollection
+        {
+            public List<AttackAreaBase> activeAttackAreas;
+            public List<NormalArea> activeNormalAreas;
+            public List<Projectile> activeProjectiles;
+            
+            public AttackAreaCollection()
+            {
+                activeAttackAreas = new List<AttackAreaBase>();
+                activeNormalAreas = new List<NormalArea>();
+                activeProjectiles = new List<Projectile>();
+            }
+            
+            public void Add(AttackAreaBase attackArea)
+            {
+                activeAttackAreas.Add(attackArea);
+                
+                if (attackArea is NormalArea normalArea)
+                {
+                    activeNormalAreas.Add(normalArea);
+                }
+                else if (attackArea is Projectile projectile)
+                {
+                    activeProjectiles.Add(projectile);
+                }
+            }
+            
+            public void Remove(AttackAreaBase attackArea)
+            {
+                activeAttackAreas.Remove(attackArea);
+                
+                if (attackArea is NormalArea normalArea)
+                {
+                    activeNormalAreas.Remove(normalArea);
+                }
+                else if (attackArea is Projectile projectile)
+                {
+                    activeProjectiles.Remove(projectile);
+                }
+            }
+        }
+    }
+}

Assets/Scripts/MainGame/Managers/BattleManager/AttackAreaSubmodule.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e21e9325e65fefa42924ff1f8880d266

Assets/Scripts/MainGame/Managers/BattleManager/BattleManager.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Cielonos.MainGame.Characters;
+using Sirenix.OdinInspector;
+using SLSFramework.General;
+using UnityEngine;
+
+namespace Cielonos.MainGame
+{
+    public partial class BattleManager : Singleton<BattleManager>
+    {
+        private static Player Player => MainGameManager.Player;
+        
+        [ShowInInspector]
+        private EnemySubmodule enemySm;
+        
+        [ShowInInspector]
+        private AttackAreaSubmodule attackAreaSm;
+        
+        protected override void Awake()
+        {
+            base.Awake();
+            enemySm ??= new EnemySubmodule(this);
+            attackAreaSm ??= new AttackAreaSubmodule(this);
+        }
+    }
+
+    public partial class BattleManager
+    {
+        public static EnemySubmodule EnemySm => Instance.enemySm;
+        public static AttackAreaSubmodule AttackAreaSm => Instance.attackAreaSm;
+    }
+}

Assets/Scripts/MainGame/Managers/BattleManager/EnemySubmodule.cs

@@ -1,32 +1,10 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Cielonos.MainGame.Characters;
-using Sirenix.OdinInspector;
-using SLSFramework.General;
 using UnityEngine;
 
 namespace Cielonos.MainGame
 {
-    public partial class BattleManager : Singleton<BattleManager>
-    {
-        private static Player Player => MainGameManager.Player;
-        
-        [ShowInInspector]
-        private EnemySubmodule enemySm;
-        
-        protected override void Awake()
-        {
-            base.Awake();
-            enemySm ??= new EnemySubmodule(this);
-        }
-    }
-
-    public partial class BattleManager
-    {
-        public static EnemySubmodule EnemySm => Instance.enemySm;
-    }
-    
     public partial class BattleManager
     {
         public class EnemySubmodule : SubmoduleBase<BattleManager>
@@ -98,4 +76,4 @@ namespace Cielonos.MainGame
             }
         }
     }
-}
+}

Assets/Scripts/MainGame/Managers/BattleManager/EnemySubmodule.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cfa83226b5985464ebb62c8b756c514d

Assets/Scripts/SLSFramework/General/ColliderExtensions.cs

@@ -0,0 +1,85 @@
+using UnityEngine;
+
+namespace SLSFramework.General
+{
+    public static class ColliderExtensions
+    {
+        /// <summary>
+        /// 判断一个世界坐标点是否在 BoxCollider 内部（支持旋转和缩放）
+        /// </summary>
+        public static bool IsPointInside(this BoxCollider box, Vector3 worldPoint)
+        {
+            // 1. 将世界坐标转为该 Collider 的本地坐标（处理了旋转和位置）
+            Vector3 localPoint = box.transform.InverseTransformPoint(worldPoint);
+
+            // 2. 减去中心偏移
+            localPoint -= box.center;
+
+            // 3. 计算实际的半长宽高（考虑 LossyScale 缩放）
+            // 注意：BoxCollider 的 size 已经包含了本地缩放，InverseTransformPoint 已经处理了缩放的影响
+            Vector3 halfSize = box.size * 0.5f;
+
+            // 4. AABB 判定
+            return Mathf.Abs(localPoint.x) <= halfSize.x &&
+                   Mathf.Abs(localPoint.y) <= halfSize.y &&
+                   Mathf.Abs(localPoint.z) <= halfSize.z;
+        }
+
+        /// <summary>
+        /// 判断一个世界坐标点是否在 SphereCollider 内部
+        /// </summary>
+        public static bool IsPointInside(this SphereCollider sphere, Vector3 worldPoint)
+        {
+            // 考虑中心偏移的世界坐标中心点
+            Vector3 center = sphere.transform.TransformPoint(sphere.center);
+
+            // 计算缩放后的实际半径（Unity 以三个轴中缩放最大的为准）
+            Vector3 lossyScale = sphere.transform.lossyScale;
+            float maxScale = Mathf.Max(lossyScale.x, Mathf.Max(lossyScale.y, lossyScale.z));
+            float scaledRadius = sphere.radius * maxScale;
+
+            // 距离平方判定，性能最高
+            float sqrDistance = (worldPoint - center).sqrMagnitude;
+            return sqrDistance <= (scaledRadius * scaledRadius);
+        }
+
+        /// <summary>
+        /// 判断一个世界坐标点是否在 CapsuleCollider 内部
+        /// </summary>
+        public static bool IsPointInside(this CapsuleCollider capsule, Vector3 worldPoint)
+        {
+            // 转为本地坐标
+            Vector3 localPoint = capsule.transform.InverseTransformPoint(worldPoint);
+            localPoint -= capsule.center;
+
+            // 计算胶囊体内部中心轴线的半高度（不含两头的半圆）
+            float radius = capsule.radius;
+            float halfHeight = Mathf.Max(0f, (capsule.height * 0.5f) - radius);
+
+            // 根据方向计算点到中心线段的最短距离
+            // direction: 0 = X, 1 = Y, 2 = Z
+            Vector3 closestPointOnAxis = Vector3.zero;
+            switch (capsule.direction)
+            {
+                case 0: closestPointOnAxis.x = Mathf.Clamp(localPoint.x, -halfHeight, halfHeight); break;
+                case 1: closestPointOnAxis.y = Mathf.Clamp(localPoint.y, -halfHeight, halfHeight); break;
+                case 2: closestPointOnAxis.z = Mathf.Clamp(localPoint.z, -halfHeight, halfHeight); break;
+            }
+
+            return (localPoint - closestPointOnAxis).sqrMagnitude <= (radius * radius);
+        }
+
+        /// <summary>
+        /// 通用入口：根据 Collider 类型自动选择检测方法
+        /// </summary>
+        public static bool IsPointInside(this Collider collider, Vector3 worldPoint)
+        {
+            if (collider is BoxCollider box) return box.IsPointInside(worldPoint);
+            if (collider is SphereCollider sphere) return sphere.IsPointInside(worldPoint);
+            if (collider is CapsuleCollider capsule) return capsule.IsPointInside(worldPoint);
+
+            // 如果是 MeshCollider 等复杂形状，回退到 Bounds 粗略检测
+            return collider.bounds.Contains(worldPoint);
+        }
+    }
+}

Assets/Scripts/SLSFramework/General/ColliderExtensions.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: bbfbb5726f87a7241b8f73b6201de57d

Assets/Scripts/SLSFramework/LeanPoolAssistance/PooledObject.cs

@@ -21,6 +21,9 @@ namespace SLSFramework.LeanPoolAssistance
         
         protected bool spawnExecuted = false;
         
+        public Action onSpawnAction;
+        public Action onDespawnAction;
+        
         public virtual void OnSpawn()
         {
             if (spawnExecuted)
@@ -30,6 +33,7 @@ namespace SLSFramework.LeanPoolAssistance
             
             spawnExecuted = true;
             despawnTimer = 0;
+            onSpawnAction?.Invoke();
             
             children = GetComponentsInChildren<IPoolable>().ToList();
             children.Remove(this);
@@ -56,9 +60,10 @@ namespace SLSFramework.LeanPoolAssistance
             }
         }
 
-        public void OnDespawn()
+        public virtual void OnDespawn()
         {
             spawnExecuted = false;
+            onDespawnAction?.Invoke();
             children.ForEach(child => child.OnDespawn());
         }
     }

Assets/Settings/DefaultVolumeProfile.asset

@@ -785,6 +785,9 @@ MonoBehaviour:
   highQualityFiltering:
     m_OverrideState: 1
     m_Value: 0
+  filter:
+    m_OverrideState: 1
+    m_Value: 0
   downscale:
     m_OverrideState: 1
     m_Value: 0

Assets/Settings/Mobile_RPAsset.asset

@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: Mobile_RPAsset
   m_EditorClassIdentifier: 
-  k_AssetVersion: 12
-  k_AssetPreviousVersion: 12
+  k_AssetVersion: 13
+  k_AssetPreviousVersion: 13
   m_RendererType: 1
   m_RendererData: {fileID: 0}
   m_RendererDataList:
@@ -128,9 +128,11 @@ MonoBehaviour:
   m_PrefilterSoftShadowsQualityHigh: 1
   m_PrefilterSoftShadows: 0
   m_PrefilterScreenCoord: 1
+  m_PrefilterScreenSpaceIrradiance: 0
   m_PrefilterNativeRenderPass: 1
   m_PrefilterUseLegacyLightmaps: 0
   m_PrefilterBicubicLightmapSampling: 0
+  m_PrefilterReflectionProbeRotation: 0
   m_PrefilterReflectionProbeBlending: 0
   m_PrefilterReflectionProbeBoxProjection: 0
   m_PrefilterReflectionProbeAtlas: 0

Assets/Settings/PC_Test.asset

@@ -12,8 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: PC_Test
   m_EditorClassIdentifier: 
-  k_AssetVersion: 12
-  k_AssetPreviousVersion: 12
+  k_AssetVersion: 13
+  k_AssetPreviousVersion: 13
   m_RendererType: 1
   m_RendererData: {fileID: 0}
   m_RendererDataList:
@@ -129,9 +129,11 @@ MonoBehaviour:
   m_PrefilterSoftShadowsQualityHigh: 1
   m_PrefilterSoftShadows: 0
   m_PrefilterScreenCoord: 1
+  m_PrefilterScreenSpaceIrradiance: 0
   m_PrefilterNativeRenderPass: 1
   m_PrefilterUseLegacyLightmaps: 0
   m_PrefilterBicubicLightmapSampling: 1
+  m_PrefilterReflectionProbeRotation: 0
   m_PrefilterReflectionProbeBlending: 0
   m_PrefilterReflectionProbeBoxProjection: 0
   m_PrefilterReflectionProbeAtlas: 0

ProjectSettings/EditorBuildSettings.asset

@@ -9,5 +9,6 @@ EditorBuildSettings:
     path: Assets/Scenes/SampleScene.unity
     guid: 99c9720ab356a0642a771bea13969a05
   m_configObjects:
+    com.unity.input.settings: {fileID: 11400000, guid: 4e191fdaf365af64db5c6b7e42fafa9a, type: 2}
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
   m_UseUCBPForAssetBundles: 0

ProjectSettings/URPProjectSettings.asset

@@ -13,3 +13,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_LastMaterialVersion: 10
+  m_ProjectSettingFolderPath: URPDefaultResources