Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
软件工程实践2022年春W班
麦丽素鸽
Project_AVE
提交
83ecdb60
P
Project_AVE
项目概览
软件工程实践2022年春W班
/
麦丽素鸽
/
Project_AVE
上一次同步 1 年多
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Project_AVE
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
83ecdb60
编写于
6月 16, 2022
作者:
5
572801922@qq.com
浏览文件
操作
浏览文件
下载
差异文件
修复层级导致的炮塔攻击失效问题
上级
7512fb96
1a7561f9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
6 addition
and
10 deletion
+6
-10
Assets/Scripts/GameManagers/BuildingManager.cs
Assets/Scripts/GameManagers/BuildingManager.cs
+1
-1
Assets/Scripts/Map/DoorControllTrigger.cs
Assets/Scripts/Map/DoorControllTrigger.cs
+1
-1
Assets/Scripts/Turrets/NormalTurret.cs
Assets/Scripts/Turrets/NormalTurret.cs
+0
-4
Assets/Scripts/Turrets/Turret.cs
Assets/Scripts/Turrets/Turret.cs
+2
-2
Assets/Scripts/Weapons/Bullets/Bullet.cs
Assets/Scripts/Weapons/Bullets/Bullet.cs
+1
-1
Assets/Scripts/Weapons/Bullets/NormalBullet.cs
Assets/Scripts/Weapons/Bullets/NormalBullet.cs
+1
-1
未找到文件。
Assets/Scripts/GameManagers/BuildingManager.cs
浏览文件 @
83ecdb60
...
...
@@ -64,7 +64,7 @@ public class BuildingManager : SingletonAutoMono<BuildingManager>
}
void
PutTurret
()
{
if
(
turretList
[
index
].
GetComponent
<
Turret
>().
MSRequirement
>
GameManager
.
Instance
.
magicStone
)
if
(
turretList
[
index
].
GetComponent
<
Turret
>().
turretData
.
MSRequirement
>
GameManager
.
Instance
.
magicStone
)
return
;
foreach
(
Collider2D
c
in
Physics2D
.
OverlapCircleAll
(
mouseVisualTransfrom
.
position
,
1f
))
{
...
...
Assets/Scripts/Map/DoorControllTrigger.cs
浏览文件 @
83ecdb60
...
...
@@ -34,7 +34,7 @@ public class DoorControllTrigger : MonoBehaviour
}
if
(
player
!=
null
&&
other
.
name
==
player
.
name
&&
isVehicleUpdated
)
{
Debug
.
Log
(
other
.
name
+
" "
+
player
.
name
);
//
Debug.Log(other.name + " " + player.name);
if
(!
isPlayerUpdated
)
{
isPlayerUpdated
=
true
;
...
...
Assets/Scripts/Turrets/NormalTurret.cs
浏览文件 @
83ecdb60
...
...
@@ -13,10 +13,6 @@ public class NormalTurret : Turret
sprite
=
GetComponent
<
SpriteRenderer
>();
sprite
.
sprite
=
FindSrpite
();
}
private
void
Start
()
{
Init
();
}
protected
override
void
Update
()
{
base
.
Update
();
...
...
Assets/Scripts/Turrets/Turret.cs
浏览文件 @
83ecdb60
...
...
@@ -33,7 +33,7 @@ public abstract class Turret : BattleUnit, Interactable
public
int
MSRequirement
;
private
int
baseMSRequirement
;
protected
int
destoryReturnMS
;
p
rotected
List
<
BattleUnit
>
enemyList
=
new
List
<
BattleUnit
>();
p
ublic
List
<
BattleUnit
>
enemyList
=
new
List
<
BattleUnit
>();
protected
float
timer
;
private
int
layer
;
private
bool
canShoot
=
false
;
...
...
@@ -68,7 +68,7 @@ public abstract class Turret : BattleUnit, Interactable
{
data
=
new
UpgradeData
();
data
.
type
=
UpgradeType
.
Turret
;
layer
=
LayerMask
.
GetMask
(
"Door"
,
"Wall"
,
"
Room"
,
"
Enemy"
);
layer
=
LayerMask
.
GetMask
(
"Door"
,
"Wall"
,
"Enemy"
);
currentCD
=
0
;
level
=
1
;
BattleUnitData_SO
battleUnitData
=
turretData
.
battleUnitData
;
...
...
Assets/Scripts/Weapons/Bullets/Bullet.cs
浏览文件 @
83ecdb60
...
...
@@ -40,7 +40,7 @@ public abstract class Bullet : MonoBehaviour
}
}
Vector3
hitPos
=
collision
.
bounds
.
ClosestPoint
(
transform
.
position
);
Debug
.
Log
(
"撞击到"
+
collision
.
name
);
//
Debug.Log("撞击到" + collision.name);
//调用特效
PlayeEffect
(
hitPos
);
PoolMgr
.
Instance
.
PushObj
(
gameObject
.
name
,
gameObject
);
...
...
Assets/Scripts/Weapons/Bullets/NormalBullet.cs
浏览文件 @
83ecdb60
...
...
@@ -22,7 +22,7 @@ public class NormalBullet : Bullet
if
(
MoveDistance
>
BulletRange
)
{
//回收
Debug
.
Log
(
"超过距离回收"
);
//
Debug.Log("超过距离回收");
PoolMgr
.
Instance
.
PushObj
(
gameObject
.
name
,
gameObject
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录