s452674/Scriptum
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kabix09 2023-01-05 20:03:08 +01:00
commit 71d7ff164a
7 changed files with 192 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Resources/Dialogue/Objects/Water/ENG/WaterDialENG.asset
View File

@ -12,12 +12,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3}
m_Name: WaterDialENG
m_EditorClassIdentifier:
SpeakerName: Proba134
SpeakerName: aaaa
CurrentStep: 0
DialogueSteps:
- Header: Proba134
- Header: aaaa
WasDisplayed: 0
ListOfSentences: []
ListOfSentences:
- Sentence: If only I had a fishing rod...
Buttons: []
EndOfDialogueStepAction:
m_PersistentCalls:
m_Calls: []

32
Assets/Resources/Items/CrabVenom.asset Normal file
View File

@ -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: a0c176e87b3c91641897c23dc27e92a0, type: 3}
m_Name: CrabVenom
m_EditorClassIdentifier:
id: 0
name: Crab Venom
description: Poisonous venom from a crab
level: 0
value: 0
image: {fileID: 7977443681283346765, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
itemModel: {fileID: 8707952282648172651, guid: 7e7c7a913b3a569458a1f9ed3e86314f, type: 3}
price: 35
useEffect:
m_PersistentCalls:
m_Calls: []
StrengthBonus: 0
EnduranceBonus: 0
VitalityBonus: 0
InteligenceBonus: 0
SpeedBonus: 0
isStackable: 0
EquipmentType: 6

8
Assets/Resources/Items/CrabVenom.asset.meta Normal file
View File

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

84
Assets/Resources/Items/CrabVenom.prefab Normal file
View File

@ -0,0 +1,84 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8707952282648172651
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3680450334359996580}
- component: {fileID: 8573611937232687253}
m_Layer: 0
m_Name: CrabVenom
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3680450334359996580
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8707952282648172651}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.9559996, y: -22.387981, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &8573611937232687253
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8707952282648172651}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 7977443681283346765, guid: 866adc2eb813e72438343756fc3b4e01, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0

7
Assets/Resources/Items/CrabVenom.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7e7c7a913b3a569458a1f9ed3e86314f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

431
Assets/Scenes/CaveEntrance.unity
View File

File diff suppressed because it is too large Load Diff

28
Assets/Scenes/FirstVillage.unity
View File

@ -563458,6 +563458,7 @@ GameObject:
- component: {fileID: 1636410215}
- component: {fileID: 1636410214}
- component: {fileID: 1636410213}
- component: {fileID: 1636410216}
m_Layer: 0
m_Name: Water
m_TagString: Untagged
@ -563473,7 +563474,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1636410211}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -20.87, y: -59.81, z: -13.449348}
m_LocalPosition: {x: -21.03, y: -59.7, z: -13.449348}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1636280038}
@ -563541,8 +563542,29 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 10}
m_EdgeRadius: 0
m_Size: {x: 2, y: 12}
m_EdgeRadius: 1
--- !u!50 &1636410216
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1636410211}
m_BodyType: 2
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!1 &1636563514
GameObject:
m_ObjectHideFlags: 0