Merge remote-tracking branch 'origin/master'

This commit is contained in:
kabix09 2022-12-29 21:05:48 +01:00
commit 77dd3c396f
43 changed files with 1372 additions and 915 deletions

View File

@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: -4226689414463533042, guid: c501ec6d7371e4941bd626854137afe4, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View File

@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 3
m_Sprite: {fileID: 2287037204803831525, guid: 191d3a9d11cf33a4aa5d5137bf353316, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View File

@ -18,7 +18,7 @@ MonoBehaviour:
- Header: Barman
WasDisplayed: 0
ListOfSentences:
- Sentence: "Poda\u0107 co\u015B do picia?"
- Sentence: Podac cos do picia?
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -0,0 +1,39 @@
%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: 06201cadd951bcc4db5fccaa01783060, type: 3}
m_Name: BossThugDialPL
m_EditorClassIdentifier:
SpeakerName:
CurrentStep: 0
DialogueSteps:
- Header:
WasDisplayed: 0
ListOfSentences:
- Sentence: Ktos ty? Jak pokonales moich straznikow?!
Buttons: []
- Sentence: Nie odpowiadaj. Nie obchodzi mnie to. Juz nie zyjesz.
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 5598884596044988526, guid: df6c42c9616028a4badca81953f003ab, type: 3}
m_TargetAssemblyTypeName: NpcDialogueManager, Assembly-CSharp
m_MethodName: DialogueEndAction
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c3651d436687dfd4e8b122b657c28c85
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,19 @@
%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: 45b41589283138641ba006c2243b0637, type: 3}
m_Name: BossThugMultiDialPL
m_EditorClassIdentifier:
SpeakerName:
CurrentDialogue: 0
Dialogues:
- Key: 0
Value: {fileID: 11400000, guid: c3651d436687dfd4e8b122b657c28c85, type: 2}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 25d0b8cca6af6ea479a16bced487125d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -18,7 +18,7 @@ MonoBehaviour:
- Header:
WasDisplayed: 0
ListOfSentences:
- Sentence: "Ku pami\u0119ci poleg\u0142ych"
- Sentence: Ku pamieci poleglych
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -18,7 +18,7 @@ MonoBehaviour:
- Header: ThePlayer(Clone)
WasDisplayed: 0
ListOfSentences:
- Sentence: "Te drzwi s\u0105 zamkni\u0119te"
- Sentence: Te drzwi sa zamkniete
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -18,7 +18,7 @@ MonoBehaviour:
- Header:
WasDisplayed: 0
ListOfSentences:
- Sentence: "Gro\u017Anie wygl\u0105daj\u0105cy pos\u0105g..."
- Sentence: Groznie wygladajacy posag...
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -18,7 +18,7 @@ MonoBehaviour:
- Header:
WasDisplayed: 0
ListOfSentences:
- Sentence: "Jest tak stary, \u017Ce litery s\u0105 nieczytelne"
- Sentence: Jest tak stary, ze litery sa nieczytelne
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -18,7 +18,7 @@ MonoBehaviour:
- Header:
WasDisplayed: 0
ListOfSentences:
- Sentence: "Witaj, czy chcia\u0142 by\u015B co\u015B kupi\u0107?"
- Sentence: Witaj, czy chcialbys cos kupic?
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -18,10 +18,9 @@ MonoBehaviour:
- Header: Czarodziej
WasDisplayed: 0
ListOfSentences:
- Sentence: "Dzie\u0144 dobry! Ciesz\u0119 si\u0119, \u017Ce wreszcie si\u0119
obudzi\u0142e\u015B. Jak si\u0119 masz?"
- Sentence: Dzien dobry! Ciesze sie, ze wreszcie sie obudziles. Jak sie masz?
Buttons:
- ButtonName: "Kim jeste\u015B? Co to za miejsce?"
- ButtonName: Kim jestes? Co to za miejsce?
Type: 1
ButtonActions:
m_PersistentCalls:
@ -38,10 +37,10 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- Sentence: "Jestem Czarodziejem. Znalaz\u0142em ci\u0119 pobitego w jaskini
i przyprowadzi\u0142em tutaj. Nie by\u0142em pewny czy si\u0119 obudzisz..."
- Sentence: Jestem Czarodziejem. Znalazlem cie pobitego w jaskini i przyprowadzilem
tutaj. Nie bylem pewny czy sie obudzisz...
Buttons:
- ButtonName: "Dzi\u0119kuj\u0119 za pomoc, ale powinienem ju\u017C i\u015B\u0107."
- ButtonName: "Dzi\u0119kuje za pomoc, ale powinienem juz isc."
Type: 1
ButtonActions:
m_PersistentCalls:
@ -58,11 +57,10 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- Sentence: "Nie s\u0105dz\u0119, \u017Ce jeste\u015B wystarczaj\u0105co silny.
A ci bandyci i tak zabrali prawie wszystko co mia\u0142e\u015B. Dam ci zio\u0142a,
jak wr\xF3c\u0119."
- Sentence: Nie sadze, ze jestes wystarczajaco silny. A ci bandyci i tak zabrali
prawie wszystko co miales. Dam ci ziola, jak wroce.
Buttons:
- ButtonName: "Czuj\u0119 si\u0119 dobrze. Musz\u0119 i\u015B\u0107."
- ButtonName: Czuje sie dobrze. Musze isc.
Type: 1
ButtonActions:
m_PersistentCalls:
@ -79,12 +77,11 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- Sentence: "Dobrze. Udowodnij mi, \u017Ce jeste\u015B ju\u017C zdrowy i pozwol\u0119
ci p\xF3j\u015B\u0107. W lesie na p\xF3\u0142nocny wsch\xF3d od mojego domu
s\u0105 pewne robaki. Potrzebuj\u0119, \u017Ceby\u015B je zabi\u0142 i przyni\xF3s\u0142
mi ich jad. Przynie\u015B mi go, a pozwol\u0119 ci odej\u015B\u0107."
- Sentence: Dobrze. Udowodnij mi, ze jestes juz zdrowy i pozwole ci pojsc. W
lesie na polnocny wschod od mojego domu sa pewne robaki. Potrzebuje, zebys
je zabil i przyniosl mi ich jad. Przynies mi go, a pozwole ci odejsc.
Buttons:
- ButtonName: "W porz\u0105dku."
- ButtonName: W porzadku.
Type: 1
ButtonActions:
m_PersistentCalls:
@ -101,7 +98,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- Sentence: "Gdzie\u015B w domu powinienem mie\u0107 miecz. Mo\u017Cesz go zabra\u0107."
- Sentence: Gdzies w domu powinienem miec miecz. Mozesz go zabrac.
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: 7885408681318359695, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 2398585647368572567, guid: c2b25eeb1e39e764c98f73310a03cf2b, type: 3}
price: 120
price: 140
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 5
isStackable: 0
EquipmentType: 8

View File

@ -16,11 +16,17 @@ MonoBehaviour:
name: Lumberjac Axe
description: Lumberjack axe
level: 1
value: 2
image: {fileID: 21300000, guid: d7a7292796eda0941a6a863b7d66bbcb, type: 3}
itemModel: {fileID: 1826809974269949497, guid: 83fa1f81238efb541bd77405dcf33dd1, type: 3}
price: 50
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 1
AgilityBonus: 0
InteligenceBonus: 5
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 5

View File

@ -14,13 +14,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
id: 0
name: Basic Sword
description:
description: Normal Sword
level: 1
value: 2
image: {fileID: -1424804349743227679, guid: 52aa424fe853b154a95a8f677de1a275, type: 3}
itemModel: {fileID: 4126821754175378127, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3}
StrengthBonus: 15
AgilityBonus: 0
InteligenceBonus: 0
price: 30
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 5

View File

@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
id: 0
name: Blue Flower
description:
description: Nice flower
level: 0
value: 0
image: {fileID: 1933597549513317440, guid: 72c80de1ab089794785daf50f8abf104, type: 3}

View File

@ -14,18 +14,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
id: 0
name: Chestplate
description:
description: Normal leather chestplate
level: 1
value: 0
value: 1
image: {fileID: 4404702397685382865, guid: 52aa424fe853b154a95a8f677de1a275, type: 3}
itemModel: {fileID: 8687962458953192462, guid: ae7e7f7d0d926174a8edae16f7f4d305, type: 3}
price: 0
price: 50
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
VitalityBonus: 15
SpeedBonus: 0
isStackable: 0
EquipmentType: 2

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: 4249666258807903423, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 2641452819628145680, guid: 93bbc3cef1819314082c95895d5e5017, type: 3}
price: 120
price: 140
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 5
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 0
EnduranceBonus: 5
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 8

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: EbonyRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Ebony Ring
description: Ring made out of ebony
level: 0
value: 0
image: {fileID: -6657913739729259365, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 6931735939571646632, guid: bc24f87c709ae2b458d1808f0e59b2aa, type: 3}
price: 0
price: 85
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 1
SpeedBonus: 1
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: EmeraldRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Emerald Ring
description: Ring with emerald
level: 0
value: 0
image: {fileID: -7652257075970667830, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 8585366321171850528, guid: e6bebb8b7d63fdc48aaea6ed5e47fbc1, type: 3}
price: 0
price: 105
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
EnduranceBonus: 0
VitalityBonus: 3
InteligenceBonus: 0
VitalityBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: -3459497016148413627, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 9122857022439842298, guid: 7703bd9c885f5da46acb026f16b1ed82, type: 3}
price: 120
price: 140
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 5
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 8

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: GoldenRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Golden Ring
description: Gold ring
level: 0
value: 0
image: {fileID: -6524714282782223981, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 8357185774081028001, guid: f2ccd14c03a2bd5469dae087392a8323, type: 3}
price: 0
price: 95
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
EnduranceBonus: 1
VitalityBonus: 1
InteligenceBonus: 0
VitalityBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -23,9 +23,10 @@ MonoBehaviour:
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 15
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 20
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 5

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: 2634581254100188468, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 8355166867481118729, guid: 1b7014d4d2f7373409be7a5dea208b56, type: 3}
price: 20
price: 30
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 6

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: 6770572910690203029, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 2329240032996401192, guid: 0d90080a8b4085d4dbb1f9fe2404c140, type: 3}
price: 10
price: 20
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 6

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: -5837177561311991975, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 2439513124194804271, guid: ba1820e9446462744a4ace2d4df9280b, type: 3}
price: 5
price: 10
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 6

View File

@ -17,16 +17,17 @@ MonoBehaviour:
description: Very heavy sword it gives a lot of damage but will be hard to carry
around
level: 0
value: 0
value: 2
image: {fileID: 444537707431101305, guid: 94f7a1cd00ce2c543af19397b21cfe52, type: 3}
itemModel: {fileID: 1233190268391230073, guid: 477c31b83d1b95e448e6406412b02231, type: 3}
price: 12
price: 80
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 3
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: -1
isStackable: 0
EquipmentType: 5

View File

@ -16,16 +16,17 @@ MonoBehaviour:
name: Light Sword
description: Very light sword. Easy to carry
level: 0
value: 0
value: 3
image: {fileID: 1389849888674057003, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 3310224593960103282, guid: a4d5dfca7c95e0242a086b8920a0c550, type: 3}
price: 10
price: 70
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 1
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 2
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 1
isStackable: 0
EquipmentType: 5

View File

@ -24,8 +24,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 2
AgilityBonus: 2
InteligenceBonus: 2
EnduranceBonus: 2
VitalityBonus: 2
InteligenceBonus: 2
SpeedBonus: 2
isStackable: 0
EquipmentType: 8

View File

@ -16,10 +16,10 @@ MonoBehaviour:
name: Pickaxe
description:
level: 1
value: 0
value: 1
image: {fileID: 8959118705387878318, guid: 25e473b59d2d7534e803be0a2825e0f7, type: 3}
itemModel: {fileID: 9081071845930167562, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3}
price: 0
price: 20
useEffect:
m_PersistentCalls:
m_Calls:
@ -35,9 +35,10 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
StrengthBonus: 5
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 5

View File

@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
id: 0
name: Pink Flower
description:
description: Nice flower
level: 0
value: 0
image: {fileID: 8806948917284211570, guid: 72c80de1ab089794785daf50f8abf104, type: 3}

View File

@ -14,13 +14,19 @@ MonoBehaviour:
m_EditorClassIdentifier:
id: 3
name: Private Helmet
description:
description: Leather helmet
level: 0
value: 1
image: {fileID: -4153561594331974330, guid: 52aa424fe853b154a95a8f677de1a275, type: 3}
itemModel: {fileID: 8387239886674690860, guid: 6d1fa1c676de3d248a84064a66916bcd, type: 3}
price: 35
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
VitalityBonus: 5
SpeedBonus: 0
isStackable: 0
EquipmentType: 1

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: QuartzRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Quart Ring
description: Ring with quartz stone
level: 0
value: 0
image: {fileID: 6759244946866839360, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 7335205385618090110, guid: 14fcd7ab63436604492949d1fd4bc6bf, type: 3}
price: 0
price: 95
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
VitalityBonus: 0
EnduranceBonus: 0
VitalityBonus: 1
InteligenceBonus: 2
SpeedBonus: 0
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: RubyRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Ruby Ring
description: Ring with ruby
level: 0
value: 0
image: {fileID: -847223144147799035, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 4342831401918966249, guid: 2917e0f72c8f18b47806c56522cbeb0c, type: 3}
price: 0
price: 115
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 2
EnduranceBonus: 2
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: SilverRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Silver Ring
description: Normal silver ring
level: 0
value: 0
image: {fileID: 7035944541455254544, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 3527697885031028648, guid: f4c5ae72e7ed9d24a8f45afe7c62719f, type: 3}
price: 0
price: 60
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 1
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -16,7 +16,7 @@ MonoBehaviour:
name: Steel Helmet
description: Well made helmet. Good protection.
level: 0
value: 0
value: 2
image: {fileID: 8286571802576935001, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 4002461311910610052, guid: 522ac16bac932ff4d93ef9865d137864, type: 3}
price: 25
@ -24,8 +24,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
EnduranceBonus: 0
VitalityBonus: 1
InteligenceBonus: 0
VitalityBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 1

View File

@ -13,19 +13,20 @@ MonoBehaviour:
m_Name: TopazRing
m_EditorClassIdentifier:
id: 0
name:
description:
name: Topaz Ring
description: Ring with a topaz
level: 0
value: 0
image: {fileID: -8195587494142681365, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 202265579401738656, guid: 116af0fb4d8fe53428ca7f4593fd99ed, type: 3}
price: 0
price: 100
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
StrengthBonus: 1
EnduranceBonus: 1
VitalityBonus: 0
InteligenceBonus: 1
SpeedBonus: 0
isStackable: 0
EquipmentType: 0
EquipmentType: 9

View File

@ -19,13 +19,14 @@ MonoBehaviour:
value: 0
image: {fileID: 0}
itemModel: {fileID: 8077255044395745669, guid: 5746269b822b8754a8ac1a3a41ff324d, type: 3}
price: 120
price: 140
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 5
SpeedBonus: 0
isStackable: 0
EquipmentType: 8

View File

@ -16,16 +16,17 @@ MonoBehaviour:
name: Wooden Sword
description: Simple Wooden Sword
level: 1
value: 0
value: 1
image: {fileID: 3009030062900057397, guid: 94f7a1cd00ce2c543af19397b21cfe52, type: 3}
itemModel: {fileID: 2946484175895467425, guid: 5bd9c999803793443831053438f30b96, type: 3}
price: 3
price: 10
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
AgilityBonus: 0
InteligenceBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 5

File diff suppressed because it is too large Load Diff

View File

@ -1195,6 +1195,10 @@ Tilemap:
m_Data: {fileID: 11400000, guid: fad62cc28031aa944af59f6aaa657287, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b779582901a88204db3c9ca2073acf32, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileSpriteArray:
- m_RefCount: 1
m_Data: {fileID: 999761995969321364, guid: e7698f36d680635418599dd2745a3e61, type: 3}
@ -1222,6 +1226,10 @@ Tilemap:
m_Data: {fileID: -6273525262347030492, guid: e7698f36d680635418599dd2745a3e61, type: 3}
- m_RefCount: 1
m_Data: {fileID: -7055040228193979920, guid: e7698f36d680635418599dd2745a3e61, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
m_TileMatrixArray:
- m_RefCount: 13
m_Data:
@ -1247,8 +1255,8 @@ Tilemap:
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -7, y: -2, z: 0}
m_Size: {x: 15, y: 10, z: 1}
m_Origin: {x: -7, y: -4, z: 0}
m_Size: {x: 15, y: 12, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@ -3287,7 +3295,7 @@ CircleCollider2D:
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.875
m_Radius: 1.5
--- !u!50 &445768722
Rigidbody2D:
serializedVersion: 4
@ -6779,6 +6787,26 @@ Tilemap:
m_GameObject: {fileID: 593306681}
m_Enabled: 1
m_Tiles:
- first: {x: -1, y: -4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 1, y: -4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 12
m_TileSpriteIndex: 12
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -8, y: 5, z: 0}
second:
serializedVersion: 2
@ -7315,6 +7343,10 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 2db94dac4f3f44b44bf8fb0fdf791f6d, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: fab96e837d3731c44be6ac650d882b72, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: da383c2f3c858f648b0ea1978e2e53e5, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 40bafc8b6ed4f47428c81b27da06b80d, type: 2}
m_TileSpriteArray:
- m_RefCount: 1
m_Data: {fileID: 1977855532099525247, guid: e7698f36d680635418599dd2745a3e61, type: 3}
@ -7340,8 +7372,12 @@ Tilemap:
m_Data: {fileID: -939794375167313262, guid: e7698f36d680635418599dd2745a3e61, type: 3}
- m_RefCount: 1
m_Data: {fileID: 2686855623640877033, guid: e7698f36d680635418599dd2745a3e61, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1250751726918572047, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3}
- m_RefCount: 1
m_Data: {fileID: 5355178473153844191, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3}
m_TileMatrixArray:
- m_RefCount: 51
- m_RefCount: 53
m_Data:
e00: 1
e01: 0
@ -7360,13 +7396,13 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 51
- m_RefCount: 53
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -8, y: 0, z: 0}
m_Size: {x: 18, y: 8, z: 1}
m_Origin: {x: -8, y: -4, z: 0}
m_Size: {x: 18, y: 12, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:

View File

@ -163,6 +163,7 @@ public class Player : MonoBehaviour
Debug.Log($"Minion Damage: {damage}; \nDefense: {PlayerPrefs.GetFloat("defenseValue")}");
damage = damage - PlayerPrefs.GetFloat("defenseValue");
damage = damage < 0 ? 0 : damage;
Debug.Log($"RealDamage: {damage}");