Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
This commit is contained in:
commit
269ab8a676
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -18,7 +18,7 @@ namespace BlueWaterProject
|
|||||||
public int rotateSpeed = 10;
|
public int rotateSpeed = 10;
|
||||||
|
|
||||||
[Required("습격모드 카메라를 넣어주세요.")]
|
[Required("습격모드 카메라를 넣어주세요.")]
|
||||||
public CinemachineVirtualCamera assaultCam;
|
[field: SerializeField] public CinemachineFreeLook AssaultCam { get; set; }
|
||||||
|
|
||||||
[Required("보트내부 카메라를 넣어주세요.")]
|
[Required("보트내부 카메라를 넣어주세요.")]
|
||||||
public CinemachineVirtualCamera inShipCam;
|
public CinemachineVirtualCamera inShipCam;
|
||||||
@ -45,11 +45,12 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
TakeCamMovement();
|
TakeCamMovement();
|
||||||
DredgeCamRotate();
|
DredgeCamRotate();
|
||||||
|
AssaultCamRotate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CamAssaultMode()
|
public void CamAssaultMode()
|
||||||
{
|
{
|
||||||
assaultCam.Priority = 1;
|
AssaultCam.Priority = 1;
|
||||||
dredgeCam.Priority = 0;
|
dredgeCam.Priority = 0;
|
||||||
inShipCam.Priority = 0;
|
inShipCam.Priority = 0;
|
||||||
}
|
}
|
||||||
@ -57,7 +58,7 @@ namespace BlueWaterProject
|
|||||||
public void CamDredgeMode()
|
public void CamDredgeMode()
|
||||||
{
|
{
|
||||||
dredgeCam.Priority = 1;
|
dredgeCam.Priority = 1;
|
||||||
assaultCam.Priority = 0;
|
AssaultCam.Priority = 0;
|
||||||
inShipCam.Priority = 0;
|
inShipCam.Priority = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -65,7 +66,7 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
inShipCam.Priority = 1;
|
inShipCam.Priority = 1;
|
||||||
dredgeCam.Priority = 0;
|
dredgeCam.Priority = 0;
|
||||||
assaultCam.Priority = 0;
|
AssaultCam.Priority = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TakeCamMovement()
|
private void TakeCamMovement()
|
||||||
@ -92,7 +93,7 @@ namespace BlueWaterProject
|
|||||||
Quaternion.Euler(takeAimCam.transform.rotation.eulerAngles.x, yRotation, takeAimCam.transform.rotation.eulerAngles.z);
|
Quaternion.Euler(takeAimCam.transform.rotation.eulerAngles.x, yRotation, takeAimCam.transform.rotation.eulerAngles.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void DredgeCamRotate()
|
private void DredgeCamRotate()
|
||||||
{
|
{
|
||||||
if (Input.GetMouseButtonDown(1))
|
if (Input.GetMouseButtonDown(1))
|
||||||
{
|
{
|
||||||
@ -109,5 +110,33 @@ namespace BlueWaterProject
|
|||||||
dredgeCamOrbitalTransposer.m_RecenterToTargetHeading.m_enabled = true;
|
dredgeCamOrbitalTransposer.m_RecenterToTargetHeading.m_enabled = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void AssaultCamRotate()
|
||||||
|
{
|
||||||
|
if (Input.GetMouseButtonDown(1))
|
||||||
|
{
|
||||||
|
//AssaultCam의 X Axis의 Speed를 변경
|
||||||
|
AssaultCam.m_XAxis.m_MaxSpeed = 150;
|
||||||
|
AssaultCam.m_XAxis.m_InputAxisName = "Mouse X";
|
||||||
|
|
||||||
|
//AssaultCam의 Y Axis의 Speed를 변경
|
||||||
|
AssaultCam.m_YAxis.m_MaxSpeed = 2;
|
||||||
|
AssaultCam.m_YAxis.m_InputAxisName = "Mouse Y";
|
||||||
|
|
||||||
|
AssaultCam.m_RecenterToTargetHeading.m_enabled = false;
|
||||||
|
}
|
||||||
|
else if (Input.GetMouseButtonUp(1))
|
||||||
|
{
|
||||||
|
//AssaultCam의 X Axis의 Speed를 원래대로
|
||||||
|
AssaultCam.m_XAxis.m_MaxSpeed = 0;
|
||||||
|
AssaultCam.m_XAxis.m_InputAxisName = "";
|
||||||
|
|
||||||
|
//AssaultCam의 Y Axis의 Speed를 원래대로
|
||||||
|
AssaultCam.m_YAxis.m_MaxSpeed = 0;
|
||||||
|
AssaultCam.m_YAxis.m_InputAxisName = "";
|
||||||
|
|
||||||
|
AssaultCam.m_RecenterToTargetHeading.m_enabled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -13,210 +13,210 @@ MonoBehaviour:
|
|||||||
m_Name: EnemyStatDataSo
|
m_Name: EnemyStatDataSo
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
enemyStatDataList:
|
enemyStatDataList:
|
||||||
- <Idx>k__BackingField: enemy_stat_sailor_001
|
- <Idx>k__BackingField: enemy_stat_archer_001
|
||||||
<ViewIdx>k__BackingField: enemy_view_sailor_001
|
<ViewIdx>k__BackingField: enemy_view_archer_001
|
||||||
<UnitType>k__BackingField: 0
|
<UnitType>k__BackingField: 0
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 30
|
<MaxHp>k__BackingField: 100
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 50
|
<Atk>k__BackingField: 30
|
||||||
<Def>k__BackingField: 0
|
<Def>k__BackingField: 0
|
||||||
<MoveSpd>k__BackingField: 7
|
<MoveSpd>k__BackingField: 15
|
||||||
<AtkCooldown>k__BackingField: 3
|
<AtkCooldown>k__BackingField: 3
|
||||||
<ViewRange>k__BackingField: 40
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 40
|
<AtkRange>k__BackingField: 30
|
||||||
<DefenseRange>k__BackingField: 0
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 25
|
<ShieldPenetrationRate>k__BackingField: 25
|
||||||
<AvoidanceRate>k__BackingField: 20
|
<AvoidanceRate>k__BackingField: 20
|
||||||
<UsingShield>k__BackingField: 0
|
<UsingShield>k__BackingField: 0
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
<UsingBow>k__BackingField: 1
|
<UsingBow>k__BackingField: 1
|
||||||
<Inaccuracy>k__BackingField: 4
|
<Inaccuracy>k__BackingField: 2
|
||||||
- <Idx>k__BackingField: enemy_stat_sailor_002
|
- <Idx>k__BackingField: enemy_stat_spearknight_001
|
||||||
<ViewIdx>k__BackingField: enemy_view_sailor_002
|
<ViewIdx>k__BackingField: enemy_view_spearknight_001
|
||||||
<UnitType>k__BackingField: 1
|
<UnitType>k__BackingField: 1
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 60
|
<MaxHp>k__BackingField: 200
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 40
|
<Atk>k__BackingField: 40
|
||||||
<Def>k__BackingField: 10
|
<Def>k__BackingField: 20
|
||||||
<MoveSpd>k__BackingField: 6.5
|
<MoveSpd>k__BackingField: 8
|
||||||
<AtkCooldown>k__BackingField: 2
|
<AtkCooldown>k__BackingField: 2
|
||||||
<ViewRange>k__BackingField: 10
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 3.5
|
<AtkRange>k__BackingField: 3.5
|
||||||
<DefenseRange>k__BackingField: 10
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 75
|
<ShieldPenetrationRate>k__BackingField: 75
|
||||||
<AvoidanceRate>k__BackingField: 10
|
<AvoidanceRate>k__BackingField: 10
|
||||||
<UsingShield>k__BackingField: 1
|
<UsingShield>k__BackingField: 1
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
<UsingBow>k__BackingField: 0
|
<UsingBow>k__BackingField: 0
|
||||||
<Inaccuracy>k__BackingField: 0
|
<Inaccuracy>k__BackingField: 0
|
||||||
- <Idx>k__BackingField: enemy_stat_sailor_003
|
- <Idx>k__BackingField: enemy_stat_spearman_001
|
||||||
<ViewIdx>k__BackingField: enemy_view_sailor_003
|
<ViewIdx>k__BackingField: enemy_view_spearman_001
|
||||||
<UnitType>k__BackingField: 2
|
<UnitType>k__BackingField: 2
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 40
|
<MaxHp>k__BackingField: 150
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 50
|
<Atk>k__BackingField: 40
|
||||||
<Def>k__BackingField: 5
|
<Def>k__BackingField: 0
|
||||||
<MoveSpd>k__BackingField: 7.5
|
<MoveSpd>k__BackingField: 10
|
||||||
<AtkCooldown>k__BackingField: 2
|
<AtkCooldown>k__BackingField: 2
|
||||||
<ViewRange>k__BackingField: 15
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 3.5
|
<AtkRange>k__BackingField: 3.5
|
||||||
<DefenseRange>k__BackingField: 15
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 75
|
<ShieldPenetrationRate>k__BackingField: 75
|
||||||
<AvoidanceRate>k__BackingField: 20
|
<AvoidanceRate>k__BackingField: 20
|
||||||
<UsingShield>k__BackingField: 0
|
<UsingShield>k__BackingField: 0
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
<UsingBow>k__BackingField: 0
|
<UsingBow>k__BackingField: 0
|
||||||
<Inaccuracy>k__BackingField: 0
|
<Inaccuracy>k__BackingField: 0
|
||||||
- <Idx>k__BackingField: enemy_stat_sailor_004
|
- <Idx>k__BackingField: enemy_stat_swordknight_001
|
||||||
<ViewIdx>k__BackingField: enemy_view_sailor_004
|
<ViewIdx>k__BackingField: enemy_view_swordknight_001
|
||||||
<UnitType>k__BackingField: 3
|
<UnitType>k__BackingField: 3
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 60
|
<MaxHp>k__BackingField: 200
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 30
|
<Atk>k__BackingField: 30
|
||||||
<Def>k__BackingField: 10
|
<Def>k__BackingField: 20
|
||||||
<MoveSpd>k__BackingField: 7
|
<MoveSpd>k__BackingField: 10
|
||||||
<AtkCooldown>k__BackingField: 1.5
|
<AtkCooldown>k__BackingField: 1.5
|
||||||
<ViewRange>k__BackingField: 10
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 3
|
<AtkRange>k__BackingField: 3
|
||||||
<DefenseRange>k__BackingField: 10
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 50
|
<ShieldPenetrationRate>k__BackingField: 50
|
||||||
<AvoidanceRate>k__BackingField: 10
|
<AvoidanceRate>k__BackingField: 10
|
||||||
<UsingShield>k__BackingField: 1
|
<UsingShield>k__BackingField: 1
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
<UsingBow>k__BackingField: 0
|
<UsingBow>k__BackingField: 0
|
||||||
<Inaccuracy>k__BackingField: 0
|
<Inaccuracy>k__BackingField: 0
|
||||||
- <Idx>k__BackingField: enemy_stat_sailor_005
|
- <Idx>k__BackingField: enemy_stat_swordman_001
|
||||||
<ViewIdx>k__BackingField: enemy_view_sailor_005
|
<ViewIdx>k__BackingField: enemy_view_swordman_001
|
||||||
<UnitType>k__BackingField: 4
|
<UnitType>k__BackingField: 4
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 45
|
<MaxHp>k__BackingField: 150
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 35
|
<Atk>k__BackingField: 30
|
||||||
<Def>k__BackingField: 5
|
<Def>k__BackingField: 0
|
||||||
<MoveSpd>k__BackingField: 8
|
<MoveSpd>k__BackingField: 13
|
||||||
<AtkCooldown>k__BackingField: 1.5
|
<AtkCooldown>k__BackingField: 1.5
|
||||||
<ViewRange>k__BackingField: 15
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 3
|
<AtkRange>k__BackingField: 3
|
||||||
<DefenseRange>k__BackingField: 15
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 50
|
<ShieldPenetrationRate>k__BackingField: 50
|
||||||
<AvoidanceRate>k__BackingField: 30
|
<AvoidanceRate>k__BackingField: 30
|
||||||
<UsingShield>k__BackingField: 0
|
<UsingShield>k__BackingField: 0
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
<UsingBow>k__BackingField: 0
|
<UsingBow>k__BackingField: 0
|
||||||
<Inaccuracy>k__BackingField: 0
|
<Inaccuracy>k__BackingField: 0
|
||||||
- <Idx>k__BackingField: enemy_stat_captain_001
|
- <Idx>k__BackingField: enemy_stat_archer_101
|
||||||
<ViewIdx>k__BackingField: enemy_view_captain_001
|
<ViewIdx>k__BackingField: enemy_view_archer_101
|
||||||
<UnitType>k__BackingField: 0
|
<UnitType>k__BackingField: 0
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 150
|
|
||||||
<CurrentHp>k__BackingField: 0
|
|
||||||
<Atk>k__BackingField: 50
|
|
||||||
<Def>k__BackingField: 0
|
|
||||||
<MoveSpd>k__BackingField: 7
|
|
||||||
<AtkCooldown>k__BackingField: 3
|
|
||||||
<ViewRange>k__BackingField: 40
|
|
||||||
<AtkRange>k__BackingField: 40
|
|
||||||
<DefenseRange>k__BackingField: 0
|
|
||||||
<ShieldPenetrationRate>k__BackingField: 25
|
|
||||||
<AvoidanceRate>k__BackingField: 20
|
|
||||||
<UsingShield>k__BackingField: 0
|
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
|
||||||
<UsingBow>k__BackingField: 1
|
|
||||||
<Inaccuracy>k__BackingField: 4
|
|
||||||
- <Idx>k__BackingField: enemy_stat_captain_002
|
|
||||||
<ViewIdx>k__BackingField: enemy_view_captain_002
|
|
||||||
<UnitType>k__BackingField: 1
|
|
||||||
<AttackerType>k__BackingField: -1
|
|
||||||
<OffenseType>k__BackingField: -1
|
|
||||||
<DefenseType>k__BackingField: -1
|
|
||||||
<MaxHp>k__BackingField: 300
|
|
||||||
<CurrentHp>k__BackingField: 0
|
|
||||||
<Atk>k__BackingField: 40
|
|
||||||
<Def>k__BackingField: 10
|
|
||||||
<MoveSpd>k__BackingField: 6.5
|
|
||||||
<AtkCooldown>k__BackingField: 2
|
|
||||||
<ViewRange>k__BackingField: 10
|
|
||||||
<AtkRange>k__BackingField: 3.5
|
|
||||||
<DefenseRange>k__BackingField: 10
|
|
||||||
<ShieldPenetrationRate>k__BackingField: 75
|
|
||||||
<AvoidanceRate>k__BackingField: 10
|
|
||||||
<UsingShield>k__BackingField: 1
|
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
|
||||||
<UsingBow>k__BackingField: 0
|
|
||||||
<Inaccuracy>k__BackingField: 0
|
|
||||||
- <Idx>k__BackingField: enemy_stat_captain_003
|
|
||||||
<ViewIdx>k__BackingField: enemy_view_captain_003
|
|
||||||
<UnitType>k__BackingField: 2
|
|
||||||
<AttackerType>k__BackingField: -1
|
|
||||||
<OffenseType>k__BackingField: -1
|
|
||||||
<DefenseType>k__BackingField: -1
|
|
||||||
<MaxHp>k__BackingField: 200
|
|
||||||
<CurrentHp>k__BackingField: 0
|
|
||||||
<Atk>k__BackingField: 50
|
|
||||||
<Def>k__BackingField: 5
|
|
||||||
<MoveSpd>k__BackingField: 7.5
|
|
||||||
<AtkCooldown>k__BackingField: 2
|
|
||||||
<ViewRange>k__BackingField: 15
|
|
||||||
<AtkRange>k__BackingField: 3.5
|
|
||||||
<DefenseRange>k__BackingField: 15
|
|
||||||
<ShieldPenetrationRate>k__BackingField: 75
|
|
||||||
<AvoidanceRate>k__BackingField: 20
|
|
||||||
<UsingShield>k__BackingField: 0
|
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
|
||||||
<UsingBow>k__BackingField: 0
|
|
||||||
<Inaccuracy>k__BackingField: 0
|
|
||||||
- <Idx>k__BackingField: enemy_stat_captain_004
|
|
||||||
<ViewIdx>k__BackingField: enemy_view_captain_004
|
|
||||||
<UnitType>k__BackingField: 3
|
|
||||||
<AttackerType>k__BackingField: -1
|
|
||||||
<OffenseType>k__BackingField: -1
|
|
||||||
<DefenseType>k__BackingField: -1
|
|
||||||
<MaxHp>k__BackingField: 300
|
<MaxHp>k__BackingField: 300
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 30
|
<Atk>k__BackingField: 30
|
||||||
<Def>k__BackingField: 10
|
<Def>k__BackingField: 0
|
||||||
<MoveSpd>k__BackingField: 7
|
<MoveSpd>k__BackingField: 15
|
||||||
|
<AtkCooldown>k__BackingField: 3
|
||||||
|
<ViewRange>k__BackingField: 40
|
||||||
|
<AtkRange>k__BackingField: 30
|
||||||
|
<DefenseRange>k__BackingField: 30
|
||||||
|
<ShieldPenetrationRate>k__BackingField: 25
|
||||||
|
<AvoidanceRate>k__BackingField: 20
|
||||||
|
<UsingShield>k__BackingField: 0
|
||||||
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
|
<UsingBow>k__BackingField: 1
|
||||||
|
<Inaccuracy>k__BackingField: 4
|
||||||
|
- <Idx>k__BackingField: enemy_stat_spearknight_101
|
||||||
|
<ViewIdx>k__BackingField: enemy_view_spearknight_101
|
||||||
|
<UnitType>k__BackingField: 1
|
||||||
|
<AttackerType>k__BackingField: -1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: -1
|
||||||
|
<MaxHp>k__BackingField: 400
|
||||||
|
<CurrentHp>k__BackingField: 0
|
||||||
|
<Atk>k__BackingField: 40
|
||||||
|
<Def>k__BackingField: 0
|
||||||
|
<MoveSpd>k__BackingField: 10
|
||||||
|
<AtkCooldown>k__BackingField: 2
|
||||||
|
<ViewRange>k__BackingField: 40
|
||||||
|
<AtkRange>k__BackingField: 3.5
|
||||||
|
<DefenseRange>k__BackingField: 30
|
||||||
|
<ShieldPenetrationRate>k__BackingField: 75
|
||||||
|
<AvoidanceRate>k__BackingField: 10
|
||||||
|
<UsingShield>k__BackingField: 1
|
||||||
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
|
<UsingBow>k__BackingField: 0
|
||||||
|
<Inaccuracy>k__BackingField: 0
|
||||||
|
- <Idx>k__BackingField: enemy_stat_spearman_101
|
||||||
|
<ViewIdx>k__BackingField: enemy_view_spearman_101
|
||||||
|
<UnitType>k__BackingField: 2
|
||||||
|
<AttackerType>k__BackingField: -1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: -1
|
||||||
|
<MaxHp>k__BackingField: 300
|
||||||
|
<CurrentHp>k__BackingField: 0
|
||||||
|
<Atk>k__BackingField: 50
|
||||||
|
<Def>k__BackingField: 5
|
||||||
|
<MoveSpd>k__BackingField: 7.5
|
||||||
|
<AtkCooldown>k__BackingField: 2
|
||||||
|
<ViewRange>k__BackingField: 40
|
||||||
|
<AtkRange>k__BackingField: 3.5
|
||||||
|
<DefenseRange>k__BackingField: 30
|
||||||
|
<ShieldPenetrationRate>k__BackingField: 75
|
||||||
|
<AvoidanceRate>k__BackingField: 20
|
||||||
|
<UsingShield>k__BackingField: 0
|
||||||
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
|
<UsingBow>k__BackingField: 0
|
||||||
|
<Inaccuracy>k__BackingField: 0
|
||||||
|
- <Idx>k__BackingField: enemy_stat_swordknight_101
|
||||||
|
<ViewIdx>k__BackingField: enemy_view_swordknight_101
|
||||||
|
<UnitType>k__BackingField: 3
|
||||||
|
<AttackerType>k__BackingField: -1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: -1
|
||||||
|
<MaxHp>k__BackingField: 400
|
||||||
|
<CurrentHp>k__BackingField: 0
|
||||||
|
<Atk>k__BackingField: 30
|
||||||
|
<Def>k__BackingField: 20
|
||||||
|
<MoveSpd>k__BackingField: 10
|
||||||
<AtkCooldown>k__BackingField: 1.5
|
<AtkCooldown>k__BackingField: 1.5
|
||||||
<ViewRange>k__BackingField: 10
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 3
|
<AtkRange>k__BackingField: 3
|
||||||
<DefenseRange>k__BackingField: 10
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 50
|
<ShieldPenetrationRate>k__BackingField: 50
|
||||||
<AvoidanceRate>k__BackingField: 10
|
<AvoidanceRate>k__BackingField: 10
|
||||||
<UsingShield>k__BackingField: 1
|
<UsingShield>k__BackingField: 1
|
||||||
<PenetrationResistivity>k__BackingField: 0
|
<PenetrationResistivity>k__BackingField: 0
|
||||||
<UsingBow>k__BackingField: 0
|
<UsingBow>k__BackingField: 0
|
||||||
<Inaccuracy>k__BackingField: 0
|
<Inaccuracy>k__BackingField: 0
|
||||||
- <Idx>k__BackingField: enemy_stat_captain_005
|
- <Idx>k__BackingField: enemy_stat_swordman_101
|
||||||
<ViewIdx>k__BackingField: enemy_view_captain_005
|
<ViewIdx>k__BackingField: enemy_view_swordman_101
|
||||||
<UnitType>k__BackingField: 4
|
<UnitType>k__BackingField: 4
|
||||||
<AttackerType>k__BackingField: -1
|
<AttackerType>k__BackingField: -1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: -1
|
<DefenseType>k__BackingField: -1
|
||||||
<MaxHp>k__BackingField: 225
|
<MaxHp>k__BackingField: 300
|
||||||
<CurrentHp>k__BackingField: 0
|
<CurrentHp>k__BackingField: 0
|
||||||
<Atk>k__BackingField: 35
|
<Atk>k__BackingField: 30
|
||||||
<Def>k__BackingField: 5
|
<Def>k__BackingField: 0
|
||||||
<MoveSpd>k__BackingField: 8
|
<MoveSpd>k__BackingField: 13
|
||||||
<AtkCooldown>k__BackingField: 1.5
|
<AtkCooldown>k__BackingField: 1.5
|
||||||
<ViewRange>k__BackingField: 15
|
<ViewRange>k__BackingField: 40
|
||||||
<AtkRange>k__BackingField: 3
|
<AtkRange>k__BackingField: 3
|
||||||
<DefenseRange>k__BackingField: 15
|
<DefenseRange>k__BackingField: 30
|
||||||
<ShieldPenetrationRate>k__BackingField: 50
|
<ShieldPenetrationRate>k__BackingField: 50
|
||||||
<AvoidanceRate>k__BackingField: 30
|
<AvoidanceRate>k__BackingField: 30
|
||||||
<UsingShield>k__BackingField: 0
|
<UsingShield>k__BackingField: 0
|
||||||
|
@ -13,27 +13,63 @@ MonoBehaviour:
|
|||||||
m_Name: EnemyUnitStatDataSo
|
m_Name: EnemyUnitStatDataSo
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
enemyUnitStatDataList:
|
enemyUnitStatDataList:
|
||||||
- <Idx>k__BackingField: enemy_archer_unit_001
|
- <Idx>k__BackingField: enemy_archer_unit_001_d5
|
||||||
<CaptainStatIdx>k__BackingField: enemy_stat_captain_001
|
<CaptainStatIdx>k__BackingField: enemy_stat_archer_101
|
||||||
<SailorStatIdx>k__BackingField: enemy_stat_sailor_001
|
<SailorStatIdx>k__BackingField: enemy_stat_archer_001
|
||||||
<UnitName>k__BackingField: EnemyArcherUnit001
|
<UnitName>k__BackingField: EnemyArcherUnit001
|
||||||
<SailorCount>k__BackingField: 5
|
<SailorCount>k__BackingField: 5
|
||||||
<AttackerType>k__BackingField: 1
|
<AttackerType>k__BackingField: 1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: 2
|
||||||
|
<EnemyAiList>k__BackingField: []
|
||||||
|
- <Idx>k__BackingField: enemy_spear_knight_unit_001_k5
|
||||||
|
<CaptainStatIdx>k__BackingField: enemy_stat_spearknight_101
|
||||||
|
<SailorStatIdx>k__BackingField: enemy_stat_spearknight_001
|
||||||
|
<UnitName>k__BackingField: EnemySpearKnightUnit001
|
||||||
|
<SailorCount>k__BackingField: 5
|
||||||
|
<AttackerType>k__BackingField: 1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: 3
|
<DefenseType>k__BackingField: 3
|
||||||
<EnemyAiList>k__BackingField: []
|
<EnemyAiList>k__BackingField: []
|
||||||
- <Idx>k__BackingField: enemy_sword_knight_unit_001
|
- <Idx>k__BackingField: enemy_spear_man_unit_001_d7
|
||||||
<CaptainStatIdx>k__BackingField: enemy_stat_captain_004
|
<CaptainStatIdx>k__BackingField: enemy_stat_spearman_101
|
||||||
<SailorStatIdx>k__BackingField: enemy_stat_sailor_004
|
<SailorStatIdx>k__BackingField: enemy_stat_spearman_001
|
||||||
<UnitName>k__BackingField: EnemySwordKnightUnit001
|
<UnitName>k__BackingField: EnemySpearmanUnit001
|
||||||
<SailorCount>k__BackingField: 11
|
<SailorCount>k__BackingField: 7
|
||||||
<AttackerType>k__BackingField: 1
|
<AttackerType>k__BackingField: 1
|
||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: 2
|
<DefenseType>k__BackingField: 2
|
||||||
<EnemyAiList>k__BackingField: []
|
<EnemyAiList>k__BackingField: []
|
||||||
- <Idx>k__BackingField: enemy_swordman_unit_001
|
- <Idx>k__BackingField: enemy_sword_knight_unit_001_s6
|
||||||
<CaptainStatIdx>k__BackingField: enemy_stat_captain_005
|
<CaptainStatIdx>k__BackingField: enemy_stat_swordknight_101
|
||||||
<SailorStatIdx>k__BackingField: enemy_stat_sailor_005
|
<SailorStatIdx>k__BackingField: enemy_stat_swordknight_001
|
||||||
|
<UnitName>k__BackingField: EnemySwordKnightUnit001
|
||||||
|
<SailorCount>k__BackingField: 6
|
||||||
|
<AttackerType>k__BackingField: 1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: 0
|
||||||
|
<EnemyAiList>k__BackingField: []
|
||||||
|
- <Idx>k__BackingField: enemy_sword_knight_unit_002_s6
|
||||||
|
<CaptainStatIdx>k__BackingField: enemy_stat_swordknight_101
|
||||||
|
<SailorStatIdx>k__BackingField: enemy_stat_swordknight_001
|
||||||
|
<UnitName>k__BackingField: EnemySwordKnightUnit001
|
||||||
|
<SailorCount>k__BackingField: 6
|
||||||
|
<AttackerType>k__BackingField: 1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: 0
|
||||||
|
<EnemyAiList>k__BackingField: []
|
||||||
|
- <Idx>k__BackingField: enemy_swordman_unit_001_s8
|
||||||
|
<CaptainStatIdx>k__BackingField: enemy_stat_swordman_101
|
||||||
|
<SailorStatIdx>k__BackingField: enemy_stat_swordman_001
|
||||||
|
<UnitName>k__BackingField: EnemySwordmanUnit001
|
||||||
|
<SailorCount>k__BackingField: 8
|
||||||
|
<AttackerType>k__BackingField: 1
|
||||||
|
<OffenseType>k__BackingField: -1
|
||||||
|
<DefenseType>k__BackingField: 0
|
||||||
|
<EnemyAiList>k__BackingField: []
|
||||||
|
- <Idx>k__BackingField: enemy_swordman_unit_002_s8
|
||||||
|
<CaptainStatIdx>k__BackingField: enemy_stat_swordman_101
|
||||||
|
<SailorStatIdx>k__BackingField: enemy_stat_swordman_001
|
||||||
<UnitName>k__BackingField: EnemySwordmanUnit001
|
<UnitName>k__BackingField: EnemySwordmanUnit001
|
||||||
<SailorCount>k__BackingField: 8
|
<SailorCount>k__BackingField: 8
|
||||||
<AttackerType>k__BackingField: 1
|
<AttackerType>k__BackingField: 1
|
||||||
@ -49,12 +85,3 @@ MonoBehaviour:
|
|||||||
<OffenseType>k__BackingField: -1
|
<OffenseType>k__BackingField: -1
|
||||||
<DefenseType>k__BackingField: 2
|
<DefenseType>k__BackingField: 2
|
||||||
<EnemyAiList>k__BackingField: []
|
<EnemyAiList>k__BackingField: []
|
||||||
- <Idx>k__BackingField:
|
|
||||||
<CaptainStatIdx>k__BackingField:
|
|
||||||
<SailorStatIdx>k__BackingField:
|
|
||||||
<UnitName>k__BackingField:
|
|
||||||
<SailorCount>k__BackingField: 0
|
|
||||||
<AttackerType>k__BackingField: -1
|
|
||||||
<OffenseType>k__BackingField: -1
|
|
||||||
<DefenseType>k__BackingField: -1
|
|
||||||
<EnemyAiList>k__BackingField: []
|
|
||||||
|
@ -13,7 +13,7 @@ MonoBehaviour:
|
|||||||
m_Name: EnemyViewDataSo
|
m_Name: EnemyViewDataSo
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
enemyViewDataList:
|
enemyViewDataList:
|
||||||
- <Idx>k__BackingField: enemy_view_sailor_001
|
- <Idx>k__BackingField: enemy_view_archer_001
|
||||||
<Backpack>k__BackingField: 1
|
<Backpack>k__BackingField: 1
|
||||||
<LeftWeapon>k__BackingField: 2
|
<LeftWeapon>k__BackingField: 2
|
||||||
<LeftShield>k__BackingField: -1
|
<LeftShield>k__BackingField: -1
|
||||||
@ -21,7 +21,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: -1
|
<RightWeapon>k__BackingField: -1
|
||||||
<Body>k__BackingField: 11
|
<Body>k__BackingField: 11
|
||||||
<Flag>k__BackingField: -1
|
<Flag>k__BackingField: -1
|
||||||
- <Idx>k__BackingField: enemy_view_sailor_002
|
- <Idx>k__BackingField: enemy_view_spearknight_001
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: 1
|
<LeftShield>k__BackingField: 1
|
||||||
@ -29,7 +29,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 27
|
<RightWeapon>k__BackingField: 27
|
||||||
<Body>k__BackingField: 18
|
<Body>k__BackingField: 18
|
||||||
<Flag>k__BackingField: -1
|
<Flag>k__BackingField: -1
|
||||||
- <Idx>k__BackingField: enemy_view_sailor_003
|
- <Idx>k__BackingField: enemy_view_spearman_001
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: -1
|
<LeftShield>k__BackingField: -1
|
||||||
@ -37,7 +37,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 27
|
<RightWeapon>k__BackingField: 27
|
||||||
<Body>k__BackingField: 17
|
<Body>k__BackingField: 17
|
||||||
<Flag>k__BackingField: -1
|
<Flag>k__BackingField: -1
|
||||||
- <Idx>k__BackingField: enemy_view_sailor_004
|
- <Idx>k__BackingField: enemy_view_swordknight_001
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: 9
|
<LeftShield>k__BackingField: 9
|
||||||
@ -45,7 +45,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 6
|
<RightWeapon>k__BackingField: 6
|
||||||
<Body>k__BackingField: 39
|
<Body>k__BackingField: 39
|
||||||
<Flag>k__BackingField: -1
|
<Flag>k__BackingField: -1
|
||||||
- <Idx>k__BackingField: enemy_view_sailor_005
|
- <Idx>k__BackingField: enemy_view_swordman_001
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: -1
|
<LeftShield>k__BackingField: -1
|
||||||
@ -53,7 +53,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 28
|
<RightWeapon>k__BackingField: 28
|
||||||
<Body>k__BackingField: 29
|
<Body>k__BackingField: 29
|
||||||
<Flag>k__BackingField: -1
|
<Flag>k__BackingField: -1
|
||||||
- <Idx>k__BackingField: enemy_view_captain_001
|
- <Idx>k__BackingField: enemy_view_archer_101
|
||||||
<Backpack>k__BackingField: 1
|
<Backpack>k__BackingField: 1
|
||||||
<LeftWeapon>k__BackingField: 2
|
<LeftWeapon>k__BackingField: 2
|
||||||
<LeftShield>k__BackingField: -1
|
<LeftShield>k__BackingField: -1
|
||||||
@ -61,7 +61,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: -1
|
<RightWeapon>k__BackingField: -1
|
||||||
<Body>k__BackingField: 11
|
<Body>k__BackingField: 11
|
||||||
<Flag>k__BackingField: 1
|
<Flag>k__BackingField: 1
|
||||||
- <Idx>k__BackingField: enemy_view_captain_002
|
- <Idx>k__BackingField: enemy_view_spearknight_101
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: 1
|
<LeftShield>k__BackingField: 1
|
||||||
@ -69,7 +69,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 27
|
<RightWeapon>k__BackingField: 27
|
||||||
<Body>k__BackingField: 18
|
<Body>k__BackingField: 18
|
||||||
<Flag>k__BackingField: 1
|
<Flag>k__BackingField: 1
|
||||||
- <Idx>k__BackingField: enemy_view_captain_003
|
- <Idx>k__BackingField: enemy_view_spearman_101
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: -1
|
<LeftShield>k__BackingField: -1
|
||||||
@ -77,7 +77,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 27
|
<RightWeapon>k__BackingField: 27
|
||||||
<Body>k__BackingField: 17
|
<Body>k__BackingField: 17
|
||||||
<Flag>k__BackingField: -1
|
<Flag>k__BackingField: -1
|
||||||
- <Idx>k__BackingField: enemy_view_captain_004
|
- <Idx>k__BackingField: enemy_view_swordknight_101
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: 9
|
<LeftShield>k__BackingField: 9
|
||||||
@ -85,7 +85,7 @@ MonoBehaviour:
|
|||||||
<RightWeapon>k__BackingField: 6
|
<RightWeapon>k__BackingField: 6
|
||||||
<Body>k__BackingField: 39
|
<Body>k__BackingField: 39
|
||||||
<Flag>k__BackingField: 1
|
<Flag>k__BackingField: 1
|
||||||
- <Idx>k__BackingField: enemy_view_captain_005
|
- <Idx>k__BackingField: enemy_view_swordman_101
|
||||||
<Backpack>k__BackingField: -1
|
<Backpack>k__BackingField: -1
|
||||||
<LeftWeapon>k__BackingField: -1
|
<LeftWeapon>k__BackingField: -1
|
||||||
<LeftShield>k__BackingField: -1
|
<LeftShield>k__BackingField: -1
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Cinemachine;
|
||||||
using Sirenix.OdinInspector;
|
using Sirenix.OdinInspector;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
@ -19,6 +20,8 @@ namespace BlueWaterProject
|
|||||||
|
|
||||||
[field: SerializeField] public List<Transform> TargetAllList { get; private set; }
|
[field: SerializeField] public List<Transform> TargetAllList { get; private set; }
|
||||||
|
|
||||||
|
[field: SerializeField] public CinemachineFreeLook IslandCam { get; private set; }
|
||||||
|
|
||||||
public IslandInfo()
|
public IslandInfo()
|
||||||
{
|
{
|
||||||
IslandName = null;
|
IslandName = null;
|
||||||
@ -26,15 +29,17 @@ namespace BlueWaterProject
|
|||||||
UnitList = null;
|
UnitList = null;
|
||||||
EnemyList = null;
|
EnemyList = null;
|
||||||
TargetAllList = null;
|
TargetAllList = null;
|
||||||
|
IslandCam = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IslandInfo(string islandName, List<Transform> houseList, List<EnemyUnit> unitList, List<Transform> enemyList, List<Transform> targetAllList)
|
public IslandInfo(string islandName, List<Transform> houseList, List<EnemyUnit> unitList, List<Transform> enemyList, List<Transform> targetAllList, CinemachineFreeLook islandCam)
|
||||||
{
|
{
|
||||||
IslandName = islandName;
|
IslandName = islandName;
|
||||||
HouseList = houseList;
|
HouseList = houseList;
|
||||||
UnitList = unitList;
|
UnitList = unitList;
|
||||||
EnemyList = enemyList;
|
EnemyList = enemyList;
|
||||||
TargetAllList = targetAllList;
|
TargetAllList = targetAllList;
|
||||||
|
IslandCam = islandCam;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@ -109,6 +114,8 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
TargetAllList.Add(house);
|
TargetAllList.Add(house);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IslandCam = transform.Find("IslandCam").GetComponent<CinemachineFreeLook>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveListElement(List<Transform> list, Transform element)
|
public void RemoveListElement(List<Transform> list, Transform element)
|
||||||
|
@ -45,25 +45,45 @@ namespace BlueWaterProject
|
|||||||
[field: SerializeField]
|
[field: SerializeField]
|
||||||
public List<Canon> Canons { get; private set; } = new (GlobalValue.MAX_CANON_COUNT);
|
public List<Canon> Canons { get; private set; } = new (GlobalValue.MAX_CANON_COUNT);
|
||||||
|
|
||||||
public bool IsAssaultMode { get; set; }
|
[field: Title("Mode")]
|
||||||
public bool IsInShipMode { get; set; }
|
[field: SerializeField] public bool IsAssaultMode { get; set; }
|
||||||
public bool IsDredgeMode { get; set; }
|
[field: SerializeField] public bool IsInShipMode { get; set; }
|
||||||
public bool IsTakeAim { get; set; }
|
[field: SerializeField] public bool IsDredgeMode { get; set; }
|
||||||
|
[field: SerializeField] public bool IsTakeAim { get; set; }
|
||||||
|
|
||||||
|
[Title("Interaction")]
|
||||||
|
public bool IsIslandInteraction { get; set; }
|
||||||
|
private float rayLength;
|
||||||
|
private LayerMask groundLayer;
|
||||||
|
|
||||||
private void Init()
|
private void Init()
|
||||||
{
|
{
|
||||||
character = transform.Find("Character").gameObject;
|
character = transform.Find("Character").gameObject;
|
||||||
rb = GetComponent<Rigidbody>();
|
rb = GetComponent<Rigidbody>();
|
||||||
GetComponentsInChildren(Canons);
|
GetComponentsInChildren(Canons);
|
||||||
|
|
||||||
|
rayLength = 15f;
|
||||||
|
groundLayer = LayerMask.GetMask("Ground");
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Unity Function
|
#region Unity Function
|
||||||
|
|
||||||
|
private void OnDrawGizmosSelected()
|
||||||
|
{
|
||||||
|
Gizmos.color = Color.red;
|
||||||
|
Gizmos.DrawWireSphere(transform.position, GlobalValue.RADAR_RANGE);
|
||||||
|
}
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
SwitchDredgeMode(true);
|
||||||
|
}
|
||||||
|
|
||||||
private void FixedUpdate()
|
private void FixedUpdate()
|
||||||
{
|
{
|
||||||
HandleMovement();
|
HandleMovement();
|
||||||
@ -74,6 +94,7 @@ namespace BlueWaterProject
|
|||||||
FindInRadarRange();
|
FindInRadarRange();
|
||||||
FilterInCameraObjects();
|
FilterInCameraObjects();
|
||||||
LookAtTarget();
|
LookAtTarget();
|
||||||
|
Raycast8Direction();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@ -119,6 +140,12 @@ namespace BlueWaterProject
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void StopShipMovement()
|
||||||
|
{
|
||||||
|
rb.velocity = Vector3.zero;
|
||||||
|
rb.angularVelocity = Vector3.zero;
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region AssaultMode/DreadgeMode Switch
|
#region AssaultMode/DreadgeMode Switch
|
||||||
@ -134,6 +161,7 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
SwitchTakeAim(false);
|
SwitchTakeAim(false);
|
||||||
SwitchInShipMode(false);
|
SwitchInShipMode(false);
|
||||||
|
SwitchDredgeMode(false);
|
||||||
GameManager.Inst.CameraController.CamAssaultMode();
|
GameManager.Inst.CameraController.CamAssaultMode();
|
||||||
UiManager.Inst.CardLayoutGroupAnimator.Play();
|
UiManager.Inst.CardLayoutGroupAnimator.Play();
|
||||||
IsAssaultMode = true;
|
IsAssaultMode = true;
|
||||||
@ -145,6 +173,22 @@ namespace BlueWaterProject
|
|||||||
IsAssaultMode = false;
|
IsAssaultMode = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SwitchDredgeMode(bool isOn)
|
||||||
|
{
|
||||||
|
if (isOn)
|
||||||
|
{
|
||||||
|
SwitchTakeAim(false);
|
||||||
|
SwitchAssaultMode(false);
|
||||||
|
SwitchInShipMode(false);
|
||||||
|
GameManager.Inst.CameraController.CamDredgeMode();
|
||||||
|
IsDredgeMode = true;
|
||||||
|
}
|
||||||
|
else if (IsDredgeMode)
|
||||||
|
{
|
||||||
|
IsDredgeMode = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
@ -172,13 +216,15 @@ namespace BlueWaterProject
|
|||||||
|
|
||||||
private void OnInteraction(InputValue value) //F
|
private void OnInteraction(InputValue value) //F
|
||||||
{
|
{
|
||||||
|
if (!IsIslandInteraction) return;
|
||||||
|
SwitchAssaultMode(true);
|
||||||
|
UiManager.Inst.DefaultInteractionOnOff(false);
|
||||||
|
StopShipMovement();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnInteractionHold(InputValue value) //F Hold
|
private void OnInteractionHold(InputValue value) //F Hold
|
||||||
{
|
{
|
||||||
SwitchInShipMode(!IsInShipMode);
|
SwitchInShipMode(!IsInShipMode);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SwitchInShipMode(bool isOn)
|
private void SwitchInShipMode(bool isOn)
|
||||||
@ -187,6 +233,7 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
SwitchTakeAim(false);
|
SwitchTakeAim(false);
|
||||||
SwitchAssaultMode(false);
|
SwitchAssaultMode(false);
|
||||||
|
SwitchDredgeMode(false);
|
||||||
GameManager.Inst.CameraController.CamInShipMode();
|
GameManager.Inst.CameraController.CamInShipMode();
|
||||||
IsInShipMode = true;
|
IsInShipMode = true;
|
||||||
}
|
}
|
||||||
@ -217,6 +264,7 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
SwitchAssaultMode(false);
|
SwitchAssaultMode(false);
|
||||||
SwitchInShipMode(false);
|
SwitchInShipMode(false);
|
||||||
|
SwitchDredgeMode(false);
|
||||||
GameManager.Inst.CameraController.CamTakeAim(true);
|
GameManager.Inst.CameraController.CamTakeAim(true);
|
||||||
Cursor.visible = false;
|
Cursor.visible = false;
|
||||||
Cursor.lockState = CursorLockMode.Locked;
|
Cursor.lockState = CursorLockMode.Locked;
|
||||||
@ -288,5 +336,54 @@ namespace BlueWaterProject
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region Raycast 8 Direction
|
||||||
|
|
||||||
|
private void Raycast8Direction()
|
||||||
|
{
|
||||||
|
if (!IsDredgeMode) return;
|
||||||
|
|
||||||
|
Vector3[] directions =
|
||||||
|
{
|
||||||
|
transform.forward,
|
||||||
|
-transform.forward,
|
||||||
|
transform.right,
|
||||||
|
-transform.right,
|
||||||
|
transform.forward + transform.right,
|
||||||
|
transform.forward - transform.right,
|
||||||
|
-transform.forward + transform.right,
|
||||||
|
-transform.forward - transform.right
|
||||||
|
};
|
||||||
|
|
||||||
|
Vector3 halfExtents = new Vector3(5, 5, 5); // 박스 크기의 절반을 나타내는 벡터값을 설정합니다.
|
||||||
|
var isOn = false;
|
||||||
|
|
||||||
|
foreach (Vector3 dir in directions)
|
||||||
|
{
|
||||||
|
RaycastHit hit;
|
||||||
|
|
||||||
|
if (Physics.BoxCast(transform.position, halfExtents, dir, out hit, Quaternion.identity, rayLength, groundLayer))
|
||||||
|
{
|
||||||
|
isOn = true;
|
||||||
|
|
||||||
|
var islandInfo = hit.transform.parent.parent.GetComponent<IslandInfo>();
|
||||||
|
|
||||||
|
if (GameManager.Inst.CameraController.AssaultCam != islandInfo.IslandCam)
|
||||||
|
GameManager.Inst.CameraController.AssaultCam = islandInfo.IslandCam;
|
||||||
|
|
||||||
|
// 박스가 Ground 레이어에 닿았을 때 빨간색으로 표시
|
||||||
|
Debug.DrawRay(transform.position, dir * rayLength, Color.red);
|
||||||
|
IsIslandInteraction = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// 박스가 Ground 레이어에 닿지 않았을 때 녹색으로 표시
|
||||||
|
Debug.DrawRay(transform.position, dir * rayLength, Color.green);
|
||||||
|
IsIslandInteraction = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
UiManager.Inst.DefaultInteractionOnOff(isOn);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -29,6 +29,9 @@ namespace BlueWaterProject
|
|||||||
[Title("Enemy Marker")]
|
[Title("Enemy Marker")]
|
||||||
private Image enemyMarker; // 적을 표시할 마커 (Image)
|
private Image enemyMarker; // 적을 표시할 마커 (Image)
|
||||||
private Transform enemyTarget; // 타겟 (적)
|
private Transform enemyTarget; // 타겟 (적)
|
||||||
|
|
||||||
|
[Title("InteractionUI")]
|
||||||
|
private Transform defaultInteraction;
|
||||||
|
|
||||||
|
|
||||||
private void Init()
|
private void Init()
|
||||||
@ -44,6 +47,8 @@ namespace BlueWaterProject
|
|||||||
|
|
||||||
enemyMarker = transform.Find("EnemyMarker").GetComponent<Image>();
|
enemyMarker = transform.Find("EnemyMarker").GetComponent<Image>();
|
||||||
enemyMarker.sprite = DataManager.Inst.enemyMarker;
|
enemyMarker.sprite = DataManager.Inst.enemyMarker;
|
||||||
|
|
||||||
|
defaultInteraction = transform.Find("DefaultInteraction");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnAwake()
|
protected override void OnAwake()
|
||||||
@ -163,5 +168,10 @@ namespace BlueWaterProject
|
|||||||
{
|
{
|
||||||
radar.gameObject.SetActive(isOn);
|
radar.gameObject.SetActive(isOn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void DefaultInteractionOnOff(bool isOn)
|
||||||
|
{
|
||||||
|
defaultInteraction.gameObject.SetActive(isOn);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a55ee4efaad27d948ba5f03fc6d7bc80
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ed9b95dc6ed6d0647ad7f1a8f305385d
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4ff1f29eab234cf4490d9bb383892c44
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f5789d13135b86645a366dac6583d1cd
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3643c0d76ec153646b1203880bfb64ed
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3d7c4217783978e4abe6496ac71eee94
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 078b8f13a17171b49892ad10426d5af0
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f9406a33814af9c47b352e77f079d798
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9aacf6f3043624194bb6f6fe9a580786
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f4227764308e84f89a765fbf315e2945
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 41e59f562b69648719f2424c438758f3
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b044a2387a61dac41bdf204adffdce9d
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cd287c84e887ea24a8679e67aac7c074
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f211254f5bfad224ba88868f2c75432c
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4368c9be31b3c174dbfd80f2caf98889
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 617b3f1032a08c14ebfedfa340767cdf
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f597f19f656ba56eae4f6a3a7cc528f4
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 48e08dc33330d11e9d4a1b246c52e4f6
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ed09910c0094cb27be8f3ca264680da3
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cc355dd4cf1e6173beaeb22c2858cbe1
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -25,12 +25,13 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1501671561704796854}
|
m_GameObject: {fileID: 1501671561704796854}
|
||||||
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1501671561896587508}
|
m_Father: {fileID: 1501671561896587508}
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &1501671561704796857
|
--- !u!114 &1501671561704796857
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -59,6 +60,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
m_SendPointerHoverToParent: 1
|
||||||
m_HorizontalAxis: Horizontal
|
m_HorizontalAxis: Horizontal
|
||||||
m_VerticalAxis: Vertical
|
m_VerticalAxis: Vertical
|
||||||
m_SubmitButton: Submit
|
m_SubmitButton: Submit
|
||||||
@ -95,10 +97,10 @@ RectTransform:
|
|||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1501671561704796855}
|
- {fileID: 1501671561704796855}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
@ -122,7 +124,9 @@ Canvas:
|
|||||||
m_OverrideSorting: 0
|
m_OverrideSorting: 0
|
||||||
m_OverridePixelPerfect: 0
|
m_OverridePixelPerfect: 0
|
||||||
m_SortingBucketNormalizedSize: 0
|
m_SortingBucketNormalizedSize: 0
|
||||||
|
m_VertexColorAlwaysGammaSpace: 0
|
||||||
m_AdditionalShaderChannelsFlag: 25
|
m_AdditionalShaderChannelsFlag: 25
|
||||||
|
m_UpdateRectTransformForStandalone: 0
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingOrder: 0
|
m_SortingOrder: 0
|
||||||
m_TargetDisplay: 0
|
m_TargetDisplay: 0
|
||||||
@ -148,6 +152,7 @@ MonoBehaviour:
|
|||||||
m_FallbackScreenDPI: 96
|
m_FallbackScreenDPI: 96
|
||||||
m_DefaultSpriteDPI: 96
|
m_DefaultSpriteDPI: 96
|
||||||
m_DynamicPixelsPerUnit: 1
|
m_DynamicPixelsPerUnit: 1
|
||||||
|
m_PresetInfoIsWorld: 0
|
||||||
--- !u!114 &1501671561896587509
|
--- !u!114 &1501671561896587509
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -164,4 +169,4 @@ MonoBehaviour:
|
|||||||
m_BlockingObjects: 0
|
m_BlockingObjects: 0
|
||||||
m_BlockingMask:
|
m_BlockingMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 4294967295
|
m_Bits: 55
|
||||||
|
Loading…
Reference in New Issue
Block a user