Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
This commit is contained in:
commit
9456e3f3b4
@ -69,7 +69,7 @@
|
||||
"S_2": {
|
||||
"1": {
|
||||
"SkillList": [
|
||||
"0"
|
||||
"skill_8"
|
||||
],
|
||||
"DamageBuff": -0.5
|
||||
},
|
||||
@ -85,7 +85,7 @@
|
||||
},
|
||||
"5": {
|
||||
"SkillList": [
|
||||
"0"
|
||||
"skill_9"
|
||||
],
|
||||
"Range": -1
|
||||
}
|
||||
@ -134,14 +134,16 @@
|
||||
"S_1": {
|
||||
"1": {
|
||||
"SkillList": [
|
||||
"0"
|
||||
"skill_10"
|
||||
]
|
||||
},
|
||||
"2": {
|
||||
"DamageBuff": 0.15
|
||||
},
|
||||
"3": {
|
||||
"DamageBuff": 0.3,
|
||||
"SkillList": [
|
||||
"skill_11"
|
||||
],
|
||||
"AttackCooldown": 0.05
|
||||
},
|
||||
"4": {
|
||||
@ -374,7 +376,7 @@
|
||||
"1": {
|
||||
"numberOfBullets": 2,
|
||||
"SkillList": [
|
||||
"0"
|
||||
"skill_12"
|
||||
]
|
||||
},
|
||||
"2": {
|
||||
|
@ -419,7 +419,7 @@ GameObject:
|
||||
- component: {fileID: 8433650274028726420}
|
||||
- component: {fileID: -3836672401185760439}
|
||||
- component: {fileID: 1608620729910401442}
|
||||
- component: {fileID: 2478240912148842105}
|
||||
- component: {fileID: 7690872035360951840}
|
||||
m_Layer: 0
|
||||
m_Name: hhl
|
||||
m_TagString: Player
|
||||
@ -514,7 +514,7 @@ MonoBehaviour:
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 2478240912148842105}
|
||||
mySkillUp: {fileID: 7690872035360951840}
|
||||
IsDead: 0
|
||||
HaveDieTime: 0
|
||||
enemyId:
|
||||
@ -573,7 +573,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
tower: {fileID: 0}
|
||||
Tag: tower
|
||||
--- !u!114 &2478240912148842105
|
||||
--- !u!114 &7690872035360951840
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -582,10 +582,10 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 8433650275485930554}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8264f0a4afc0aa347bf9dad42df2617a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: a2ff8ecfc40da814087596f9f19faaaf, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
description: "\u66F4\u65B0\u540E\u7684\u840C\u8000\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx"
|
||||
description: "\u66F4\u65B0\u540E\u7684\u840C\u5996\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx"
|
||||
role: {fileID: 8433650274028726420}
|
||||
attack: {fileID: 7276635428522831207}
|
||||
attackRange: 0
|
||||
|
@ -419,7 +419,7 @@ GameObject:
|
||||
- component: {fileID: 8433650274028726420}
|
||||
- component: {fileID: -3836672401185760439}
|
||||
- component: {fileID: 1608620729910401442}
|
||||
- component: {fileID: 4515182165523243159}
|
||||
- component: {fileID: 5460333820656519103}
|
||||
m_Layer: 0
|
||||
m_Name: mmg
|
||||
m_TagString: Player
|
||||
@ -514,7 +514,7 @@ MonoBehaviour:
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 4515182165523243159}
|
||||
mySkillUp: {fileID: 5460333820656519103}
|
||||
IsDead: 0
|
||||
HaveDieTime: 0
|
||||
enemyId:
|
||||
@ -573,7 +573,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
tower: {fileID: 0}
|
||||
Tag: tower
|
||||
--- !u!114 &4515182165523243159
|
||||
--- !u!114 &5460333820656519103
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -582,10 +582,10 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 8433650275485930554}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8264f0a4afc0aa347bf9dad42df2617a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: d4f99f82aa25d394f9b1d09589bd556b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
description: "\u66F4\u65B0\u540E\u7684\u840C\u8000\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx"
|
||||
description: "\u66F4\u65B0\u540E\u7684\u840C\u5996\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx"
|
||||
role: {fileID: 8433650274028726420}
|
||||
attack: {fileID: 7276635428522831207}
|
||||
attackRange: 0
|
||||
|
@ -419,7 +419,7 @@ GameObject:
|
||||
- component: {fileID: 8433650274028726420}
|
||||
- component: {fileID: -3836672401185760439}
|
||||
- component: {fileID: 1608620729910401442}
|
||||
- component: {fileID: 5367364036186107134}
|
||||
- component: {fileID: 6877594025809035657}
|
||||
m_Layer: 0
|
||||
m_Name: ssy
|
||||
m_TagString: Player
|
||||
@ -514,7 +514,7 @@ MonoBehaviour:
|
||||
normalIndex: 0
|
||||
isHit: 0
|
||||
myTags: 0
|
||||
mySkillUp: {fileID: 5367364036186107134}
|
||||
mySkillUp: {fileID: 6877594025809035657}
|
||||
IsDead: 0
|
||||
HaveDieTime: 0
|
||||
enemyId:
|
||||
@ -573,7 +573,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
tower: {fileID: 0}
|
||||
Tag: tower
|
||||
--- !u!114 &5367364036186107134
|
||||
--- !u!114 &6877594025809035657
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -582,7 +582,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 8433650275485930554}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8264f0a4afc0aa347bf9dad42df2617a, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: e08da4faf5757e64d8b11facfb6596ce, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
description: "\u66F4\u65B0\u540E\u7684\u840C\u5996\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b12c0c58d3f254643845309f9611b634
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -1 +1 @@
|
||||
Subproject commit 833432520044afdb4bf6566e25b8c31cf3635e53
|
||||
Subproject commit e79bd2ada79e7c60221e5a5d4b48b043976e2bc7
|
95
meng_yao/Assets/script/A_Fight/SkillUp/hhl_SkillUp.cs
Normal file
95
meng_yao/Assets/script/A_Fight/SkillUp/hhl_SkillUp.cs
Normal file
@ -0,0 +1,95 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
|
||||
public class hhl_SkillUp : SkillUp
|
||||
{
|
||||
/// <summary>
|
||||
/// 射程提升1格位置
|
||||
/// </summary>
|
||||
///
|
||||
|
||||
|
||||
public void Start()
|
||||
{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public override void useskill(string str)
|
||||
{
|
||||
if (str == "skill_8") /// 火球溅射伤害范围增加1格
|
||||
{
|
||||
attack.BoomRange += 0.5f;
|
||||
|
||||
}
|
||||
|
||||
if (str == "skill_9") ///被火球伤害的敌人会原地眩晕1秒
|
||||
{
|
||||
|
||||
|
||||
// 创建一个眩晕 Buff(持续1秒,20%概率)
|
||||
Action<Role> decelerationBuff = CreateDecelerationBuff(1f, 1f);
|
||||
|
||||
// 将 Buff 添加到玩家的 storageBuff 列表中
|
||||
role.AddBuff(role.storageBuff, decelerationBuff);
|
||||
}
|
||||
}
|
||||
|
||||
/*public override void Skill_1_1()
|
||||
{
|
||||
base.AttackRange = 1;
|
||||
attack.SetAttackRange();
|
||||
}
|
||||
/// <summary>
|
||||
/// 攻击CD减少10%
|
||||
/// </summary>
|
||||
public override void Skill_1_3()
|
||||
{
|
||||
|
||||
base.AttackCooldown -= 0.1f;
|
||||
}
|
||||
/// <summary>
|
||||
/// 每次扇形喷出3个毒雾攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_1_5()
|
||||
{
|
||||
attack.BulletNumber = 3;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 敌人中毒后受到伤害提升20%
|
||||
/// </summary>
|
||||
public override void Skill_2_1()
|
||||
{
|
||||
poisonDamage *= 1.2f;
|
||||
SetPoisonBuff();
|
||||
}
|
||||
/// <summary>
|
||||
/// 敌人中毒后毒药生效时间减少30% 攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_2_3()
|
||||
{
|
||||
base.AttackCooldown += 0.05f;
|
||||
poisonInterval *= 0.7f;
|
||||
SetPoisonBuff();
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 敌人中毒后受到伤害提升50%,攻击CD增加5%
|
||||
/// </summary>
|
||||
public override void Skill_2_5()
|
||||
{
|
||||
|
||||
base.AttackCooldown += 0.05f;
|
||||
poisonDamage *= 1.5f;
|
||||
SetPoisonBuff();
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
11
meng_yao/Assets/script/A_Fight/SkillUp/hhl_SkillUp.cs.meta
Normal file
11
meng_yao/Assets/script/A_Fight/SkillUp/hhl_SkillUp.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a2ff8ecfc40da814087596f9f19faaaf
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
40
meng_yao/Assets/script/A_Fight/SkillUp/jez_SkillUp.cs
Normal file
40
meng_yao/Assets/script/A_Fight/SkillUp/jez_SkillUp.cs
Normal file
@ -0,0 +1,40 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
|
||||
public class jez_SkillUp : SkillUp
|
||||
{
|
||||
/// <summary>
|
||||
/// 射程提升1格位置
|
||||
/// </summary>
|
||||
///
|
||||
|
||||
|
||||
public void Start()
|
||||
{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public override void useskill(string str)
|
||||
{
|
||||
if (str == "skill_10") /// 冰冻子弹命中敌人后裂开为3个小子弹
|
||||
{
|
||||
attack.splitNum = 3;
|
||||
|
||||
}
|
||||
|
||||
if (str == "skill_11") ///每个小子弹伤害增加30%
|
||||
{
|
||||
attack.SplitAttack *= (1 + 0.3f);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
11
meng_yao/Assets/script/A_Fight/SkillUp/jez_SkillUp.cs.meta
Normal file
11
meng_yao/Assets/script/A_Fight/SkillUp/jez_SkillUp.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: abe77da4259e2f94596b9a720c512b8a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
35
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs
Normal file
35
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs
Normal file
@ -0,0 +1,35 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
|
||||
public class mmg_SkillUp : SkillUp
|
||||
{
|
||||
/// <summary>
|
||||
/// Éä³ÌÌáÉý1¸ñλÖÃ
|
||||
/// </summary>
|
||||
///
|
||||
|
||||
|
||||
public void Start()
|
||||
{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public override void useskill(string str)
|
||||
{
|
||||
if (str == "skill_12") /// Ôö¼ÓÉÈÐι¥»÷·¶Î§
|
||||
{
|
||||
attack.Angle += 20;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
11
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs.meta
Normal file
11
meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d4f99f82aa25d394f9b1d09589bd556b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
40
meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs
Normal file
40
meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs
Normal file
@ -0,0 +1,40 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
|
||||
public class ssy_SkillUp : SkillUp
|
||||
{
|
||||
/// <summary>
|
||||
/// 射程提升1格位置
|
||||
/// </summary>
|
||||
///
|
||||
|
||||
|
||||
public void Start()
|
||||
{
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
public override void useskill(string str)
|
||||
{
|
||||
if (str == "skill_10") /// 冰冻子弹命中敌人后裂开为3个小子弹
|
||||
{
|
||||
attack.splitNum = 3;
|
||||
|
||||
}
|
||||
|
||||
if (str == "skill_11") ///每个小子弹伤害增加30%
|
||||
{
|
||||
attack.SplitAttack *= (1 + 0.3f);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
11
meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs.meta
Normal file
11
meng_yao/Assets/script/A_Fight/SkillUp/ssy_SkillUp.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e08da4faf5757e64d8b11facfb6596ce
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -18,6 +18,8 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
|
||||
[Header("遮罩")]
|
||||
public GameObject mask;
|
||||
|
||||
[Header("高亮")]
|
||||
public GameObject gaoliang;
|
||||
|
||||
|
||||
//生成物体的预制体
|
||||
@ -33,7 +35,7 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
|
||||
{
|
||||
this.cardIconImage.sprite = cardicon;
|
||||
|
||||
mask.SetActive(false);
|
||||
//mask.SetActive(false);
|
||||
|
||||
}
|
||||
|
||||
@ -42,10 +44,17 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
|
||||
// 拖拽开始
|
||||
public void OnBeginDrag(PointerEventData eventData)
|
||||
{
|
||||
// mask.SetActive(true);
|
||||
|
||||
if (mY==null)
|
||||
{
|
||||
mY = Instantiate(mengyaoPrefab);
|
||||
cardBox.instance.card.Add(mY);
|
||||
mY.GetComponent<enemy>().enemyId = transform.GetComponent<CardInfo>().mengyaoid;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Vector3 mousePosition = Input.mousePosition;
|
||||
|
||||
|
||||
@ -92,9 +101,9 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
|
||||
}
|
||||
|
||||
|
||||
this.enabled = false;
|
||||
//this.enabled = false;
|
||||
cardBox.instance.ChangeInPlaceNumber(1);
|
||||
mask.SetActive(true);
|
||||
|
||||
this.GetComponent<Toggle>().isOn = false;
|
||||
if (mY.GetComponent<enemy>().bulletAttackType==BulletAttackType.Zhuan)
|
||||
{
|
||||
@ -106,6 +115,7 @@ public class cardContorl : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndD
|
||||
Destroy(mY);
|
||||
}
|
||||
|
||||
//mask.SetActive(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user