diff --git a/Assets/Prefabs/Characters/1. Cube.prefab b/Assets/Prefabs/Characters/1. Cube.prefab index 52e5626..9321dc2 100644 --- a/Assets/Prefabs/Characters/1. Cube.prefab +++ b/Assets/Prefabs/Characters/1. Cube.prefab @@ -31,7 +31,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.84, y: -5.86, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 9, y: 9, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7212224704880402101} @@ -67,7 +67,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: -8149160197350721816, guid: fbeb9853b48ea2844a0115637f7d3427, type: 3} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: -8703082228858259314, guid: 86e3e7edd9d4ad44badffb017e45ffc7, type: 3} _messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3} replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2} _audioSource: {fileID: 0} @@ -78,8 +78,8 @@ MonoBehaviour: hideDuration: 1 showEase: 1 hideEase: 1 - HiddenPos: {x: 0, y: 0} - VisiblePos: {x: 0, y: 0} + HiddenPos: {x: 20, y: -7.17} + VisiblePos: {x: 9.26, y: -7.17} --- !u!114 &6346851752755896837 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Characters/2. Electro.prefab b/Assets/Prefabs/Characters/2. Electro.prefab index 8d3422d..108dcf3 100644 --- a/Assets/Prefabs/Characters/2. Electro.prefab +++ b/Assets/Prefabs/Characters/2. Electro.prefab @@ -31,7 +31,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.84, y: -5.86, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 7, y: 7, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5622746753824456797} @@ -67,7 +67,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: -529477370105943367, guid: 229dd13b366e5b04ab570cce8b4796e4, type: 3} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: 6137273327222775856, guid: 22249bfcd1079244da596525df47b46c, type: 3} _messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3} replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2} _audioSource: {fileID: 0} @@ -78,8 +78,8 @@ MonoBehaviour: hideDuration: 1 showEase: 1 hideEase: 1 - HiddenPos: {x: 0, y: 0} - VisiblePos: {x: 0, y: 0} + HiddenPos: {x: 11.8, y: -20} + VisiblePos: {x: 11.8, y: -3.91} --- !u!114 &2927423071651238219 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Characters/3. Wolf.prefab b/Assets/Prefabs/Characters/3. Wolf.prefab index 79fe7b8..a3be3bc 100644 --- a/Assets/Prefabs/Characters/3. Wolf.prefab +++ b/Assets/Prefabs/Characters/3. Wolf.prefab @@ -122,7 +122,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.84, y: -5.86, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 14, y: 14, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7517247222320477357} @@ -158,7 +158,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: -1307639399570084333, guid: e35c65295e3ac234b9975dbe342f4090, type: 3} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: -5258756546513945857, guid: c99c8ec80e4ab564f8f6e07f132a6a08, type: 3} _messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3} replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2} _audioSource: {fileID: 0} @@ -169,8 +169,8 @@ MonoBehaviour: hideDuration: 1 showEase: 1 hideEase: 1 - HiddenPos: {x: 0, y: 0} - VisiblePos: {x: 0, y: 0} + HiddenPos: {x: 40, y: -4.26916} + VisiblePos: {x: 13.61, y: -4.26916} --- !u!114 &4781704477309761372 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Characters/4. Sam.prefab b/Assets/Prefabs/Characters/4. Sam.prefab index ed9d654..a0fc8fc 100644 --- a/Assets/Prefabs/Characters/4. Sam.prefab +++ b/Assets/Prefabs/Characters/4. Sam.prefab @@ -31,7 +31,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.84, y: -5.86, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 15, y: 15, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4691552243389303104} @@ -67,7 +67,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: 1809351836, guid: f52ee716872562446b5261ef80b4e8cd, type: 3} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: 7841686331975577030, guid: 5acad8b165856bf429879df3068a8f53, type: 3} _messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3} replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2} _audioSource: {fileID: 0} @@ -78,8 +78,8 @@ MonoBehaviour: hideDuration: 1 showEase: 1 hideEase: 1 - HiddenPos: {x: 0, y: 0} - VisiblePos: {x: 0, y: 0} + HiddenPos: {x: 30, y: -5.53} + VisiblePos: {x: 13.11, y: -5.53} --- !u!95 &7661847991293490837 Animator: serializedVersion: 7 diff --git a/Assets/Prefabs/Characters/5. Feeshka.prefab b/Assets/Prefabs/Characters/5. Feeshka.prefab index 76c942f..96b213d 100644 --- a/Assets/Prefabs/Characters/5. Feeshka.prefab +++ b/Assets/Prefabs/Characters/5. Feeshka.prefab @@ -31,7 +31,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.84, y: -5.86, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 12, y: 12, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3379644201319798410} @@ -67,7 +67,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: -1325076913608113314, guid: b865778670f0b8c418a3450c41975937, type: 3} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: -3439533911878954697, guid: be3a1e10203463d42a388463674e5a4f, type: 3} _messageBox: {fileID: 1876940890959816278, guid: 50b5075221b823240b287cd5e6c02d64, type: 3} replicas: {fileID: 11400000, guid: 1a042f31f2c98b64fb2511191b1d1001, type: 2} _audioSource: {fileID: 0} @@ -78,8 +78,8 @@ MonoBehaviour: hideDuration: 1 showEase: 1 hideEase: 1 - HiddenPos: {x: 0, y: 0} - VisiblePos: {x: 0, y: 0} + HiddenPos: {x: 22.99, y: -7.6} + VisiblePos: {x: 12.57, y: -7.6} --- !u!95 &4847740494483037661 Animator: serializedVersion: 7 diff --git a/Assets/Prefabs/Characters/6. BoyNextDoor.prefab b/Assets/Prefabs/Characters/6. BoyNextDoor.prefab index 6b8383d..a6f5fc1 100644 --- a/Assets/Prefabs/Characters/6. BoyNextDoor.prefab +++ b/Assets/Prefabs/Characters/6. BoyNextDoor.prefab @@ -157,7 +157,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: 0} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: 8977629392806811432, guid: eccb9dcb5b85c994eaecc71044391a28, type: 3} _messageBox: {fileID: 0} replicas: {fileID: 0} _audioSource: {fileID: 0} diff --git a/Assets/Prefabs/Characters/7. Girl.prefab b/Assets/Prefabs/Characters/7. Girl.prefab index 48a1c91..c1dff00 100644 --- a/Assets/Prefabs/Characters/7. Girl.prefab +++ b/Assets/Prefabs/Characters/7. Girl.prefab @@ -157,7 +157,7 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::CharacterSystem.VisualModule icon: {fileID: 0} iconSmall: {fileID: 0} - chipImage: {fileID: 0} + chipImage: {fileID: 2890665761737359033, guid: b7ecf582aadeda84ca3d05d27ea5adef, type: 3} _messageBox: {fileID: 0} replicas: {fileID: 0} _audioSource: {fileID: 0} diff --git a/Assets/Prefabs/Gameplay/Panels/Draw.prefab b/Assets/Prefabs/Gameplay/Panels/Draw.prefab index a8dc845..aa1133e 100644 --- a/Assets/Prefabs/Gameplay/Panels/Draw.prefab +++ b/Assets/Prefabs/Gameplay/Panels/Draw.prefab @@ -64,7 +64,7 @@ MonoBehaviour: shownPanelX: 0 hiddenPanelX: 1500 description: {fileID: 8349121126867190334} - revengeButton: {fileID: 0} + revengeButton: {fileID: 3370058135805085568} menuButton: {fileID: 4021462699733782094} background: {fileID: 3676790911990693413} backgroundEnabledColor: {r: 0, g: 0, b: 0, a: 0.78431374} @@ -112,7 +112,7 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 buttons: - - {fileID: 0} + - {fileID: 3370058135805085568} - {fileID: 4021462699733782094} --- !u!1 &2547250227687419543 GameObject: diff --git a/Assets/Scenes/GameScene3D.unity b/Assets/Scenes/GameScene3D.unity index 72c71c7..22beb2e 100644 --- a/Assets/Scenes/GameScene3D.unity +++ b/Assets/Scenes/GameScene3D.unity @@ -2166,7 +2166,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Bot board: {fileID: 1768372455} - chipSprite: {fileID: 21300000, guid: 2194de45dbf1e8c46a827a05cdd2d905, type: 3} + chipSprite: {fileID: -8703082228858259314, guid: 86e3e7edd9d4ad44badffb017e45ffc7, type: 3} k__BackingField: 2 prepareSpeed: 30 moveSpeed: 50 @@ -2598,7 +2598,7 @@ MonoBehaviour: winPanel: {fileID: 5674543444192711823} lossPanel: {fileID: 4928797679491293976} pvpWinPanel: {fileID: 3489349684416202942} - drawPanel: {fileID: 0} + drawPanel: {fileID: 8566298168384539295} --- !u!4 &240039284 Transform: m_ObjectHideFlags: 0 @@ -2644,7 +2644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Player board: {fileID: 1768372455} - chipSprite: {fileID: 21300000, guid: 2194de45dbf1e8c46a827a05cdd2d905, type: 3} + chipSprite: {fileID: 2890665761737359033, guid: b7ecf582aadeda84ca3d05d27ea5adef, type: 3} k__BackingField: 2 chipYOffset: 5 prepareSpeed: 30 @@ -2724,6 +2724,7 @@ MonoBehaviour: CharactersConfigurator: {fileID: 141381088} menuGameplayTransit: {fileID: 29868612} turnManager: {fileID: 1329752846} + _fieldCleaner: {fileID: 1768372457} endGameHandler: {fileID: 240039283} turnTracker: {fileID: 259182294} setPasswordPanel: {fileID: 131572818} @@ -3540,7 +3541,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Player board: {fileID: 1768372455} - chipSprite: {fileID: -1055215911, guid: b196c55df50055d4cafb336e9a05b519, type: 3} + chipSprite: {fileID: 8977629392806811432, guid: eccb9dcb5b85c994eaecc71044391a28, type: 3} k__BackingField: 1 chipYOffset: 5 prepareSpeed: 30 @@ -4222,7 +4223,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -4230,7 +4231,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -4270,11 +4271,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 116.51001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4956,7 +4957,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -4964,7 +4965,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -5004,11 +5005,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 271.19003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7400,7 +7401,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -7408,7 +7409,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -7448,11 +7449,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 348.53003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10296,7 +10297,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -10304,7 +10305,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -10344,11 +10345,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 193.85 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16398,6 +16399,7 @@ GameObject: - component: {fileID: 1768372455} - component: {fileID: 1768372454} - component: {fileID: 1768372456} + - component: {fileID: 1768372457} m_Layer: 0 m_Name: Board m_TagString: Untagged @@ -16530,6 +16532,18 @@ MonoBehaviour: m_EditorClassIdentifier: Assembly-CSharp::ChipsRotator angle: 15 speed: 4 +--- !u!114 &1768372457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1768372451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10f1cb79798201342981783c5c813e9f, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::FieldCleaner --- !u!1 &1776154337 GameObject: m_ObjectHideFlags: 0 @@ -22548,7 +22562,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.x @@ -22556,7 +22570,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_SizeDelta.x @@ -22596,11 +22610,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.x - value: 39.170002 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.955 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1909234588782507268, guid: e45c4d0b012452f40ad1dc153ae38811, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -23215,147 +23229,147 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 333912590944302499, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 333912590944302499, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 333912590944302499, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 333912590944302499, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 132.9175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 333912590944302499, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 3.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 333912590944302499, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -214.97626 + value: 0 objectReference: {fileID: 0} - target: {fileID: 770108196109532210, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 770108196109532210, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 770108196109532210, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 770108196109532210, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 132.9175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 770108196109532210, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 3.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 770108196109532210, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -363.49374 + value: 0 objectReference: {fileID: 0} - target: {fileID: 935420627850452094, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 935420627850452094, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 935420627850452094, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 703.71 + value: 0 objectReference: {fileID: 0} - target: {fileID: 935420627850452094, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 59.390003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 935420627850452094, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 351.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 935420627850452094, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -153.81502 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1190827924149678685, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1190827924149678685, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1190827924149678685, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 703.71 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1190827924149678685, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 59.390003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1190827924149678685, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 351.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1190827924149678685, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -215.87502 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1477235949744466647, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1477235949744466647, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1477235949744466647, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 703.71 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1477235949744466647, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 59.390003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1477235949744466647, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 351.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1477235949744466647, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -277.935 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3543665328416834874, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3543665328416834874, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3543665328416834874, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 703.71 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3543665328416834874, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 59.390003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3543665328416834874, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 351.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3543665328416834874, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -91.755005 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5483391176823058074, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_IsActive @@ -23451,75 +23465,75 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7417418181170801207, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7417418181170801207, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7417418181170801207, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7417418181170801207, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 132.9175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7417418181170801207, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 3.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7417418181170801207, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -512.0112 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755885942619096437, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755885942619096437, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755885942619096437, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755885942619096437, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 132.9175 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755885942619096437, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 3.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7755885942619096437, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -66.45875 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8295315770064589757, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8295315770064589757, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8295315770064589757, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.x - value: 703.71 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8295315770064589757, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_SizeDelta.y - value: 59.390003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8295315770064589757, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.x - value: 351.855 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8295315770064589757, guid: a34b2a0441a3e2c4a96fca5080d8f203, type: 3} propertyPath: m_AnchoredPosition.y - value: -29.695002 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -23547,19 +23561,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 1871089524602559658, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1871089524602559658, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1871089524602559658, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchoredPosition.x - value: 261.665 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1871089524602559658, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.816446 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3994272294263330828, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_Pivot.x @@ -23643,19 +23657,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7909369483914820580, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7909369483914820580, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7909369483914820580, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchoredPosition.x - value: 132.94 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7909369483914820580, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_AnchoredPosition.y - value: -32.385 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8523793110535762614, guid: 14e3225697047e04f9fc5a33f4690443, type: 3} propertyPath: m_Name @@ -24073,6 +24087,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8398849166858808229, guid: 5c7519dd1985416449513fd70e70071b, type: 3} m_PrefabInstance: {fileID: 2096563069177751442} m_PrefabAsset: {fileID: 0} +--- !u!114 &8566298168384539295 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3112740318731043667, guid: 5c7519dd1985416449513fd70e70071b, type: 3} + m_PrefabInstance: {fileID: 2096563069177751442} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbcfdbb18f10e58428fb67dca6b35cfc, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PveLossPanel --- !u!1001 &8588111845348132420 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Characters/CharactersController.cs b/Assets/Scripts/Characters/CharactersController.cs index 2b706d4..f5d2222 100644 --- a/Assets/Scripts/Characters/CharactersController.cs +++ b/Assets/Scripts/Characters/CharactersController.cs @@ -16,6 +16,8 @@ namespace CharacterSystem public static int CharacterIndex { get; private set; } = -1; public static int CharactersAmount => I.characters.Length; public static Character CurrentCharacter => I.characters[CharacterIndex]; + public static bool HasActiveCharacter + => I != null && CharacterIndex >= 0 && CharacterIndex < I.characters.Length; public void Initialize() { @@ -37,12 +39,26 @@ namespace CharacterSystem public static void ResetSystem() { + if (I == null) + return; + ResetAllCharactersDifficulty(); CharacterIndex = -1; } - public void HideCharacter() - => CurrentCharacter.visualModule.GetHideSequence().PlayForward(); + public void HideCharacter() + { + if (HasActiveCharacter == false) + return; + + CurrentCharacter.visualModule.GetHideSequence().PlayForward(); + } + + public void StartSession(System.Action onComplete = null) + { + ResetSystem(); + ShowCharacter(0, onComplete); + } public static Character[] GetCharactersArray() => new List(I.characters).ToArray(); @@ -74,30 +90,44 @@ namespace CharacterSystem } } - public void ShowCharacter(int newIndex) + public void ShowCharacter(int newIndex, System.Action onComplete = null) { + if (newIndex < 0 || newIndex >= characters.Length) + throw new System.ArgumentOutOfRangeException(nameof(newIndex)); + int oldIndex = CharacterIndex; CharacterIndex = newIndex; if (newIndex == oldIndex) + { + onComplete?.Invoke(); return; + } - var oldCharacter = characters[oldIndex]; var newCharacter = characters[newIndex]; Sequence seq = DOTween.Sequence(); - seq.Append(oldCharacter.visualModule.GetHideSequence()); - seq.AppendInterval(0.1f); + if (oldIndex >= 0) + { + var oldCharacter = characters[oldIndex]; + seq.Append(oldCharacter.visualModule.GetHideSequence()); + seq.AppendInterval(0.1f); + } + seq.Append(newCharacter.visualModule.GetShowSequence()); seq.AppendCallback(() => { - if (newIndex < oldIndex) + if (oldIndex >= 0 && newIndex < oldIndex) EventBus.TriggerEvent(GameEvent.Return); else EventBus.TriggerEvent(GameEvent.Appear); + + onComplete?.Invoke(); }); + + seq.PlayForward(); } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Characters/Replicas/ReplicasContainer.cs b/Assets/Scripts/Characters/Replicas/ReplicasContainer.cs index dbd31fd..6233148 100644 --- a/Assets/Scripts/Characters/Replicas/ReplicasContainer.cs +++ b/Assets/Scripts/Characters/Replicas/ReplicasContainer.cs @@ -58,11 +58,11 @@ namespace CharacterSystem var set = _replicaDictionary[type]; if (set == null) { - Debug.LogError($"Не заполнен набор реплик {type}"); + Debug.LogWarning($"Не заполнен набор реплик {type}"); return false; } return Random.Range(0f, 1f) < set.playProbability; } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Common/GameManager.cs b/Assets/Scripts/Common/GameManager.cs index e5d3337..73cc941 100644 --- a/Assets/Scripts/Common/GameManager.cs +++ b/Assets/Scripts/Common/GameManager.cs @@ -55,6 +55,7 @@ public class GameManager : MonoBehaviour [SerializeField] private MenuGameplayTransit menuGameplayTransit; [SerializeField] TurnManager turnManager; + [SerializeField] private FieldCleaner _fieldCleaner; public EndGameHandler endGameHandler; public TurnTracker turnTracker; @@ -66,6 +67,8 @@ public class GameManager : MonoBehaviour public QrPanel qrPanel; public TakeOrRiskPanel takeOrRiskPanel; + private bool _isLeavingGameplay; + public void Initialize() { if (Instance == null) @@ -90,6 +93,7 @@ public class GameManager : MonoBehaviour //if (!PaymentSystem.TryPayForMode(mode)) // return; SetMode(mode); + _isLeavingGameplay = false; menuGameplayTransit.GameplayOpened += OnGameplayOpened; menuGameplayTransit.GotoGameplay(); @@ -100,10 +104,14 @@ public class GameManager : MonoBehaviour { menuGameplayTransit.GameplayOpened -= OnGameplayOpened; OnGameStarted?.Invoke(gameMode); - turnManager.StartGame(gameMode); - //test - PrepareRound(0); + if (gameMode == GameMode.pve) + { + _fieldCleaner.Clear(); + CharactersController.I.StartSession(StartRound); + } + else + StartRound(); } private void OnApplicationQuit() => ComNativeWrapper.Serial_CloseAll(); @@ -116,7 +124,20 @@ public class GameManager : MonoBehaviour public void GotoMenu() { - Board.Instance.MakeClearField(); + if (_isLeavingGameplay) + return; + + _isLeavingGameplay = true; + ControlsPerformer.Instance.SetControlable(null); + _fieldCleaner.Clear(); + + if (gameMode == GameMode.pve) + { + CharactersController.I.HideCharacter(); + CharactersController.ResetSystem(); + } + + OnGameFinished?.Invoke(gameMode); menuGameplayTransit.GotoMenu(); } @@ -131,16 +152,33 @@ public class GameManager : MonoBehaviour public void SetMode(GameMode mode) => gameMode = mode; public void PerformRevenge() - {//todo: реализовать переход на реванш - print("Переход в реванш"); - } + => ContinueAfterPveLoss(); public void PerformDrawRevenge() + => ContinueAfterPveDraw(); + + public void ContinueAfterPveWin() { - //тут надо в зависимости от режима. pvp платно pve бесплатно. - print("Реванш(ничья)"); + int nextCharacterIndex = CharactersController.CharacterIndex + 1; + + if (nextCharacterIndex >= CharactersController.CharactersAmount) + { + GotoMenu(); + return; + } + + StartPveRound(nextCharacterIndex); } + public void ContinueAfterPveLoss() + { + int previousCharacterIndex = Mathf.Max(CharactersController.CharacterIndex - 1, 0); + StartPveRound(previousCharacterIndex); + } + + public void ContinueAfterPveDraw() + => StartPveRound(CharactersController.CharacterIndex); + public void IncreaseScore(Team player) { if (player == Team.Player1) @@ -193,7 +231,6 @@ public class GameManager : MonoBehaviour if (gameMode == GameMode.pve) { timerManager.SetActiveTimer(Team.Player1); - CharactersController.I.ShowCharacter(CharactersController.CharacterIndex); } else if (gameMode == GameMode.pvp) DualAvatarController.Instance.ShowCharacters(); @@ -223,7 +260,7 @@ public class GameManager : MonoBehaviour CharactersController.I.HideCharacter(); CharactersController.I.SetAllCharactersPrizeAvailable(); - DualAvatarController.Instance.HideCharacters(); + DualAvatarController.Instance?.HideCharacters(); CharactersController.ResetSystem(); @@ -236,6 +273,21 @@ public class GameManager : MonoBehaviour canReturnToMenu = true; } + private void StartPveRound(int characterIndex) + { + _fieldCleaner.Clear(); + CharactersController.I.ShowCharacter(characterIndex, StartRound); + } + + private void StartRound() + { + turnTracker.ResetTracking(); + turnTracker.EnableTimer(true); + turnManager.StartGame(gameMode); + PrepareRound(Team.Player1); + OnRoundStarted?.Invoke(); + } + public void upgradeFeeshkaDifficulty() { @@ -271,4 +323,4 @@ public class GameManager : MonoBehaviour } } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Gameplay/Bot.cs b/Assets/Scripts/Gameplay/Bot.cs index c7b87a1..600d7ed 100644 --- a/Assets/Scripts/Gameplay/Bot.cs +++ b/Assets/Scripts/Gameplay/Bot.cs @@ -1,5 +1,6 @@ using UnityEngine; using System.Threading; +using CharacterSystem; public class Bot : BasePlayer, IGamePlayer { @@ -254,6 +255,9 @@ public class Bot : BasePlayer, IGamePlayer private void CreateChip() { + if (CharactersController.HasActiveCharacter && CharactersController.CurrentCharacter.visualModule.chipImage != null) + chipSprite = CharactersController.CurrentCharacter.visualModule.chipImage; + currentChip = ChipPool.Instance.GetConfigured(chipSprite, team); } @@ -280,4 +284,4 @@ public class Bot : BasePlayer, IGamePlayer Moving, Dropping } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Gameplay/EndGameHandler.cs b/Assets/Scripts/Gameplay/EndGameHandler.cs index 6a33e4a..8e840dd 100644 --- a/Assets/Scripts/Gameplay/EndGameHandler.cs +++ b/Assets/Scripts/Gameplay/EndGameHandler.cs @@ -1,4 +1,5 @@ using DG.Tweening; +using CharacterSystem; using System.Collections.Generic; using UnityEngine; @@ -7,7 +8,7 @@ public class EndGameHandler : MonoBehaviour [SerializeField] PveWinPanel winPanel; [SerializeField] PveLossPanel lossPanel; [SerializeField] PvpWinPanel pvpWinPanel; - [SerializeField] DrawAgainButton drawPanel; + [SerializeField] PveLossPanel drawPanel; public void HandleEndGame(Team lastPlayer, GameMode gameMode, CheckResult lastResult) @@ -15,8 +16,10 @@ public class EndGameHandler : MonoBehaviour print("Конец игры"); + GameManager.Instance.turnTracker.EnableTimer(false); + if (lastResult.Draw) - DrawHandler(); + DrawHandler(gameMode); else WinHandler(winner: lastPlayer, gameMode: gameMode, @@ -24,9 +27,14 @@ public class EndGameHandler : MonoBehaviour } - private void DrawHandler() + private void DrawHandler(GameMode gameMode) { - //drawPanel.Open(); + EventBus.TriggerEvent(GameEvent.Draw); + + if (gameMode == GameMode.pve) + drawPanel.Open(GameManager.Instance.ContinueAfterPveDraw); + else + pvpWinPanel.Open(); } private void WinHandler(Team winner, GameMode gameMode, HashSet<(int row, int col)> winChipsCoords) @@ -38,10 +46,14 @@ public class EndGameHandler : MonoBehaviour { if(winner == Team.Player1) { + EventBus.TriggerEvent(GameEvent.PlayerWin); winPanel.Open(); } else - lossPanel.Open(); + { + EventBus.TriggerEvent(GameEvent.BotWin); + lossPanel.Open(GameManager.Instance.ContinueAfterPveLoss); + } } else { diff --git a/Assets/Scripts/Gameplay/FieldCleaner.cs b/Assets/Scripts/Gameplay/FieldCleaner.cs new file mode 100644 index 0000000..199629d --- /dev/null +++ b/Assets/Scripts/Gameplay/FieldCleaner.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +public class FieldCleaner : MonoBehaviour +{ + public void Clear() + => Board.Instance.MakeClearField(); +} diff --git a/Assets/Scripts/Gameplay/FieldCleaner.cs.meta b/Assets/Scripts/Gameplay/FieldCleaner.cs.meta new file mode 100644 index 0000000..999b6d7 --- /dev/null +++ b/Assets/Scripts/Gameplay/FieldCleaner.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 10f1cb79798201342981783c5c813e9f \ No newline at end of file diff --git a/Assets/Scripts/Gameplay/Panels/PveLossPanel.cs b/Assets/Scripts/Gameplay/Panels/PveLossPanel.cs index a8a848b..8c5d06f 100644 --- a/Assets/Scripts/Gameplay/Panels/PveLossPanel.cs +++ b/Assets/Scripts/Gameplay/Panels/PveLossPanel.cs @@ -1,4 +1,5 @@ using UnityEngine; +using System; using DG.Tweening; using System.Collections.Generic; using UnityEngine.UI; @@ -8,7 +9,7 @@ public class PveLossPanel : MonoBehaviour, IControlable [SerializeField] private RectTransform panel; [SerializeField] private float startPanelX, shownPanelX, hiddenPanelX; [SerializeField] private Transform description; - [SerializeField] private RevengeButton revengeButton; + [SerializeField] private PveLossButton revengeButton; [SerializeField] private GotoMenuButton menuButton; [SerializeField] private Image background; [SerializeField] private Color backgroundEnabledColor, backgroundDisabledColor; @@ -19,6 +20,7 @@ public class PveLossPanel : MonoBehaviour, IControlable [Header("Работа с кнопками")] [SerializeField] private List buttons; private int buttonIndex; + private Action _continueAction; public bool ControlsEnabled { get; set; } @@ -37,18 +39,18 @@ public class PveLossPanel : MonoBehaviour, IControlable //interact if(In.GetAction(JoystickSide.Both, InteractMode.Discrete)) { - var selectedButton = buttons[buttonIndex]; - selectedButton.Interact(); + Close(); } } - public void Open() + public void Open(Action continueAction) { if (_animation != null) { _animation.Kill(); } + _continueAction = continueAction; Initialize(); _animation = GetOpenSequence(); _animation.onComplete += () => @@ -61,14 +63,10 @@ public class PveLossPanel : MonoBehaviour, IControlable public void Close() { + ControlsEnabled = false; ControlsPerformer.Instance.SetControlable(null); - - foreach (var button in buttons) - button.OnInteract -= Close; - if(buttonIndex == 0) - GameManager.Instance.PerformRevenge(); - else - GameManager.Instance.GotoMenu(); + + int selectedButtonIndex = buttonIndex; if (_animation != null) @@ -83,6 +81,13 @@ public class PveLossPanel : MonoBehaviour, IControlable revengeButton.Select(); menuButton.Deselect(); gameObject.SetActive(false); + + if (selectedButtonIndex == 0) + _continueAction?.Invoke(); + else + GameManager.Instance.GotoMenu(); + + _continueAction = null; }; _animation.PlayForward(); } @@ -98,6 +103,7 @@ public class PveLossPanel : MonoBehaviour, IControlable private void Initialize() { + ControlsEnabled = false; panel.anchoredPosition = new Vector2(startPanelX, panel.anchoredPosition.y); description.localScale = Vector3.zero; @@ -110,9 +116,6 @@ public class PveLossPanel : MonoBehaviour, IControlable gameObject.SetActive(true); ControlsPerformer.Instance.SetControlable(this); - foreach (var button in buttons) - button.OnInteract += Close; - buttonIndex = 0; } diff --git a/Assets/Scripts/Gameplay/Panels/PveWinPanel.cs b/Assets/Scripts/Gameplay/Panels/PveWinPanel.cs index 3f5b67b..b3ff43e 100644 --- a/Assets/Scripts/Gameplay/Panels/PveWinPanel.cs +++ b/Assets/Scripts/Gameplay/Panels/PveWinPanel.cs @@ -42,6 +42,7 @@ public class PveWinPanel : MonoBehaviour, IControlable public void Close() { + ControlsEnabled = false; ControlsPerformer.Instance.SetControlable(null); if (_animation != null) { @@ -52,7 +53,7 @@ public class PveWinPanel : MonoBehaviour, IControlable _animation.onComplete += () => { gameObject.SetActive(false); - print("Функция перехода на след противника"); + GameManager.Instance.ContinueAfterPveWin(); }; _animation.PlayForward(); } diff --git a/Assets/Sprites/Chips.meta b/Assets/Sprites/Chips.meta new file mode 100644 index 0000000..bf14ffd --- /dev/null +++ b/Assets/Sprites/Chips.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d93dc740156c7654abb0c02e2e24266e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_cube.png b/Assets/Sprites/Chips/chip_cube.png new file mode 100644 index 0000000..cea26b0 --- /dev/null +++ b/Assets/Sprites/Chips/chip_cube.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66539fb925dcefe0d48b1fcb88b717aa348b5fc3b334403ed53603c22323a58b +size 185010 diff --git a/Assets/Sprites/Chips/chip_cube.png.meta b/Assets/Sprites/Chips/chip_cube.png.meta new file mode 100644 index 0000000..707e350 --- /dev/null +++ b/Assets/Sprites/Chips/chip_cube.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 86e3e7edd9d4ad44badffb017e45ffc7 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8703082228858259314 + second: chip_cube_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_cube_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e8873e1e2d0783780800000000000000 + internalID: -8703082228858259314 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_cube_0: -8703082228858259314 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_dog.png b/Assets/Sprites/Chips/chip_dog.png new file mode 100644 index 0000000..8cd065f --- /dev/null +++ b/Assets/Sprites/Chips/chip_dog.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75b0914b1d1561b3ebdd15e7eafe9dd4c13f90245174c664cac056d47dd8f341 +size 231278 diff --git a/Assets/Sprites/Chips/chip_dog.png.meta b/Assets/Sprites/Chips/chip_dog.png.meta new file mode 100644 index 0000000..c642e29 --- /dev/null +++ b/Assets/Sprites/Chips/chip_dog.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: c99c8ec80e4ab564f8f6e07f132a6a08 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5258756546513945857 + second: chip_dog_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_dog_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ffab6c478c42507b0800000000000000 + internalID: -5258756546513945857 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_dog_0: -5258756546513945857 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_fishka.png b/Assets/Sprites/Chips/chip_fishka.png new file mode 100644 index 0000000..00b9606 --- /dev/null +++ b/Assets/Sprites/Chips/chip_fishka.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d66964b54136df8fd03c26b5eeae6152df9823a7af565804d3bea7600fa153f9 +size 223597 diff --git a/Assets/Sprites/Chips/chip_fishka.png.meta b/Assets/Sprites/Chips/chip_fishka.png.meta new file mode 100644 index 0000000..ff78d35 --- /dev/null +++ b/Assets/Sprites/Chips/chip_fishka.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: be3a1e10203463d42a388463674e5a4f +TextureImporter: + internalIDToNameTable: + - first: + 213: -3439533911878954697 + second: chip_fishka_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_fishka_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7319b8d61225440d0800000000000000 + internalID: -3439533911878954697 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_fishka_0: -3439533911878954697 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_player.png b/Assets/Sprites/Chips/chip_player.png new file mode 100644 index 0000000..6342145 --- /dev/null +++ b/Assets/Sprites/Chips/chip_player.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a65ad28f0e794dc9aa51ae8384b4baf5fae21b81d84d1167e49dbb4fd0b2dd7 +size 176918 diff --git a/Assets/Sprites/Chips/chip_player.png.meta b/Assets/Sprites/Chips/chip_player.png.meta new file mode 100644 index 0000000..4f42fdf --- /dev/null +++ b/Assets/Sprites/Chips/chip_player.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 3a493672559004c41a6a70514ba745c2 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5115209660976819192 + second: chip_player_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_player_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 80494d53aef1309b0800000000000000 + internalID: -5115209660976819192 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_player_0: -5115209660976819192 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_player1.png b/Assets/Sprites/Chips/chip_player1.png new file mode 100644 index 0000000..f9f16e8 --- /dev/null +++ b/Assets/Sprites/Chips/chip_player1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba93a1e3e89f2d4a602805b66e3019261a3ff96d6685fc1deea9c8f3b909bcfe +size 148527 diff --git a/Assets/Sprites/Chips/chip_player1.png.meta b/Assets/Sprites/Chips/chip_player1.png.meta new file mode 100644 index 0000000..25477f5 --- /dev/null +++ b/Assets/Sprites/Chips/chip_player1.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: eccb9dcb5b85c994eaecc71044391a28 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8977629392806811432 + second: chip_player1_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_player1_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8271b530e52f69c70800000000000000 + internalID: 8977629392806811432 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_player1_0: 8977629392806811432 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_player2.png b/Assets/Sprites/Chips/chip_player2.png new file mode 100644 index 0000000..c6e6644 --- /dev/null +++ b/Assets/Sprites/Chips/chip_player2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54df29d1064180bd7d04eecf8d6dea51b5b24197618fdddd62a3f8c25c3ebd8e +size 149063 diff --git a/Assets/Sprites/Chips/chip_player2.png.meta b/Assets/Sprites/Chips/chip_player2.png.meta new file mode 100644 index 0000000..956d200 --- /dev/null +++ b/Assets/Sprites/Chips/chip_player2.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: b7ecf582aadeda84ca3d05d27ea5adef +TextureImporter: + internalIDToNameTable: + - first: + 213: 2890665761737359033 + second: chip_player2_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_player2_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9be3db4e135bd1820800000000000000 + internalID: 2890665761737359033 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_player2_0: 2890665761737359033 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_sam.png b/Assets/Sprites/Chips/chip_sam.png new file mode 100644 index 0000000..d56af4e --- /dev/null +++ b/Assets/Sprites/Chips/chip_sam.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce2cc67dfe8f318100ba69099f1575775d9071c5f12bb18fbc2cbfd787da510b +size 181305 diff --git a/Assets/Sprites/Chips/chip_sam.png.meta b/Assets/Sprites/Chips/chip_sam.png.meta new file mode 100644 index 0000000..87d4eda --- /dev/null +++ b/Assets/Sprites/Chips/chip_sam.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 5acad8b165856bf429879df3068a8f53 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7841686331975577030 + second: chip_sam_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_sam_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6cda0710c2443dc60800000000000000 + internalID: 7841686331975577030 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_sam_0: 7841686331975577030 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Chips/chip_tamagocha.png b/Assets/Sprites/Chips/chip_tamagocha.png new file mode 100644 index 0000000..c546569 --- /dev/null +++ b/Assets/Sprites/Chips/chip_tamagocha.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cbc216b3b3fef839085f3390e87ac2a3b1db57ee1995f1006369fafcd9f1a67 +size 191684 diff --git a/Assets/Sprites/Chips/chip_tamagocha.png.meta b/Assets/Sprites/Chips/chip_tamagocha.png.meta new file mode 100644 index 0000000..7b12dd3 --- /dev/null +++ b/Assets/Sprites/Chips/chip_tamagocha.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 22249bfcd1079244da596525df47b46c +TextureImporter: + internalIDToNameTable: + - first: + 213: 6137273327222775856 + second: chip_tamagocha_0 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 393 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chip_tamagocha_0 + rect: + serializedVersion: 2 + x: 58 + y: 60 + width: 396 + height: 393 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 030e79e0399fb2550800000000000000 + internalID: 6137273327222775856 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + chip_tamagocha_0: 6137273327222775856 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: