Skip to content

Commit

Permalink
➕Added more clarity to 'The Button'. Added control over networking ad…
Browse files Browse the repository at this point in the history
…dress and port. Added more game features.
  • Loading branch information
SKhorozian committed Aug 4, 2021
1 parent 3cb5983 commit b505885
Show file tree
Hide file tree
Showing 2,961 changed files with 2,384 additions and 3,775 deletions.
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Mm]emoryCaptures/
TCG/[Ll]ibrary/
TCG/[Tt]emp/
TCG/[Oo]bj/
TCG/[Bb]uild/
TCG/[Bb]uilds/
TCG/[Ll]ogs/
TCG/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
!TCG/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# TCG/[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
[Aa]ssets/Plugins/Editor/JetBrains*
TCG/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/
Expand Down
6 changes: 6 additions & 0 deletions TCG/.vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
8 changes: 8 additions & 0 deletions TCG/Assets/Gameplay/CardText/Yellow/Units.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2ff335faaaa313a4c97734f723505d0a, type: 3}
m_Name: JavelinTosserEntranceEffect
m_EditorClassIdentifier:
trigger: 1
fieldCard: {fileID: 0}
card: {fileID: 11400000, guid: 465775347a2d488418f8164f799cb765, type: 2}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using UnityEngine;

[CreateAssetMenu (fileName = "JavelinTosserEntranceEffect", menuName = "Card Effects/Trigger/Yellow/Unit/JavelinTosserEntranceEffect")]
public class JavelinTosserEntranceEffect : CardEffectTrigger
{
[SerializeField] Card card;

public override CardEffect GetCardEffect()
{
return new JavelinTosserEffect (card, fieldCard.Player);
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions TCG/Assets/NetworkPrefabs/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ MonoBehaviour:
copies: 2
- card: {fileID: 11400000, guid: 606da591aba12be4fab28b6781f4d87f, type: 2}
copies: 3
- card: {fileID: 11400000, guid: c1da1338cbe2cc44abb5f40975e82994, type: 2}
- card: {fileID: 11400000, guid: f8c319a3befbf9b4d8ce2243825140ef, type: 2}
copies: 3
- card: {fileID: 11400000, guid: 323fb40fb6650ba4da2b2b155d8888f5, type: 2}
copies: 3
Expand All @@ -82,7 +82,7 @@ MonoBehaviour:
copies: 3
- card: {fileID: 11400000, guid: 465775347a2d488418f8164f799cb765, type: 2}
copies: 3
- card: {fileID: 11400000, guid: ebb2580d841c1b648a9ebead7f126ae4, type: 2}
- card: {fileID: 11400000, guid: 912474eb2ec21714c960bd7d3f687f95, type: 2}
copies: 3
playerHero: {fileID: 0}
controledUnits: []
Expand Down
58 changes: 40 additions & 18 deletions TCG/Assets/Prefabs/UI/PlayerController.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1669,6 +1669,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be09199057526e04eaf93e86668fb4d7, type: 3}
--- !u!224 &5146890686931904844 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4914804745972887002, guid: be09199057526e04eaf93e86668fb4d7,
type: 3}
m_PrefabInstance: {fileID: 241374890069427350}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3672449645957079141 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3579975027292792051, guid: be09199057526e04eaf93e86668fb4d7,
Expand All @@ -1681,19 +1687,23 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4fe798c6ad49ff34a9b6c8efbb24e0ae, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &5146890686931904844 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4914804745972887002, guid: be09199057526e04eaf93e86668fb4d7,
type: 3}
m_PrefabInstance: {fileID: 241374890069427350}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &499625752503355464
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 499625753408219367}
m_Modifications:
- target: {fileID: 1279239205442744481, guid: 2fa09fec442ab654da851029ea336293,
type: 3}
propertyPath: buttonText
value:
objectReference: {fileID: 5491203881166948254}
- target: {fileID: 1279239205442744481, guid: 2fa09fec442ab654da851029ea336293,
type: 3}
propertyPath: playerController
value:
objectReference: {fileID: 499625753408219384}
- target: {fileID: 5394092101069080680, guid: 2fa09fec442ab654da851029ea336293,
type: 3}
propertyPath: m_Name
Expand Down Expand Up @@ -1806,6 +1816,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2fa09fec442ab654da851029ea336293, type: 3}
--- !u!114 &5491203881166948254 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5394092100174893014, guid: 2fa09fec442ab654da851029ea336293,
type: 3}
m_PrefabInstance: {fileID: 499625752503355464}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1670769208087247081 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1279239205442744481, guid: 2fa09fec442ab654da851029ea336293,
Expand Down Expand Up @@ -2270,12 +2292,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: be09199057526e04eaf93e86668fb4d7, type: 3}
--- !u!224 &8651109388711916468 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4914804745972887002, guid: be09199057526e04eaf93e86668fb4d7,
type: 3}
m_PrefabInstance: {fileID: 4339797439778545262}
m_PrefabAsset: {fileID: 0}
--- !u!114 &978598982167575197 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3579975027292792051, guid: be09199057526e04eaf93e86668fb4d7,
Expand All @@ -2288,6 +2304,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4fe798c6ad49ff34a9b6c8efbb24e0ae, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &8651109388711916468 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4914804745972887002, guid: be09199057526e04eaf93e86668fb4d7,
type: 3}
m_PrefabInstance: {fileID: 4339797439778545262}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6514648533363923270
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2477,12 +2499,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3599202f9881a7a4c94092cf8b86ba1b, type: 3}
--- !u!224 &62161535832696011 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6535982847674367373, guid: 3599202f9881a7a4c94092cf8b86ba1b,
type: 3}
m_PrefabInstance: {fileID: 6514648533363923270}
m_PrefabAsset: {fileID: 0}
--- !u!114 &62161535832696009 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6535982847674367375, guid: 3599202f9881a7a4c94092cf8b86ba1b,
Expand All @@ -2495,3 +2511,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bebc2d9dcd030664c8fc0fc21629783b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &62161535832696011 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6535982847674367373, guid: 3599202f9881a7a4c94092cf8b86ba1b,
type: 3}
m_PrefabInstance: {fileID: 6514648533363923270}
m_PrefabAsset: {fileID: 0}
13 changes: 8 additions & 5 deletions TCG/Assets/Prefabs/UI/Turn Button.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 40
m_fontSize: 30
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 0
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontSizeMax: 30
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_HorizontalAlignment: 32
m_VerticalAlignment: 4096
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
Expand Down Expand Up @@ -281,4 +281,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
button: {fileID: 5394092101069080693}
buttonText: {fileID: 0}
player: {fileID: 0}
canPress: 0
playerController: {fileID: 0}
2 changes: 1 addition & 1 deletion TCG/Assets/Resources/Cards/Black/Abomination.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
cardName: Abomination
cost: 1
description: <b>Tribute:</b> Sacrifice 1.
description: <b>Tribute:</b> Sacrifice a unit.
color: 2
cardArt: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
cardType: 0
Expand Down
6 changes: 3 additions & 3 deletions TCG/Assets/Resources/Cards/Green/ElvenSwordsman.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
cardName: Elven Swordsman
cost: 2
description: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua.
description:
color: 3
cardArt: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
cardType: 0
extraCost: {fileID: 0}
strength: 400
health: 100
actionPoints: 2
movementSpeed: 1
attackRange: 1
cardEffects: []
cardEffectListeners: []
staticKeywords: 0
onPlayEffect: {fileID: 0}
actions: []
2 changes: 1 addition & 1 deletion TCG/Assets/Resources/Cards/Green/Nurture.asset
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
cardName: Nurture
cost: 1
description: Heal an allied target for 200. Draw 1.
description: "Heal an allied target for 200. \nDraw 1."
color: 3
cardArt: {fileID: 0}
cardType: 1
Expand Down
22 changes: 0 additions & 22 deletions TCG/Assets/Resources/Cards/Yellow/IterativePrototype.asset

