From 7c0f09de483594904cfd7c633455703330f1e9df Mon Sep 17 00:00:00 2001 From: KeyKoder Date: Tue, 3 Nov 2020 22:00:15 +0100 Subject: [PATCH] Fix minor graphical error with the card menu --- unity/Assets/Prefabs/CardBaseUI.prefab | 3 ++- unity/Assets/StreamingAssets/ProtoDeck.txt | 13 +++++++++++++ unity/Assets/StreamingAssets/bluebg.png | Bin 0 -> 2882 bytes unity/Assets/StreamingAssets/bluebg.png.meta | 7 +++++++ unity/Assets/StreamingAssets/pingcard.png | Bin 0 -> 7590 bytes unity/Assets/StreamingAssets/pingcard.png.meta | 7 +++++++ 6 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 unity/Assets/StreamingAssets/bluebg.png create mode 100644 unity/Assets/StreamingAssets/bluebg.png.meta create mode 100644 unity/Assets/StreamingAssets/pingcard.png create mode 100644 unity/Assets/StreamingAssets/pingcard.png.meta diff --git a/unity/Assets/Prefabs/CardBaseUI.prefab b/unity/Assets/Prefabs/CardBaseUI.prefab index ea1eb86..fc49469 100644 --- a/unity/Assets/Prefabs/CardBaseUI.prefab +++ b/unity/Assets/Prefabs/CardBaseUI.prefab @@ -112,7 +112,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 4636870508535478785} + m_TargetGraphic: {fileID: 7961957966435805549} m_OnClick: m_PersistentCalls: m_Calls: @@ -668,6 +668,7 @@ MonoBehaviour: m_EditorClassIdentifier: cardCanvas: {fileID: 5463950459347836262, guid: fc20f9d5ae7f3364d8425ba33a8d0c81, type: 3} preparedCard: 0 + thrown: 0 --- !u!1 &8916404675787270260 GameObject: m_ObjectHideFlags: 0 diff --git a/unity/Assets/StreamingAssets/ProtoDeck.txt b/unity/Assets/StreamingAssets/ProtoDeck.txt index ae1f816..80696f9 100644 --- a/unity/Assets/StreamingAssets/ProtoDeck.txt +++ b/unity/Assets/StreamingAssets/ProtoDeck.txt @@ -70,6 +70,19 @@ description: ~ The Creator of the Card bg: greenbg.png +[Card] +id: pingcard +name: Ping +basetype: Effect +typemod: None +typename: Annoying Sound +image: pingcard.png +action: + Annoy all players. +description: + WHY WOULD YOU DO THAT AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA. +bg: bluebg.png + [Deck] name: Prototype Deck creetoor*6 diff --git a/unity/Assets/StreamingAssets/bluebg.png b/unity/Assets/StreamingAssets/bluebg.png new file mode 100644 index 0000000000000000000000000000000000000000..bc9c83edf6acdab257853334117f5251bd075be2 GIT binary patch literal 2882 zcmeHJSx}Q#6#f$mDhP;_fwHBQT02@vDGDk9s?r7*h%81H5jv^j0D=+}S(Ca^YbEV4 zgalo%5Y@ z?#*MtNK11^a{vG=4+RE<0s!PV06>BDX2z3mstrrV4T23t9snpTXNl4HD1Lv?egJ48 zSZIGRHQF1_2S#E6!0Pdv1?l`fQ4Rp+BZmU^hhIJ==c8)QoObD601Lf1N!kJ{OaO7X z9Q~7xdsKk?$93eb?i){@CLU`$Tfx7Z7bG{$QxBn&071o0@05MQ zwHb$zKSY~*Oh3f-@Vk0h7F)JxGT>eqe zoU0d1F?}(9)KC6x?R6GK0kdI`m5v%|%6in+u`BKz>TuznrM zr}KuBxTa(YQX5~>T@~GWb%YhNm=_8-o}jCpjssmL<>s3u+xVHZUA=;D12(+RK+GpJ95<<2)OAkGVv-Kr}Xn9iLAdwe$YU2j34)TA+?LmH4&D zR1eVMkO)Hj3NH=kqAn&TCPqS%N-B^9_j+BU3s-(lXajhSBMrXNa9xm6}<_#M5G-a#A>YHs>`#DOX1e82t-Vd$gsC>?|3T*i^qxe&mPY$-lhWqcN~iI8l|`<1W`&vA zqsFeAMHt&f-U}-3^LSAqrg6T>h7||F*~TJ+wey}`x>pck4b*F-h>^-kTTWBnu5&|D zNV%$l>O!M>)q~^_6qDdjm#L;zu+@*4cguX$lkUB^(I1kNoW7ykN6B~QVrVmT`uvjx z$uoa_f-xh7R2+8Q$oZt*xrnc)DP*~yl`-VL+UK!V2j_AOsb=GoONt$aJIOSi8%M%{ z!{b$pG?k;yb4F0~`(O`-_hb>v+U=3L3J9nf=G|y#Y>v&s;6* z)`i#0U1sA~1g&XG2HZff^>@k303w70q(AOaLp7OaXhqj^w@%GJCq}0S1I?w#9=_kc z<(IRnpxCe&{e;Sc5&=^DOQil{XfRvOkvF^!EPs6e;SUDA$!#~exO@E5+;UlJPF%%ap*8zWvt7TSAGj1#L nJV0+0%!Q8Fov$HQ836c}P<4C%z%}E)7dZ4?Z~)~%+?BrpD(qj% literal 0 HcmV?d00001 diff --git a/unity/Assets/StreamingAssets/bluebg.png.meta b/unity/Assets/StreamingAssets/bluebg.png.meta new file mode 100644 index 0000000..232dd3f --- /dev/null +++ b/unity/Assets/StreamingAssets/bluebg.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9fbddc5c7df2a8c48b5edd24dbcb1c72 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/StreamingAssets/pingcard.png b/unity/Assets/StreamingAssets/pingcard.png new file mode 100644 index 0000000000000000000000000000000000000000..8ca954c88629e13d47328dae11c9887c9f583400 GIT binary patch literal 7590 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 literal 0 HcmV?d00001 diff --git a/unity/Assets/StreamingAssets/pingcard.png.meta b/unity/Assets/StreamingAssets/pingcard.png.meta new file mode 100644 index 0000000..8e4ef09 --- /dev/null +++ b/unity/Assets/StreamingAssets/pingcard.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f84473a49ff01449b0ad5572095f1a9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: