dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Items #3

Merged
dddushesss merged 61 commits from Alexei into main 2022-01-05 12:48:28 +00:00
Conversation 0 Commits 61 Files Changed 6311 +211 -123
8 changed files with 211 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a5ed0753bb - Show all commits

1
Assets/PlayerView.cs
View File

@ -4,6 +4,7 @@ using UnityEngine;
public class PlayerView : MonoBehaviour
{
public Action OnStep;
public GameObject charBarCanvas;
public void Step()
{

4
Assets/Prefab/Canvas.prefab
View File

@ -34,7 +34,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.1000061}
m_AnchoredPosition: {x: 0, y: 0.099975586}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &4726489279989878080
@ -80,4 +80,4 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 10
m_PresetInfoIsWorld: 1
m_PresetInfoIsWorld: 0

289
Assets/Resources/1/Character/Prefab/Asvald.prefab
View File

@ -183,7 +183,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &7787032016551483534
SkinnedMeshRenderer:
@ -425,7 +425,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1535139920634758287
SkinnedMeshRenderer:
@ -757,7 +757,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &120578717624362536
SkinnedMeshRenderer:
@ -946,7 +946,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 14
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &471171710276162467
SkinnedMeshRenderer:
@ -1143,7 +1143,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 16
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2998734148321009098
GameObject:
@ -1351,7 +1351,7 @@ Transform:
- {fileID: 3942302939394760573}
- {fileID: 667030322987050621}
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 17
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3550544345492550626
GameObject:
@ -1443,7 +1443,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &2369926001070854608
SkinnedMeshRenderer:
@ -1591,7 +1591,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1066266445648319513
SkinnedMeshRenderer:
@ -1769,7 +1769,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1415883333001484866
SkinnedMeshRenderer:
@ -2275,7 +2275,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6378985549787095652
GameObject:
@ -2399,7 +2399,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5961881081274232608
SkinnedMeshRenderer:
@ -2567,7 +2567,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1757102963672203897
SkinnedMeshRenderer:
@ -2654,7 +2654,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &886099741712191097
SkinnedMeshRenderer:
@ -2866,7 +2866,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 11
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &459785038751003865
SkinnedMeshRenderer:
@ -2951,9 +2951,8 @@ Transform:
m_GameObject: {fileID: 7527582019267571087}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 146049362059388828}
- {fileID: 6258711480188133543}
- {fileID: 7241339582013630877}
- {fileID: 2119672840264383957}
@ -2973,6 +2972,7 @@ Transform:
- {fileID: 4915673133262551585}
- {fileID: 6640574666343173209}
- {fileID: 6357826002191603761}
- {fileID: 6484114110451091213}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3007,6 +3007,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 04619977b07331e43a21b8d1bc33b6e9, type: 3}
m_Name:
m_EditorClassIdentifier:
charBarCanvas: {fileID: 5591725933991455353}
--- !u!1 &7550162364350684268
GameObject:
m_ObjectHideFlags: 0
@ -3066,7 +3067,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &5172988542483986851
SkinnedMeshRenderer:
@ -3153,7 +3154,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &8379158873016648925
SkinnedMeshRenderer:
@ -3514,7 +3515,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &6563519984864369551
SkinnedMeshRenderer:
@ -3631,7 +3632,7 @@ Transform:
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
m_Children: []
m_Father: {fileID: 7150739129758644021}
m_RootOrder: 18
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8793283468575075051
GameObject:
@ -3698,101 +3699,6 @@ Transform:
m_Father: {fileID: 6637522580184705995}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &736823833987687424
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7150739129758644021}
m_Modifications:
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: InitialModule.startSizeY.minMaxState
value: 3
objectReference: {fileID: 0}
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: InitialModule.startSizeZ.minMaxState
value: 3
objectReference: {fileID: 0}
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: InitialModule.startRotationX.minMaxState
value: 3
objectReference: {fileID: 0}
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: InitialModule.startRotationY.minMaxState
value: 3
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.01
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
propertyPath: m_Name
value: CharacterAura
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3}
--- !u!4 &146049362059388828 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
type: 3}
m_PrefabInstance: {fileID: 736823833987687424}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1284989811002482917
PrefabInstance:
m_ObjectHideFlags: 0
@ -3803,7 +3709,7 @@ PrefabInstance:
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3}
propertyPath: m_RootOrder
value: 19
value: 18
objectReference: {fileID: 0}
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
type: 3}
@ -3868,3 +3774,154 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1284989811002482917}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4150511952206318913
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7150739129758644021}
m_Modifications:
- target: {fileID: 5043130871251553204, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalPosition.z
value: 2.8
objectReference: {fileID: 0}
- target: {fileID: 5043130871251553204, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 4.0299997
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_RootOrder
value: 19
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_SizeDelta.x
value: 1080
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_SizeDelta.y
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8358779576878573368, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_Name
value: CharBar
objectReference: {fileID: 0}
- target: {fileID: 8519462296099616455, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_LocalPosition.z
value: 2.8
objectReference: {fileID: 0}
- target: {fileID: 8519462296099616455, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.39
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bcf32629375eb5e49be4b148f76e95c5, type: 3}
--- !u!1 &5591725933991455353 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8358779576878573368, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
m_PrefabInstance: {fileID: 4150511952206318913}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6484114110451091213 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6946142497316555340, guid: bcf32629375eb5e49be4b148f76e95c5,
type: 3}
m_PrefabInstance: {fileID: 4150511952206318913}
m_PrefabAsset: {fileID: 0}

5
Assets/Scripts/Chars/Enemy.cs
View File

@ -23,5 +23,10 @@ namespace Chars
{
throw new System.NotImplementedException();
}
public void Damag(float dmg)
{
throw new System.NotImplementedException();
}
}
}

1
Assets/Scripts/Chars/IUnit.cs
View File

@ -8,5 +8,6 @@ namespace Chars
public void Spawn();
public void Death();
public void Attack(HexDirection direction);
public void Damag(float dmg);
}
}

9
Assets/Scripts/Chars/Player.cs
View File

@ -28,9 +28,12 @@ namespace Chars
private UnitColor _color;
private static readonly int Moving = Animator.StringToHash("isMoving");
private static readonly int Move1 = Animator.StringToHash("Move");
private float _hp;
private float _mana;
public bool IsMoving => _isMoving;
public GameObject PlayerInstance => _instance;
public PlayerView PlayerView => _playerView;
public Player(PlayerData playerData, HexGrid hexGrid)
{
@ -43,6 +46,7 @@ namespace Chars
}
public void Move(HexDirection direction)
{
if (_cell.GetNeighbor(direction))
@ -111,5 +115,10 @@ namespace Chars
{
throw new NotImplementedException();
}
public void Damag(float dmg)
{
throw new NotImplementedException();
}
}
}

16
Assets/Scripts/Chars/PlayerControl.cs
View File

@ -8,11 +8,12 @@ using Object = UnityEngine.Object;
namespace Chars
{
public class PlayerControl : IFixedExecute
public class PlayerControl : IFixedExecute, IInitialization
{
private Player _player;
private FloatingJoystick _moveJoystick;
private FloatingJoystick _attackJoystick;
private Camera _camera;
public PlayerControl(Player player, PlayerData playerData)
@ -21,14 +22,20 @@ namespace Chars
var joyView = Object.Instantiate(playerData.joystickView);
_moveJoystick = joyView.MoveJoystick;
_attackJoystick = joyView.AttackJoystick;
_camera = Camera.main;
}
public void FixedExecute()
{
if (!_player.IsMoving && _moveJoystick.isPressed)
{
_player.Move(VectorToDirection(_moveJoystick.Direction.normalized));
_player.PlayerView.charBarCanvas.transform.LookAt(
_player.PlayerView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
_camera.transform.rotation * Vector3.up);
}
}
@ -67,6 +74,11 @@ namespace Chars
return HexDirection.W;
}
public void Init()
{
_player.PlayerView.charBarCanvas.transform.LookAt(
_player.PlayerView.charBarCanvas.transform.position + _camera.transform.rotation * Vector3.back,
_camera.transform.rotation * Vector3.up);
}
}
}

3
Assets/Scripts/Weapons.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: b06b2cf6391b4af69fbff41d0cf61f0d
timeCreated: 1640087924