This file was deleted.

32 changes: 32 additions & 0 deletions TCG/Assets/Resources/Cards/Yellow/JavelinTosser.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 07bffd1aee5804b45b9a1bb7f6f14641, type: 3}
m_Name: JavelinTosser
m_EditorClassIdentifier:
cardName: Javelin Tosser
cost: 2
description: <sprite name=entrance> Draw a <b>Sun-Tipped Javelin</b> if you have
one in your <b>Junkyard</b>.
color: 4
cardArt: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
cardType: 0
extraCost: {fileID: 0}
strength: 200
health: 100
movementSpeed: 1
attackRange: 2
cardEffects:
- {fileID: 11400000, guid: 3eda1d0fb7a7f7843a105d1a0a488020, type: 2}
cardEffectListeners: []
staticKeywords: 0
onPlayEffect: {fileID: 0}
actions: []
8 changes: 8 additions & 0 deletions TCG/Assets/Resources/Cards/Yellow/JavelinTosser.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions TCG/Assets/Resources/Cards/Yellow/SolarTelumancer.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 07bffd1aee5804b45b9a1bb7f6f14641, type: 3}
m_Name: SolarTelumancer
m_EditorClassIdentifier:
cardName: Solar Telumancer
cost: 4
description: '<b>Telumancy(</b>2 mana<b>): </b>Create a <b>Brief</b> <b>Sun-Tipped
Javelin</b> in hand.'
color: 4
cardArt: {fileID: 0}
cardType: 0
extraCost: {fileID: 0}
strength: 300
health: 300
movementSpeed: 2
attackRange: 1
cardEffects: []
cardEffectListeners: []
staticKeywords: 0
onPlayEffect: {fileID: 0}
actions:
- {fileID: 11400000, guid: a3a66d043d8376f469ee0f97c27a9828, type: 2}
8 changes: 8 additions & 0 deletions TCG/Assets/Resources/Cards/Yellow/SolarTelumancer.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b505885

Please sign in to comment.