Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Prefabs/Bullet/mkl/txm_bullet.prefab

@@ -0,0 +1,132 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &900173028918561104
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 900173028918561105}
+  - component: {fileID: 900173028918561110}
+  - component: {fileID: 7839896301743908329}
+  - component: {fileID: 5249129300697215084}
+  m_Layer: 0
+  m_Name: txm_bullet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &900173028918561105
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 900173028918561104}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &900173028918561110
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 900173028918561104}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: d4cc9831d1e6f9244aa466fbff4d9944, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!58 &7839896301743908329
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 900173028918561104}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  serializedVersion: 2
+  m_Radius: 1.0649999
+--- !u!114 &5249129300697215084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 900173028918561104}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 25a4f829952155e48bbe3abf99b78f2e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  role: {fileID: 0}
+  attackObj: {fileID: 0}
+  myBulletType: 0
+  bulletAttributes: 0
+  bulletMoveType: 0
+  BulletDeadTimer: 10
+  animator: {fileID: 0}
+  IsMove: 1
+  Collider2D: {fileID: 7839896301743908329}
+  effectPres: []
+  NumberOfBulletAttacks: 1
+  Target: {fileID: 0}
+  noLockEnemy: 0
+  Cansplit: 0
+  smallBulletPrefab: {fileID: 0}
+  CanBoom: 0

meng_yao/Assets/Prefabs/Bullet/mkl/txm_bullet.prefab.meta

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

meng_yao/Assets/Prefabs/Bullet/txmbuttet.meta

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

meng_yao/Assets/Prefabs/Bullet/txmbuttet/txm.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: d4cc9831d1e6f9244aa466fbff4d9944
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/Prefabs/charatar/txm.prefab

@@ -361,7 +361,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 90e9cd2fc0a74084fbf1a89015db94a9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bulletPrefab: {fileID: 900173028918561104, guid: 99830c598e775fb42b39abf253c5f084, type: 3}
+  bulletPrefab: {fileID: 900173028918561104, guid: dbe3498ad2ddb6d4db5fd99c64bf790f, type: 3}
   role: {fileID: 8433650274028726420}
   damageTyp: 2
   attackCooldown: 1
@@ -419,7 +419,7 @@ GameObject:
   - component: {fileID: 8433650274028726420}
   - component: {fileID: -3836672401185760439}
   - component: {fileID: 1608620729910401442}
-  - component: {fileID: 3258498600701209889}
+  - component: {fileID: 793661412592447090}
   m_Layer: 0
   m_Name: txm
   m_TagString: Player
@@ -485,20 +485,20 @@ MonoBehaviour:
   spriteRenderers: {fileID: 0}
   HurtDirectin: 0
   Quality: 0
-  Elements: 2
+  Elements: 4
-  Info: "\u5F53\u653B\u51FB\u8303\u56F4\u5185\u51FA\u73B0\u654C\u4EBA\u540E\u5C31\u4F1A\u9501\u5B9A\u654C\u4EBA\uFF0C\u7136\u540E\u6301\u7EED\u5C04\u51FA\u5B50\u5F39\u8FDB\u884C\u653B\u51FB\u3002"
+  Info: "\u629B\u51FA\u5DE8\u5927\u77F3\u5757\u653B\u51FB\u8FDC\u5904\u7684\u654C\u4EBA,\u88AB\u77F3\u5757\u51FB\u4E2D\u7684\u654C\u4EBA\u4F1A\u56E0\u4E3A\u7729\u6655\u800C\u6682\u505C\u524D\u8FDB"
-  SkillId: 2001
+  SkillId: 3001
-  AttackType: 0
+  AttackType: 1
   AttackActionType: 0
   AttackRange: 6
-  AttackCD: 0.6
+  AttackCD: 3
-  CritRate: 0.065
+  CritRate: 0.05
   CriticalHitRateBonus: 0
   killNum: 0
   isMoFa: 0
   gold: 10
-  MaxAttack: 6
+  MaxAttack: 12
-  MinAttack: 4
+  MinAttack: 10
   isGoodDamege: 0
   physicalArmor: 10
   magicArmor: 5
@@ -515,7 +515,7 @@ MonoBehaviour:
   normalIndex: 0
   isHit: 0
   myTags: 0
-  mySkillUp: {fileID: 3258498600701209889}
+  mySkillUp: {fileID: 793661412592447090}
   IsDead: 0
   HaveDieTime: 0
   enemyId: 
@@ -531,7 +531,7 @@ MonoBehaviour:
   DamageToPlayer: 0
   HealthPerLevel: 0
   DefensePerLevel: 0
-  elementType: 1
+  elementType: 4
   defenseType: 0
   index: 0
 --- !u!61 &-3836672401185760439
@@ -574,7 +574,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tower: {fileID: 0}
   Tag: tower
---- !u!114 &3258498600701209889
+--- !u!114 &793661412592447090
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -583,7 +583,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8433650275485930554}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf06a056a8f837740a4fca76de3a5ed5, type: 3}
+  m_Script: {fileID: 11500000, guid: 86e8e9ff089f20948a58bb7c69953871, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   retbutton: {fileID: 0}

meng_yao/Assets/script/A_Fight/SkillUp/txm_SkillUp.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class txm_SkillUp : SkillUp
+{
+    /// <summary>
+    ///被巨石击中的敌人在3秒内速度减少50%
+    /// </summary>
+    public override void Skill_1_1()
+    {
+        // 创建一个眩晕 Buff（持续1秒，20%概率）
+        Action<Role> decelerationBuff = CreateSlowDownBuff(0.5f, 3f);
+        // 将 Buff 添加到玩家的 storageBuff 列表中
+        role.AddBuff(role.storageBuff, decelerationBuff);
+    }
+    /// <summary>
+    /// 巨石的溅伤范围增加1格,射程减少1格
+    /// </summary>
+    public override void Skill_1_3()
+    {
+        attack.BoomRange += 1;
+        base.AttackRange = -1;
+        attack.SetAttackRange();
+    }
+    /// <summary>
+    /// 被巨石击中的敌人在2秒内陷入眩晕状态无法移动,射程减少1格
+    /// </summary>
+    public override void Skill_1_5()
+    {
+        base.CriticalRate += 0.2f;
+        base.AttackRange = -1;
+        attack.SetAttackRange();
+    }
+
+
+    /// <summary>
+    /// 巨石飞行速度增加20%
+    /// </summary>
+    public override void Skill_2_1()
+    {
+        base.AttackCooldown += -0.25f;
+    }
+    /// <summary>
+    /// 攻击范围增加2格,攻击CD增加5%
+    /// </summary>
+    public override void Skill_2_3()
+    {
+        base.DamageOfMin += 0.25f;
+        base.AttackRange = -1;
+        attack.SetAttackRange();
+    }
+    /// <summary>
+    /// 巨石的溅伤范围增加1格,攻击CD增加5%
+    /// </summary>
+    public override void Skill_2_5()
+    {
+        base.CriticalRate += 0.2f;
+        base.AttackCooldown += 0.05f;
+    }
+}

meng_yao/Assets/script/A_Fight/SkillUp/txm_SkillUp.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 86e8e9ff089f20948a58bb7c69953871
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: