diff --git a/Assets/TerrainData_24238373-2d55-4b95-9746-1f7e69d39853.asset.meta b/Assets/Fonts.meta similarity index 52% rename from Assets/TerrainData_24238373-2d55-4b95-9746-1f7e69d39853.asset.meta rename to Assets/Fonts.meta index e15293c..774c34d 100644 --- a/Assets/TerrainData_24238373-2d55-4b95-9746-1f7e69d39853.asset.meta +++ b/Assets/Fonts.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 76682d815193b9b41958835c6f85f98c -NativeFormatImporter: +guid: 4e480b14d07922334ac294e5cd802706 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 15600000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Fonts/FranxurterTotallyMedium-gxwjp.ttf b/Assets/Fonts/FranxurterTotallyMedium-gxwjp.ttf new file mode 100644 index 0000000..35c2bd7 Binary files /dev/null and b/Assets/Fonts/FranxurterTotallyMedium-gxwjp.ttf differ diff --git a/Assets/Fonts/FranxurterTotallyMedium-gxwjp.ttf.meta b/Assets/Fonts/FranxurterTotallyMedium-gxwjp.ttf.meta new file mode 100644 index 0000000..bb53372 --- /dev/null +++ b/Assets/Fonts/FranxurterTotallyMedium-gxwjp.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 2b8c3fce9287a0e499b95c5a3fb17529 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Franxurter Totally + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/sticknew.aseprite b/Assets/IMG/Aseprite/sticknew.aseprite new file mode 100644 index 0000000..0cf5bc1 Binary files /dev/null and b/Assets/IMG/Aseprite/sticknew.aseprite differ diff --git a/Assets/New Terrain.asset.meta b/Assets/IMG/Aseprite/sticknew.aseprite.meta similarity index 52% rename from Assets/New Terrain.asset.meta rename to Assets/IMG/Aseprite/sticknew.aseprite.meta index 35b3411..d6e7d07 100644 --- a/Assets/New Terrain.asset.meta +++ b/Assets/IMG/Aseprite/sticknew.aseprite.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: b7f5bf26418e324a69fbeb8e0fe04a16 -NativeFormatImporter: +guid: 2736152c14d4c00f59746da3ca79601b +DefaultImporter: externalObjects: {} - mainObjectFileID: 15600000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/IMG/sticknew.png b/Assets/IMG/sticknew.png new file mode 100644 index 0000000..e6fa542 Binary files /dev/null and b/Assets/IMG/sticknew.png differ diff --git a/Assets/IMG/sticknew.png.meta b/Assets/IMG/sticknew.png.meta new file mode 100644 index 0000000..0a4f1b5 --- /dev/null +++ b/Assets/IMG/sticknew.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: d083508f90401fa6dac0392e42c5da76 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + 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: 3 + 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: 3 + 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Input.inputactions b/Assets/Input.inputactions index 4d3806a..76e03a5 100644 --- a/Assets/Input.inputactions +++ b/Assets/Input.inputactions @@ -86,15 +86,6 @@ "interactions": "", "initialStateCheck": false }, - { - "name": "Charsheet", - "type": "Button", - "id": "d3e2f9b4-83df-4229-bdab-166ea722b672", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "Inventory", "type": "Button", @@ -333,39 +324,6 @@ "isComposite": false, "isPartOfComposite": false }, - { - "name": "", - "id": "c3215b19-e6e2-4b38-be31-cb78772547c0", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "KeyboardMouse", - "action": "Charsheet", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "198d5b2b-78fa-479f-8a06-ca71e1e8c914", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "KeyboardMouse", - "action": "Charsheet", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "99797d2f-fccb-4165-b1ee-3032683a3e21", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Controller", - "action": "Charsheet", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "41d6126e-54e9-4ac3-9fd7-20ecf4db4eaa", @@ -489,15 +447,6 @@ "interactions": "", "initialStateCheck": false }, - { - "name": "Charsheet", - "type": "Button", - "id": "c46c052d-0d2e-483f-949b-d2a96f72c7f1", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "Inventory", "type": "Button", @@ -701,28 +650,6 @@ "isComposite": false, "isPartOfComposite": false }, - { - "name": "", - "id": "9f93a5f5-6762-48a6-8747-ee04a1833148", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "KeyboardMouse", - "action": "Charsheet", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "af6d7d0a-ffde-4a66-a749-011dd678189b", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Controller", - "action": "Charsheet", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "3876ad34-0e23-4436-bd5f-84c8411dee1a", diff --git a/Assets/New Terrain.asset b/Assets/New Terrain.asset deleted file mode 100644 index 75c9a27..0000000 Binary files a/Assets/New Terrain.asset and /dev/null differ diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 774908f..612405a 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -183,7 +183,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -417,7 +417,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -576,7 +576,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -675,78 +675,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &34905203 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 34905204} - - component: {fileID: 34905206} - - component: {fileID: 34905205} - m_Layer: 5 - m_Name: imgAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &34905204 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 34905203} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1063798842} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.25} - m_AnchorMax: {x: 0.15, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &34905205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 34905203} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &34905206 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 34905203} - m_CullTransparentMesh: 1 --- !u!1 &41333114 GameObject: m_ObjectHideFlags: 0 @@ -1422,7 +1350,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1671,7 +1599,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 16 m_FontStyle: 0 m_BestFit: 0 @@ -1923,7 +1851,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 1 m_BestFit: 0 @@ -2278,7 +2206,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2417,7 +2345,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2810,7 +2738,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -2931,7 +2859,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -3172,7 +3100,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -3330,7 +3258,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 18 m_FontStyle: 1 m_BestFit: 0 @@ -3788,7 +3716,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -3984,7 +3912,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -4385,7 +4313,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -4598,126 +4526,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &234481275 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 234481276} - - component: {fileID: 234481278} - - component: {fileID: 234481277} - - component: {fileID: 234481279} - m_Layer: 5 - m_Name: txtName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &234481276 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234481275} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 521488631} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.90200007} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &234481277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234481275} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Name (Lvl. 0) ---- !u!222 &234481278 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234481275} - m_CullTransparentMesh: 1 ---- !u!114 &234481279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 234481275} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 234481277} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] --- !u!1 &252956360 GameObject: m_ObjectHideFlags: 0 @@ -4778,7 +4586,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -4913,10 +4721,10 @@ RectTransform: - {fileID: 1514620987} m_Father: {fileID: 1726505616} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 420, y: -25} - m_SizeDelta: {x: -375, y: -250} + m_AnchorMin: {x: 0.25, y: 0.3} + m_AnchorMax: {x: 0.6, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &253189948 MonoBehaviour: @@ -4931,7 +4739,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5217,7 +5025,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -5666,7 +5474,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -5718,7 +5526,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 662300490} - - {fileID: 1202590055} - {fileID: 662339202} m_Father: {fileID: 463065573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5824,7 +5631,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -5891,7 +5698,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1109855818} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -5907,19 +5714,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 0.575 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.y - value: 0.9 + value: 0.75 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0.425 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0.1 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x @@ -6008,7 +5815,7 @@ PrefabInstance: - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Navigation.m_SelectOnRight value: - objectReference: {fileID: 1683122102} + objectReference: {fileID: 0} - target: {fileID: 7287345907462116809, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Name value: equipHead @@ -6099,7 +5906,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 1 m_BestFit: 0 @@ -6198,6 +6005,48 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text +--- !u!1 &321256366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 321256367} + m_Layer: 5 + m_Name: equipSlots + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &321256367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321256366} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1613559930} + - {fileID: 2102318180} + - {fileID: 315955576} + - {fileID: 1747491082} + - {fileID: 1676542154} + - {fileID: 1572612346} + - {fileID: 2128846815} + m_Father: {fileID: 1726505616} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.3} + m_AnchorMax: {x: 0.25, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &322679540 GameObject: m_ObjectHideFlags: 0 @@ -6503,126 +6352,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &344823571 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 344823572} - - component: {fileID: 344823574} - - component: {fileID: 344823573} - - component: {fileID: 344823575} - m_Layer: 5 - m_Name: healthTextInformation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &344823572 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344823571} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 366342486} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &344823573 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344823571} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 18 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 100/100 ---- !u!222 &344823574 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344823571} - m_CullTransparentMesh: 1 ---- !u!114 &344823575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 344823571} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 344823573} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] --- !u!1 &345934873 GameObject: m_ObjectHideFlags: 0 @@ -6656,10 +6385,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1343558895} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.25, y: 1} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: -5, y: 0} + m_AnchorMin: {x: 0.3, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &345934875 MonoBehaviour: @@ -6682,14 +6411,14 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -6803,7 +6532,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -6902,84 +6631,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &348626018 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 348626019} - - component: {fileID: 348626021} - - component: {fileID: 348626020} - m_Layer: 5 - m_Name: pnlsecond - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &348626019 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348626018} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1747491082} - - {fileID: 1572612346} - - {fileID: 2128846815} - m_Father: {fileID: 1531620867} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.3} - m_AnchorMax: {x: 1, y: 0.7} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &348626020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348626018} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &348626021 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 348626018} - m_CullTransparentMesh: 1 --- !u!1 &350061027 GameObject: m_ObjectHideFlags: 0 @@ -7241,7 +6892,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -7300,82 +6951,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &366342485 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 366342486} - - component: {fileID: 366342488} - - component: {fileID: 366342487} - m_Layer: 5 - m_Name: pnlHealthBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &366342486 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 366342485} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 344823572} - m_Father: {fileID: 907876570} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.67} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &366342487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 366342485} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &366342488 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 366342485} - m_CullTransparentMesh: 1 --- !u!1 &379348953 GameObject: m_ObjectHideFlags: 0 @@ -7590,8 +7165,8 @@ RectTransform: - {fileID: 827291272} m_Father: {fileID: 536741947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -7908,7 +7483,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &395851980 RectTransform: m_ObjectHideFlags: 0 @@ -7941,7 +7516,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.15686275, g: 0.43137255, b: 0.5660378, a: 0.5882353} + m_Color: {r: 0.3529412, g: 0.47843137, b: 1, a: 0.49019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -8025,7 +7600,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -8441,78 +8016,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414601097} m_CullTransparentMesh: 1 ---- !u!1 &425026727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 425026728} - - component: {fileID: 425026730} - - component: {fileID: 425026729} - m_Layer: 5 - m_Name: imgAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &425026728 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 425026727} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1104803249} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.25} - m_AnchorMax: {x: 0.15, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &425026729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 425026727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &425026730 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 425026727} - m_CullTransparentMesh: 1 --- !u!1 &425590954 GameObject: m_ObjectHideFlags: 0 @@ -8573,7 +8076,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 10 m_FontStyle: 1 m_BestFit: 0 @@ -8730,7 +8233,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -8768,7 +8271,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &426763427 RectTransform: m_ObjectHideFlags: 0 @@ -8883,7 +8386,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -9001,7 +8504,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 1 m_BestFit: 0 @@ -9122,7 +8625,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -9280,7 +8783,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -9399,7 +8902,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -9457,10 +8960,10 @@ RectTransform: - {fileID: 536741947} - {fileID: 302144439} - {fileID: 1734587265} - m_Father: {fileID: 521488631} + m_Father: {fileID: 1726505616} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.15} - m_AnchorMax: {x: 1, y: 0.6} + m_AnchorMin: {x: 0.6, y: 0.3} + m_AnchorMax: {x: 1, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -9690,7 +9193,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -9771,7 +9274,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -10132,165 +9635,6 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &490426727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 490426728} - - component: {fileID: 490426730} - - component: {fileID: 490426729} - - component: {fileID: 490426731} - - component: {fileID: 490426732} - m_Layer: 5 - m_Name: txtIntelligenceDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &490426728 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490426727} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 640974227} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.9, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &490426729 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490426727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Intelligence affects your ranged damage ---- !u!222 &490426730 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490426727} - m_CullTransparentMesh: 1 ---- !u!114 &490426731 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490426727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 490426729} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!114 &490426732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 490426727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540857 - references: - version: 2 - RefIds: - - rid: 6167802955520540857 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 490426729} - m_TrackedProperties: - items: - - rid: 6167802955520540858 - m_UpdateType: 0 - - rid: 6167802955520540858 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 206616327352320 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &496796917 GameObject: m_ObjectHideFlags: 0 @@ -10474,7 +9818,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -11093,7 +10437,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -11192,85 +10536,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &521488630 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 521488631} - - component: {fileID: 521488633} - - component: {fileID: 521488632} - m_Layer: 5 - m_Name: CharacterInformation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &521488631 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521488630} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2093014399} - - {fileID: 463065573} - - {fileID: 234481276} - - {fileID: 907876570} - m_Father: {fileID: 1456932137} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.33, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &521488632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521488630} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &521488633 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 521488630} - m_CullTransparentMesh: 1 --- !u!1 &521900477 GameObject: m_ObjectHideFlags: 0 @@ -11330,7 +10595,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -11450,7 +10715,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -11542,7 +10807,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1489889203} - - {fileID: 559903353} - {fileID: 385703848} m_Father: {fileID: 463065573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11648,7 +10912,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -11863,165 +11127,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &559903352 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 559903353} - - component: {fileID: 559903355} - - component: {fileID: 559903354} - - component: {fileID: 559903356} - - component: {fileID: 559903357} - m_Layer: 5 - m_Name: txtHealthDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &559903353 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559903352} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 536741947} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.9, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &559903354 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559903352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Your max health ---- !u!222 &559903355 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559903352} - m_CullTransparentMesh: 1 ---- !u!114 &559903356 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559903352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 559903354} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!114 &559903357 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 559903352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540851 - references: - version: 2 - RefIds: - - rid: 6167802955520540851 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 559903354} - m_TrackedProperties: - items: - - rid: 6167802955520540852 - m_UpdateType: 0 - - rid: 6167802955520540852 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 206406628929536 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &562210391 GameObject: m_ObjectHideFlags: 0 @@ -12359,7 +11464,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -12637,7 +11742,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &583695243 RectTransform: m_ObjectHideFlags: 0 @@ -12832,7 +11937,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -12990,7 +12095,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -13082,7 +12187,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1254482166} - - {fileID: 490426728} - {fileID: 759472896} m_Father: {fileID: 463065573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13300,7 +12404,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -13419,7 +12523,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 50 m_FontStyle: 1 m_BestFit: 0 @@ -13551,7 +12655,6 @@ MonoBehaviour: information: {fileID: 814591215} fight: {fileID: 1156143264} message: {fileID: 1114695176} - charactersheet: {fileID: 521488630} deathscreen: {fileID: 1849127265} options: {fileID: 1225828336} pauseMenu: {fileID: 583695242} @@ -13611,10 +12714,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 302144439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.25, y: 1} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: -5, y: 0} + m_AnchorMin: {x: 0.3, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &662300491 MonoBehaviour: @@ -13637,14 +12740,14 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -13732,8 +12835,8 @@ RectTransform: - {fileID: 752602673} m_Father: {fileID: 302144439} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -14200,7 +13303,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -14299,82 +13402,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &695766831 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 695766832} - - component: {fileID: 695766834} - - component: {fileID: 695766833} - m_Layer: 5 - m_Name: pnlthird - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &695766832 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695766831} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1676542154} - m_Father: {fileID: 1531620867} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.3} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &695766833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695766831} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &695766834 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 695766831} - m_CullTransparentMesh: 1 --- !u!1 &695890917 GameObject: m_ObjectHideFlags: 0 @@ -14600,7 +13627,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -14701,7 +13728,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -14713,7 +13740,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Fenster + m_Text: Window --- !u!222 &709576934 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14798,7 +13825,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &718596642 RectTransform: m_ObjectHideFlags: 0 @@ -14918,7 +13945,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -14930,7 +13957,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Deutsch + m_Text: 800x600 --- !u!222 &722907595 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14997,7 +14024,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -15193,7 +14220,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 18 m_FontStyle: 1 m_BestFit: 0 @@ -15312,7 +14339,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -15401,7 +14428,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 18 m_FontStyle: 0 m_BestFit: 0 @@ -15551,7 +14578,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -15671,7 +14698,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -15913,8 +14940,8 @@ RectTransform: - {fileID: 403410781} m_Father: {fileID: 640974227} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -16046,165 +15073,6 @@ RectTransform: m_AnchoredPosition: {x: -5.7, y: -8.6} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &764729937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 764729938} - - component: {fileID: 764729940} - - component: {fileID: 764729939} - - component: {fileID: 764729941} - - component: {fileID: 764729942} - m_Layer: 5 - m_Name: txtStrengthDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &764729938 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 764729937} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1343558895} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.9, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &764729939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 764729937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Strength affects your melee damage ---- !u!222 &764729940 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 764729937} - m_CullTransparentMesh: 1 ---- !u!114 &764729941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 764729937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 764729939} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!114 &764729942 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 764729937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540897 - references: - version: 2 - RefIds: - - rid: 6167802955520540897 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 764729939} - m_TrackedProperties: - items: - - rid: 6167802955520540898 - m_UpdateType: 0 - - rid: 6167802955520540898 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 207681600876544 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &765112561 GameObject: m_ObjectHideFlags: 0 @@ -16354,7 +15222,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -16455,7 +15323,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -16594,7 +15462,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -16849,7 +15717,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -16970,7 +15838,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -17086,7 +15954,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &814591216 RectTransform: m_ObjectHideFlags: 0 @@ -17342,7 +16210,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -17692,7 +16560,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -17866,126 +16734,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 843930751} m_CullTransparentMesh: 1 ---- !u!1 &845819285 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 845819286} - - component: {fileID: 845819288} - - component: {fileID: 845819287} - - component: {fileID: 845819289} - m_Layer: 5 - m_Name: secondaryTextInformation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &845819286 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 845819285} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1369376444} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &845819287 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 845819285} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 18 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 100/100 ---- !u!222 &845819288 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 845819285} - m_CullTransparentMesh: 1 ---- !u!114 &845819289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 845819285} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 845819287} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] --- !u!1 &849425790 GameObject: m_ObjectHideFlags: 0 @@ -18178,7 +16926,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -18406,7 +17154,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 18 m_FontStyle: 1 m_BestFit: 0 @@ -18771,7 +17519,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -18930,7 +17678,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -19040,7 +17788,7 @@ GameObject: - component: {fileID: 881682940} - component: {fileID: 881682943} - component: {fileID: 881682942} - - component: {fileID: 881682941} + - component: {fileID: 881682944} m_Layer: 5 m_Name: btnMenu m_TagString: Untagged @@ -19068,33 +17816,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 320, y: 80} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &881682941 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881682939} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: cb116eb6b0a00b3498e75469e4a3ac7f, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!114 &881682942 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19135,7 +17856,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 881682941} + m_TargetGraphic: {fileID: 881682944} m_OnClick: m_PersistentCalls: m_Calls: @@ -19159,6 +17880,36 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 881682939} m_CullTransparentMesh: 1 +--- !u!114 &881682944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 881682939} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.047058824, g: 0.7294118, b: 0.7294118, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &889930219 GameObject: m_ObjectHideFlags: 0 @@ -19330,7 +18081,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -19576,84 +18327,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 904322912} m_CullTransparentMesh: 1 ---- !u!1 &907876569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 907876570} - - component: {fileID: 907876572} - - component: {fileID: 907876571} - m_Layer: 5 - m_Name: pnlBars - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &907876570 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 907876569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 366342486} - - {fileID: 1369376444} - - {fileID: 1869583329} - m_Father: {fileID: 521488631} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.15} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &907876571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 907876569} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &907876572 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 907876569} - m_CullTransparentMesh: 1 --- !u!1 &911282709 GameObject: m_ObjectHideFlags: 0 @@ -19713,7 +18386,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -19831,7 +18504,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -19892,78 +18565,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &924389841 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 924389842} - - component: {fileID: 924389844} - - component: {fileID: 924389843} - m_Layer: 5 - m_Name: imgAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &924389842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924389841} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1772745835} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.05, y: 0.25} - m_AnchorMax: {x: 0.15, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &924389843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924389841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &924389844 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 924389841} - m_CullTransparentMesh: 1 --- !u!1 &934724952 GameObject: m_ObjectHideFlags: 0 @@ -20098,7 +18699,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -20217,7 +18818,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -20298,7 +18899,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -20455,7 +19056,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -20675,7 +19276,7 @@ MonoBehaviour: m_GameObject: {fileID: 963194225} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0dafbb406c854e141ba4c7f354514063, type: 3} + m_Script: {fileID: 11500000, guid: ccf47fd0e7044a6f08a0f3353ee62cf5, type: 3} m_Name: m_EditorClassIdentifier: mouseSpeed: 1 @@ -20714,8 +19315,8 @@ RectTransform: - {fileID: 1454325476} m_Father: {fileID: 1692975129} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -20870,7 +19471,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -21245,8 +19846,8 @@ RectTransform: - {fileID: 1389413516} m_Father: {fileID: 1343558895} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -21529,7 +20130,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -21731,7 +20332,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -22123,7 +20724,7 @@ MonoBehaviour: m_GameObject: {fileID: 1031315366} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6eac15f641a82224c87a6ada5746d64b, type: 3} + m_Script: {fileID: 11500000, guid: ac07c553f4e010e8299fb870481dcc49, type: 3} m_Name: m_EditorClassIdentifier: speed: 5 @@ -22345,7 +20946,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -22484,7 +21085,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -22886,7 +21487,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -23120,7 +21721,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -23251,86 +21852,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000013261806} + m_AnchoredPosition: {x: 0, y: -0.000013113022} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} ---- !u!1 &1063798841 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1063798842} - - component: {fileID: 1063798844} - - component: {fileID: 1063798843} - m_Layer: 5 - m_Name: skill3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1063798842 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1063798841} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 34905204} - - {fileID: 1623671173} - m_Father: {fileID: 2093014399} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.25} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1063798843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1063798841} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1063798844 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1063798841} - m_CullTransparentMesh: 1 --- !u!1 &1103421610 GameObject: m_ObjectHideFlags: 0 @@ -23368,83 +21892,6 @@ RectTransform: m_AnchoredPosition: {x: -188.9, y: 55.6} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1104803248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1104803249} - - component: {fileID: 1104803251} - - component: {fileID: 1104803250} - m_Layer: 5 - m_Name: skill2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1104803249 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1104803248} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 425026728} - - {fileID: 1747046887} - m_Father: {fileID: 2093014399} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1104803250 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1104803248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1104803251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1104803248} - m_CullTransparentMesh: 1 --- !u!1 &1107266927 GameObject: m_ObjectHideFlags: 0 @@ -23505,7 +21952,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -23730,85 +22177,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108156891} m_CullTransparentMesh: 1 ---- !u!1 &1109855817 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1109855818} - - component: {fileID: 1109855820} - - component: {fileID: 1109855819} - m_Layer: 5 - m_Name: pnlfirst - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1109855818 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1109855817} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 315955576} - - {fileID: 1683122099} - - {fileID: 2102318180} - - {fileID: 1613559930} - m_Father: {fileID: 1531620867} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.7} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1109855819 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1109855817} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1109855820 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1109855817} - m_CullTransparentMesh: 1 --- !u!1 &1114695176 GameObject: m_ObjectHideFlags: 0 @@ -23827,7 +22195,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1114695177 RectTransform: m_ObjectHideFlags: 0 @@ -24223,7 +22591,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -24302,7 +22670,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -24455,7 +22823,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -24572,7 +22940,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1156143265 RectTransform: m_ObjectHideFlags: 0 @@ -24705,7 +23073,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -25095,7 +23463,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -25194,165 +23562,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &1175414483 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1175414484} - - component: {fileID: 1175414486} - - component: {fileID: 1175414487} - - component: {fileID: 1175414488} - - component: {fileID: 1175414489} - m_Layer: 5 - m_Name: txtHeaderSkills - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1175414484 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175414483} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2093014399} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.75} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1175414486 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175414483} - m_CullTransparentMesh: 1 ---- !u!114 &1175414487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175414483} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 25 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Skills ---- !u!114 &1175414488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175414483} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1175414487} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!114 &1175414489 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1175414483} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540847 - references: - version: 2 - RefIds: - - rid: 6167802955520540847 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1175414487} - m_TrackedProperties: - items: - - rid: 6167802955520540848 - m_UpdateType: 0 - - rid: 6167802955520540848 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 206329139163136 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1180432647 GameObject: m_ObjectHideFlags: 0 @@ -25802,165 +24011,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1189598339} m_CullTransparentMesh: 1 ---- !u!1 &1191020670 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1191020671} - - component: {fileID: 1191020673} - - component: {fileID: 1191020672} - - component: {fileID: 1191020674} - - component: {fileID: 1191020675} - m_Layer: 5 - m_Name: txtDexterityDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1191020671 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191020670} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1692975129} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.9, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1191020672 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191020670} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Dexterity affects your crit and dodge ---- !u!222 &1191020673 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191020670} - m_CullTransparentMesh: 1 ---- !u!114 &1191020674 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191020670} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1191020672} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!114 &1191020675 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1191020670} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540833 - references: - version: 2 - RefIds: - - rid: 6167802955520540833 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1191020672} - m_TrackedProperties: - items: - - rid: 6167802955520540834 - m_UpdateType: 0 - - rid: 6167802955520540834 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 206118551547904 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1194953329 GameObject: m_ObjectHideFlags: 0 @@ -26186,165 +24236,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1200449579} m_CullTransparentMesh: 1 ---- !u!1 &1202590054 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1202590055} - - component: {fileID: 1202590057} - - component: {fileID: 1202590056} - - component: {fileID: 1202590058} - - component: {fileID: 1202590059} - m_Layer: 5 - m_Name: txtSecondaryDesc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1202590055 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1202590054} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 302144439} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.9, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1202590056 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1202590054} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Your max Mana ---- !u!222 &1202590057 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1202590054} - m_CullTransparentMesh: 1 ---- !u!114 &1202590058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1202590054} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1202590056} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] ---- !u!114 &1202590059 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1202590054} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540889 - references: - version: 2 - RefIds: - - rid: 6167802955520540889 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1202590056} - m_TrackedProperties: - items: - - rid: 6167802955520540890 - m_UpdateType: 0 - - rid: 6167802955520540890 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 207507411431424 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1209078834 GameObject: m_ObjectHideFlags: 0 @@ -26404,7 +24295,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 18 m_FontStyle: 1 m_BestFit: 0 @@ -26702,7 +24593,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -26780,7 +24671,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1225828337 RectTransform: m_ObjectHideFlags: 0 @@ -27025,10 +24916,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 640974227} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.25, y: 1} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: -5, y: 0} + m_AnchorMin: {x: 0.3, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1254482167 MonoBehaviour: @@ -27051,14 +24942,14 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -27359,7 +25250,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -27538,7 +25429,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 25 m_FontStyle: 1 m_BestFit: 0 @@ -27688,7 +25579,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 1 m_BestFit: 0 @@ -28314,7 +26205,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 345934874} - - {fileID: 764729938} - {fileID: 1001334160} m_Father: {fileID: 463065573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28858,7 +26748,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 10 m_FontStyle: 1 m_BestFit: 0 @@ -29068,82 +26958,6 @@ MonoBehaviour: m_DefaultActionMap: b9ea94f5-de8b-40ea-b099-4aee58784866 m_SplitScreenIndex: -1 m_Camera: {fileID: 0} ---- !u!1 &1369376443 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1369376444} - - component: {fileID: 1369376446} - - component: {fileID: 1369376445} - m_Layer: 5 - m_Name: pnlSecondaryBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1369376444 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1369376443} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 845819286} - m_Father: {fileID: 907876570} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.33} - m_AnchorMax: {x: 1, y: 0.67} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1369376445 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1369376443} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9764706, g: 1, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1369376446 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1369376443} - m_CullTransparentMesh: 1 --- !u!1 &1371538864 GameObject: m_ObjectHideFlags: 0 @@ -29204,7 +27018,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 @@ -29442,7 +27256,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -29773,7 +27587,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -30053,7 +27867,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -30132,7 +27946,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -30213,7 +28027,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -30525,7 +28339,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -30685,7 +28499,6 @@ RectTransform: - {fileID: 1156143265} - {fileID: 1114695177} - {fileID: 1601343528} - - {fileID: 521488631} - {fileID: 1225828337} - {fileID: 583695243} - {fileID: 1568120507} @@ -30798,7 +28611,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -30993,7 +28806,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 1 m_BestFit: 0 @@ -31125,10 +28938,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 536741947} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.25, y: 1} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: -5, y: 0} + m_AnchorMin: {x: 0.3, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1489889204 MonoBehaviour: @@ -31151,14 +28964,14 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -31355,7 +29168,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -31515,7 +29328,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -31527,7 +29340,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Inventory + m_Text: Name (Lvl. 0) --- !u!222 &1506995522 CanvasRenderer: m_ObjectHideFlags: 0 @@ -31631,7 +29444,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1509962781 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31828,7 +29641,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -31948,7 +29761,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 1 m_BestFit: 0 @@ -32009,84 +29822,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1531620866 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1531620867} - - component: {fileID: 1531620869} - - component: {fileID: 1531620868} - m_Layer: 5 - m_Name: pnlEquip - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1531620867 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531620866} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1109855818} - - {fileID: 348626019} - - {fileID: 695766832} - m_Father: {fileID: 1726505616} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.3} - m_AnchorMax: {x: 1, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1531620868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531620866} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1531620869 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1531620866} - m_CullTransparentMesh: 1 --- !u!1 &1546101235 GameObject: m_ObjectHideFlags: 0 @@ -32147,7 +29882,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 26 m_FontStyle: 0 m_BestFit: 0 @@ -32640,7 +30375,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1568120507 RectTransform: m_ObjectHideFlags: 0 @@ -32777,7 +30512,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -32842,11 +30577,11 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 348626019} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: place - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -32862,23 +30597,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.y - value: 0.9 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.y @@ -32902,19 +30637,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchoredPosition.x - value: -15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchoredPosition.y @@ -32935,7 +30670,7 @@ PrefabInstance: - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Navigation.m_SelectOnUp value: - objectReference: {fileID: 1683122102} + objectReference: {fileID: 0} - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Colors.m_SelectedColor.b value: 1 @@ -33086,7 +30821,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -33318,7 +31053,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1601343528 RectTransform: m_ObjectHideFlags: 0 @@ -33439,7 +31174,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -33543,11 +31278,11 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1109855818} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: place - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -33563,19 +31298,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} + propertyPath: m_AnchorMax.y + value: 0.95 + objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0.175 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x @@ -33583,7 +31318,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalPosition.x @@ -33769,7 +31504,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -33830,126 +31565,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!1 &1623671172 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1623671173} - - component: {fileID: 1623671175} - - component: {fileID: 1623671174} - - component: {fileID: 1623671176} - m_Layer: 5 - m_Name: descAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1623671173 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623671172} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1063798842} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1623671174 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623671172} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Description ---- !u!222 &1623671175 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623671172} - m_CullTransparentMesh: 1 ---- !u!114 &1623671176 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1623671172} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1623671174} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] --- !u!1 &1625554084 GameObject: m_ObjectHideFlags: 0 @@ -34009,7 +31624,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -34284,7 +31899,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -34571,7 +32186,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -34763,7 +32378,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -34949,11 +32564,11 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 695766832} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: place - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -34969,19 +32584,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 0.575 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.y - value: 0.9 + value: 0.35 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0.425 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0.1 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x @@ -35009,15 +32624,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchoredPosition.x @@ -35097,179 +32712,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1683122098 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1109855818} - m_Modifications: - - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: place - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchorMax.x - value: 0.925 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchorMax.y - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchorMin.x - value: 0.775 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchorMin.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6141205227167828802, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Texture - value: - objectReference: {fileID: 2800000, guid: 4ae569f6fd302ed4e9d803c2b173469b, type: 3} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 1683122100} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Navigation.m_SelectOnUp - value: - objectReference: {fileID: 1450469889} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Colors.m_SelectedColor.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Colors.m_SelectedColor.g - value: 0.8117647 - objectReference: {fileID: 0} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Colors.m_SelectedColor.r - value: 0.53333336 - objectReference: {fileID: 0} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Navigation.m_SelectOnDown - value: - objectReference: {fileID: 1572612348} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Navigation.m_SelectOnLeft - value: - objectReference: {fileID: 315955578} - - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Navigation.m_SelectOnRight - value: - objectReference: {fileID: 2102318183} - - target: {fileID: 7287345907462116809, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - propertyPath: m_Name - value: equipShoulders - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} ---- !u!224 &1683122099 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - m_PrefabInstance: {fileID: 1683122098} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1683122100 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6141205227167828802, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - m_PrefabInstance: {fileID: 1683122098} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683122101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1683122101 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7287345907462116809, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - m_PrefabInstance: {fileID: 1683122098} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1683122102 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} - m_PrefabInstance: {fileID: 1683122098} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683122101} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1688605759 GameObject: m_ObjectHideFlags: 0 @@ -35330,7 +32772,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 10 m_FontStyle: 1 m_BestFit: 0 @@ -35535,7 +32977,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1880390755} - - {fileID: 1191020671} - {fileID: 977259934} m_Father: {fileID: 463065573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -35718,7 +33159,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -35920,126 +33361,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1704468104} m_CullTransparentMesh: 1 ---- !u!1 &1706182897 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1706182898} - - component: {fileID: 1706182900} - - component: {fileID: 1706182899} - - component: {fileID: 1706182901} - m_Layer: 5 - m_Name: descAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1706182898 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706182897} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1772745835} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1706182899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706182897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Description ---- !u!222 &1706182900 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706182897} - m_CullTransparentMesh: 1 ---- !u!114 &1706182901 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1706182897} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1706182899} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] --- !u!1 &1706844939 GameObject: m_ObjectHideFlags: 0 @@ -36188,7 +33509,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1506995520} - - {fileID: 1531620867} + - {fileID: 463065573} + - {fileID: 321256367} - {fileID: 1396595621} - {fileID: 253189947} - {fileID: 47926085} @@ -36213,7 +33535,6 @@ MonoBehaviour: m_EditorClassIdentifier: head: {fileID: 315955577} chest: {fileID: 1747491083} - shoulders: {fileID: 1683122101} feet: {fileID: 1676542155} ring: {fileID: 2102318182} amulet: {fileID: 1613559932} @@ -36359,137 +33680,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734587264} m_CullTransparentMesh: 1 ---- !u!1 &1747046886 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1747046887} - - component: {fileID: 1747046889} - - component: {fileID: 1747046888} - - component: {fileID: 1747046890} - m_Layer: 5 - m_Name: descAction - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1747046887 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747046886} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1104803249} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1747046888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747046886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Description ---- !u!222 &1747046889 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747046886} - m_CullTransparentMesh: 1 ---- !u!114 &1747046890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747046886} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} - m_Name: - m_EditorClassIdentifier: - m_StringReference: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 0 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_FormatArguments: [] - m_UpdateString: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1747046888} - m_TargetAssemblyTypeName: UnityEngine.UI.Text, UnityEngine.UI - m_MethodName: set_text - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 1 - references: - version: 2 - RefIds: [] --- !u!1001 &1747491081 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 348626019} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: place - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -36505,19 +33706,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 0.575 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.y - value: 0.9 + value: 0.55 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0.425 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0.1 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x @@ -36545,15 +33746,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchoredPosition.x @@ -36746,83 +33947,6 @@ RectTransform: m_AnchoredPosition: {x: -70, y: 40} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1772745834 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1772745835} - - component: {fileID: 1772745837} - - component: {fileID: 1772745836} - m_Layer: 5 - m_Name: skill1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1772745835 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772745834} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 924389842} - - {fileID: 1706182898} - m_Father: {fileID: 2093014399} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1772745836 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772745834} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1772745837 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772745834} - m_CullTransparentMesh: 1 --- !u!1001 &1779370831 PrefabInstance: m_ObjectHideFlags: 0 @@ -37415,7 +34539,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -37829,7 +34953,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -37945,7 +35069,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1849127266 RectTransform: m_ObjectHideFlags: 0 @@ -38063,7 +35187,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -38675,81 +35799,6 @@ RectTransform: m_AnchoredPosition: {x: -70, y: -20} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1869583328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1869583329} - - component: {fileID: 1869583331} - - component: {fileID: 1869583330} - m_Layer: 5 - m_Name: pnlExperience - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1869583329 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1869583328} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 907876570} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.33} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1869583330 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1869583328} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 1, b: 0, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1869583331 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1869583328} - m_CullTransparentMesh: 1 --- !u!1 &1869728886 GameObject: m_ObjectHideFlags: 0 @@ -39115,10 +36164,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1692975129} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.25, y: 1} - m_AnchoredPosition: {x: 2.5, y: 0} - m_SizeDelta: {x: -5, y: 0} + m_AnchorMin: {x: 0.3, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1880390756 MonoBehaviour: @@ -39141,14 +36190,14 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 3 - m_AlignByGeometry: 0 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -39775,7 +36824,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -40407,7 +37456,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -40687,7 +37736,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 20 m_FontStyle: 1 m_BestFit: 0 @@ -40934,7 +37983,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2038188362 RectTransform: m_ObjectHideFlags: 0 @@ -41273,7 +38322,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -41626,7 +38675,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -41799,96 +38848,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2091395100} m_CullTransparentMesh: 1 ---- !u!1 &2093014398 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2093014399} - - component: {fileID: 2093014401} - - component: {fileID: 2093014400} - m_Layer: 5 - m_Name: pnlSkills - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2093014399 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2093014398} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1175414484} - - {fileID: 1772745835} - - {fileID: 1104803249} - - {fileID: 1063798842} - m_Father: {fileID: 521488631} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.6} - m_AnchorMax: {x: 1, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2093014400 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2093014398} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2093014401 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2093014398} - m_CullTransparentMesh: 1 --- !u!1001 &2102318179 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1109855818} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: place - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -41904,19 +38874,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 0.125 + value: 0.4 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.95 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0.05 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x @@ -41924,7 +38894,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.y - value: -50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalPosition.x @@ -42005,7 +38975,7 @@ PrefabInstance: - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Navigation.m_SelectOnLeft value: - objectReference: {fileID: 1683122102} + objectReference: {fileID: 0} - target: {fileID: 6848317083609613261, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Navigation.m_SelectOnRight value: @@ -42110,7 +39080,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -42230,7 +39200,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 15 m_FontStyle: 0 m_BestFit: 0 @@ -42297,11 +39267,11 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 348626019} + m_TransformParent: {fileID: 321256367} m_Modifications: - target: {fileID: 1023590545195096446, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: place - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_Pivot.x @@ -42317,23 +39287,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.x - value: 0.25 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMax.y - value: 0.9 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchorMin.y - value: 0.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.x - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_SizeDelta.y @@ -42357,19 +39327,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchoredPosition.x - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3948338302074099163, guid: 782a647126384df6d91a2f4be5c2cd39, type: 3} propertyPath: m_AnchoredPosition.y @@ -42579,7 +39549,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 0a7ec5c..1636343 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -219,7 +219,6 @@ RectTransform: - {fileID: 948072317} - {fileID: 562613875} m_Father: {fileID: 789034260} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.75} m_AnchorMax: {x: 1, y: 0.8} @@ -257,7 +256,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1607593441} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -337,7 +335,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1952286085} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -377,7 +374,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Easy + m_Text: Einfach --- !u!222 &22113748 CanvasRenderer: m_ObjectHideFlags: 0 @@ -417,7 +414,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.1} m_AnchorMax: {x: 0.3, y: 0.2} @@ -500,7 +496,6 @@ RectTransform: - {fileID: 1333783826} - {fileID: 1314582267} m_Father: {fileID: 1606028808} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -607,7 +602,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2095452659} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.9} m_AnchorMax: {x: 1, y: 1} @@ -744,7 +738,6 @@ RectTransform: - {fileID: 1178159208} - {fileID: 558632069} m_Father: {fileID: 1908443825} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -819,7 +812,6 @@ RectTransform: m_Children: - {fileID: 1915505197} m_Father: {fileID: 1733743093} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -859,7 +851,6 @@ RectTransform: m_Children: - {fileID: 390410419} m_Father: {fileID: 1732877456} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -985,7 +976,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1102,7 +1092,6 @@ RectTransform: m_Children: - {fileID: 568981640} m_Father: {fileID: 1406457438} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1140,7 +1129,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 571541734} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1219,7 +1207,6 @@ RectTransform: m_Children: - {fileID: 1678906663} m_Father: {fileID: 1303451073} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1257,7 +1244,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2000620022} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1332,13 +1318,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121498046} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2110460591} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &121498048 AudioSource: @@ -1458,9 +1444,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1519,7 +1513,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2093776663} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.55} m_AnchorMax: {x: 0.5, y: 0.65} @@ -1638,7 +1631,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1375575131} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 1, y: 0.9} @@ -1756,7 +1748,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1375575131} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.3} m_AnchorMax: {x: 1, y: 0.4} @@ -1837,7 +1828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1955,7 +1945,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447210029} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2033,7 +2022,6 @@ RectTransform: m_Children: - {fileID: 631667743} m_Father: {fileID: 2095452659} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.55, y: 0} m_AnchorMax: {x: 0.7, y: 0.1} @@ -2162,7 +2150,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 357148658} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2243,7 +2230,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481292146} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.85} m_AnchorMax: {x: 1, y: 1} @@ -2363,7 +2349,6 @@ RectTransform: - {fileID: 738844483} - {fileID: 1524619899} m_Father: {fileID: 70214463} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.8} m_AnchorMax: {x: 1, y: 0.85} @@ -2453,7 +2438,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 743820208} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2571,7 +2555,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 626233084} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -2647,7 +2630,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 511624018} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.1} @@ -2728,7 +2710,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1049670406} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2847,7 +2828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 0.2, y: 0.85} @@ -2971,7 +2951,6 @@ RectTransform: - {fileID: 1606028808} - {fileID: 1639408948} m_Father: {fileID: 1908443825} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3047,7 +3026,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1541851306} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3127,7 +3105,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1689106542} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3203,7 +3180,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1282469739} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3283,7 +3259,6 @@ RectTransform: - {fileID: 1933959769} - {fileID: 808042027} m_Father: {fileID: 1908443825} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3359,7 +3334,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2000620022} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3435,7 +3409,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.3} m_AnchorMax: {x: 0.3, y: 0.4} @@ -3516,7 +3489,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2093776663} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.65} m_AnchorMax: {x: 0.5, y: 0.75} @@ -3634,7 +3606,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1057592198} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3714,7 +3685,6 @@ RectTransform: - {fileID: 876724631} - {fileID: 472252535} m_Father: {fileID: 808042027} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3754,7 +3724,6 @@ RectTransform: m_Children: - {fileID: 1020237091} m_Father: {fileID: 978564505} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3845,7 +3814,6 @@ RectTransform: - {fileID: 1279141933} - {fileID: 1037823510} m_Father: {fileID: 1020237091} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -3931,7 +3899,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1080302694} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -4007,7 +3974,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 789034260} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.9} m_AnchorMax: {x: 1, y: 1} @@ -4087,7 +4053,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.2} m_AnchorMax: {x: 0.3, y: 0.3} @@ -4212,7 +4177,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4233,7 +4200,6 @@ RectTransform: - {fileID: 2095452659} - {fileID: 1481292146} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4273,7 +4239,6 @@ RectTransform: m_Children: - {fileID: 1777008552} m_Father: {fileID: 1296262505} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4363,7 +4328,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1122914073} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4486,13 +4450,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356515705} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 509.7981, y: 518.5044, z: -14.710571} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &357148657 GameObject: @@ -4525,7 +4489,6 @@ RectTransform: - {fileID: 2036489879} - {fileID: 179122597} m_Father: {fileID: 808042027} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4562,7 +4525,6 @@ RectTransform: m_Children: - {fileID: 1745437622} m_Father: {fileID: 1407244340} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4600,7 +4562,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1025440990} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4640,7 +4601,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Warrior + m_Text: Krieger --- !u!222 &385059081 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4682,7 +4643,6 @@ RectTransform: m_Children: - {fileID: 1663897018} m_Father: {fileID: 1412671055} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4770,7 +4730,6 @@ RectTransform: m_Children: - {fileID: 1998753032} m_Father: {fileID: 79433396} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4808,7 +4767,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.55, y: 0.2} m_AnchorMax: {x: 0.65, y: 0.3} @@ -4888,7 +4846,6 @@ RectTransform: - {fileID: 1169197491} - {fileID: 888346189} m_Father: {fileID: 1503566205} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4926,7 +4883,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1116739009} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5006,7 +4962,6 @@ RectTransform: - {fileID: 2136018648} - {fileID: 1566073912} m_Father: {fileID: 1503566205} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5043,7 +4998,6 @@ RectTransform: m_Children: - {fileID: 708846149} m_Father: {fileID: 1933959769} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -5083,7 +5037,6 @@ RectTransform: - {fileID: 173092795} - {fileID: 536468373} m_Father: {fileID: 1777008552} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -5169,7 +5122,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 948072317} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5245,7 +5197,6 @@ RectTransform: - {fileID: 1273900703} - {fileID: 1408877839} m_Father: {fileID: 1503566205} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5283,7 +5234,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 259177620} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5368,7 +5318,6 @@ RectTransform: - {fileID: 743820208} - {fileID: 1049670406} m_Father: {fileID: 343734138} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5445,7 +5394,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 775828414} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5564,7 +5512,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.35, y: 0.2} m_AnchorMax: {x: 0.55, y: 0.3} @@ -5681,7 +5628,6 @@ RectTransform: m_Children: - {fileID: 668547646} m_Father: {fileID: 1754062990} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5720,7 +5666,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.55, y: 0.3} m_AnchorMax: {x: 0.65, y: 0.4} @@ -5842,7 +5787,6 @@ RectTransform: - {fileID: 1352126355} - {fileID: 191530884} m_Father: {fileID: 1908443825} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5918,7 +5862,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447210029} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5998,7 +5941,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.9, y: 0.2} m_AnchorMax: {x: 1, y: 0.3} @@ -6077,7 +6019,6 @@ RectTransform: m_Children: - {fileID: 828738886} m_Father: {fileID: 4879576} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6116,7 +6057,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.35, y: 0.3} m_AnchorMax: {x: 0.55, y: 0.4} @@ -6234,7 +6174,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 91454220} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -6309,7 +6248,6 @@ RectTransform: m_Children: - {fileID: 1437304201} m_Father: {fileID: 1863100583} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6347,7 +6285,6 @@ RectTransform: - {fileID: 1409991941} - {fileID: 99039409} m_Father: {fileID: 1503566205} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6388,7 +6325,6 @@ RectTransform: - {fileID: 1743768777} - {fileID: 1754062990} m_Father: {fileID: 1352126355} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -6495,7 +6431,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 226838294} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.9} m_AnchorMax: {x: 1, y: 1} @@ -6614,7 +6549,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.3} m_AnchorMax: {x: 0.2, y: 0.4} @@ -6731,7 +6665,6 @@ RectTransform: m_Children: - {fileID: 189535027} m_Father: {fileID: 1314582267} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6770,7 +6703,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 173416686} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6888,7 +6820,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 502891375} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -6965,7 +6896,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1375575131} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.6} @@ -7091,13 +7021,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 686373972} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 988.9791, y: 593.6523, z: 182.7135} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &708846148 GameObject: @@ -7130,7 +7060,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 413978206} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7206,7 +7135,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1075697054} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -7282,7 +7210,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1213272956} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7357,7 +7284,6 @@ RectTransform: m_Children: - {fileID: 2105233007} m_Father: {fileID: 180478762} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -7396,7 +7322,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.7, y: 0.3} m_AnchorMax: {x: 0.9, y: 0.4} @@ -7514,7 +7439,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1025440990} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -7592,7 +7516,6 @@ RectTransform: m_Children: - {fileID: 185642657} m_Father: {fileID: 474550037} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.4} m_AnchorMax: {x: 0.6, y: 0.5} @@ -7763,7 +7686,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1075697054} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7801,7 +7723,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1606028808} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -7878,7 +7799,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 511624018} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.9} m_AnchorMax: {x: 1, y: 1} @@ -7996,7 +7916,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1184714963} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8074,7 +7993,6 @@ RectTransform: m_Children: - {fileID: 485234880} m_Father: {fileID: 1654183377} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0} m_AnchorMax: {x: 0.6, y: 1} @@ -8206,7 +8124,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 180478762} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -8281,7 +8198,6 @@ RectTransform: m_Children: - {fileID: 1075697054} m_Father: {fileID: 1333783826} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -8325,7 +8241,6 @@ RectTransform: - {fileID: 1733743093} - {fileID: 1198474441} m_Father: {fileID: 1908443825} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8401,7 +8316,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1057592198} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8485,7 +8399,6 @@ RectTransform: - {fileID: 1160954763} - {fileID: 259177620} m_Father: {fileID: 226838294} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.8} @@ -8525,7 +8438,6 @@ RectTransform: m_Children: - {fileID: 1478187749} m_Father: {fileID: 2095452659} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.3, y: 0} m_AnchorMax: {x: 0.45, y: 0.1} @@ -8654,7 +8566,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1872442994} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8734,7 +8645,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 562613875} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8810,7 +8720,6 @@ RectTransform: - {fileID: 1884487213} - {fileID: 1556071042} m_Father: {fileID: 1503566205} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8848,7 +8757,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1282469739} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8928,7 +8836,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1872442994} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9008,7 +8915,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1125514045} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9081,7 +8987,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1524619899} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -9157,7 +9062,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 259177620} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9233,7 +9137,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402617516} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9313,7 +9216,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1576919390} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9389,7 +9291,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1328692213} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9429,7 +9330,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Small (5 cities) + m_Text: "Klein (5 St\xE4dte)" --- !u!222 &929276014 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9470,7 +9371,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 511624018} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 0.5, y: 0.9} @@ -9588,7 +9488,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1681093452} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -9663,7 +9562,6 @@ RectTransform: m_Children: - {fileID: 448265627} m_Father: {fileID: 4879576} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -9701,7 +9599,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1733743093} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -9778,7 +9675,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1609529337} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9899,7 +9795,6 @@ RectTransform: - {fileID: 280416298} - {fileID: 1406457438} m_Father: {fileID: 1681093452} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -10029,13 +9924,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990713965} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &990713969 MonoBehaviour: @@ -10080,7 +9975,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481292146} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.9, y: 0} m_AnchorMax: {x: 1, y: 0.25} @@ -10152,7 +10046,6 @@ RectTransform: m_Children: - {fileID: 291364282} m_Father: {fileID: 280416298} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -10190,7 +10083,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1213272956} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10275,7 +10167,6 @@ RectTransform: - {fileID: 742904849} - {fileID: 1576126407} m_Father: {fileID: 2093776663} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.65} m_AnchorMax: {x: 1, y: 0.75} @@ -10490,7 +10381,6 @@ RectTransform: m_Children: - {fileID: 2143622650} m_Father: {fileID: 1576126407} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10579,7 +10469,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 291364282} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10660,7 +10549,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203031339} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 0.5, y: 0.9} @@ -10780,7 +10668,6 @@ RectTransform: m_Children: - {fileID: 196244595} m_Father: {fileID: 474550037} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.3} m_AnchorMax: {x: 0.6, y: 0.4} @@ -10910,7 +10797,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203031339} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.7} m_AnchorMax: {x: 0.5, y: 0.8} @@ -11030,7 +10916,6 @@ RectTransform: m_Children: - {fileID: 2030987685} m_Father: {fileID: 1654183377} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.8, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11164,7 +11049,6 @@ RectTransform: - {fileID: 1631426620} - {fileID: 257639232} m_Father: {fileID: 1788767713} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -11251,7 +11135,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2008818877} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11369,7 +11252,6 @@ RectTransform: - {fileID: 1874585706} - {fileID: 1597925788} m_Father: {fileID: 808042027} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11407,7 +11289,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1883359432} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11485,7 +11366,6 @@ RectTransform: - {fileID: 732839799} - {fileID: 770626596} m_Father: {fileID: 779311419} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -11572,7 +11452,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2093776663} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.35} m_AnchorMax: {x: 0.5, y: 0.45} @@ -11692,7 +11571,6 @@ RectTransform: - {fileID: 307528003} - {fileID: 1793422842} m_Father: {fileID: 1246495662} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -11778,7 +11656,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 474550037} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.8} m_AnchorMax: {x: 0.8, y: 1} @@ -11858,7 +11735,6 @@ RectTransform: - {fileID: 1314239990} - {fileID: 409070329} m_Father: {fileID: 808042027} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11898,7 +11774,6 @@ RectTransform: m_Children: - {fileID: 352876182} m_Father: {fileID: 1481292146} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.55, y: 0} m_AnchorMax: {x: 0.75, y: 0.1} @@ -12029,7 +11904,6 @@ RectTransform: m_Children: - {fileID: 851916011} m_Father: {fileID: 2093776663} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12158,7 +12032,6 @@ RectTransform: - {fileID: 2143678614} - {fileID: 1405906731} m_Father: {fileID: 808042027} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12196,7 +12069,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.9, y: 0.3} m_AnchorMax: {x: 1, y: 0.4} @@ -12276,7 +12148,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402617516} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12353,7 +12224,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.7, y: 0.2} m_AnchorMax: {x: 0.9, y: 0.3} @@ -12470,7 +12340,6 @@ RectTransform: m_Children: - {fileID: 774715019} m_Father: {fileID: 1933959769} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12508,7 +12377,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2030419180} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12588,7 +12456,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 789034260} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.1} @@ -12668,7 +12535,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 808042027} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.75, y: 1} @@ -12741,7 +12607,6 @@ RectTransform: - {fileID: 734589419} - {fileID: 1021962918} m_Father: {fileID: 808042027} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12792,13 +12657,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1222323148} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1217.8605, y: 407.45404, z: -105.65576} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1225249782 GameObject: @@ -12831,7 +12696,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1352126355} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12871,7 +12735,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: German + m_Text: Deutsch --- !u!222 &1225249785 CanvasRenderer: m_ObjectHideFlags: 0 @@ -12910,7 +12774,6 @@ RectTransform: m_Children: - {fileID: 1080302694} m_Father: {fileID: 1400375815} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -12949,7 +12812,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1375575131} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.4} m_AnchorMax: {x: 1, y: 0.5} @@ -13067,7 +12929,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 465057034} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13143,7 +13004,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 291364282} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -13219,7 +13079,6 @@ RectTransform: - {fileID: 211534040} - {fileID: 841511756} m_Father: {fileID: 1503566205} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13260,7 +13119,6 @@ RectTransform: - {fileID: 347842748} - {fileID: 1407244340} m_Father: {fileID: 1952286085} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -13368,7 +13226,6 @@ RectTransform: m_Children: - {fileID: 103026019} m_Father: {fileID: 1576126407} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13494,7 +13351,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13613,7 +13469,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13760,13 +13615,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311414695} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1314239989 GameObject: @@ -13799,7 +13654,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1116739009} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13877,7 +13731,6 @@ RectTransform: m_Children: - {fileID: 626233084} m_Father: {fileID: 31142782} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14003,7 +13856,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 789034260} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 1, y: 0.9} @@ -14121,7 +13973,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1751253812} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14206,7 +14057,6 @@ RectTransform: - {fileID: 1619728939} - {fileID: 1412671055} m_Father: {fileID: 2093776663} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.35} m_AnchorMax: {x: 1, y: 0.45} @@ -14423,7 +14273,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1681093452} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14463,7 +14312,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Human + m_Text: Mensch --- !u!222 &1332405179 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14505,7 +14354,6 @@ RectTransform: m_Children: - {fileID: 779311419} m_Father: {fileID: 31142782} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14598,7 +14446,6 @@ RectTransform: - {fileID: 1654183377} - {fileID: 1908443825} m_Father: {fileID: 2095452659} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.1} m_AnchorMax: {x: 1, y: 0.9} @@ -14730,7 +14577,6 @@ RectTransform: - {fileID: 1357862247} - {fileID: 587820858} m_Father: {fileID: 511624018} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.8} m_AnchorMax: {x: 1, y: 0.9} @@ -14941,7 +14787,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481292146} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.1, y: 0.3} @@ -15014,7 +14859,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1352126355} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -15091,7 +14935,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2093776663} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.45} m_AnchorMax: {x: 0.5, y: 0.55} @@ -15210,7 +15053,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2093776663} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.75} m_AnchorMax: {x: 0.5, y: 0.85} @@ -15334,7 +15176,6 @@ RectTransform: - {fileID: 1262821116} - {fileID: 157667577} m_Father: {fileID: 1481292146} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.75, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15410,7 +15251,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1751253812} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15486,7 +15326,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1080302694} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15564,7 +15403,6 @@ RectTransform: m_Children: - {fileID: 1246495662} m_Father: {fileID: 1732877456} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15653,7 +15491,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1160954763} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15735,7 +15572,6 @@ RectTransform: m_Children: - {fileID: 91454220} m_Father: {fileID: 978564505} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15862,7 +15698,6 @@ RectTransform: m_Children: - {fileID: 370360900} m_Father: {fileID: 1296262505} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15987,7 +15822,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 465057034} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16067,7 +15901,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 571541734} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16146,7 +15979,6 @@ RectTransform: - {fileID: 385963018} - {fileID: 1863100583} m_Father: {fileID: 1328692213} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -16253,7 +16085,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16371,7 +16202,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1576919390} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16451,7 +16281,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1481292146} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0} m_AnchorMax: {x: 0.5, y: 0.2} @@ -16524,7 +16353,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 569324669} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -16600,7 +16428,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 343734138} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16673,7 +16500,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203031339} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.9} m_AnchorMax: {x: 1, y: 1} @@ -16754,7 +16580,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 813310407} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16873,7 +16698,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 226838294} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 0.2, y: 0.85} @@ -16999,7 +16823,6 @@ RectTransform: - {fileID: 1122914073} - {fileID: 2008818877} m_Father: {fileID: 343734138} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17075,7 +16898,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2096649044} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17169,7 +16991,6 @@ RectTransform: - {fileID: 1308603275} - {fileID: 89371453} m_Father: {fileID: 808042027} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.75, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17206,7 +17027,6 @@ RectTransform: m_Children: - {fileID: 862335136} m_Father: {fileID: 180478762} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17246,7 +17066,6 @@ RectTransform: m_Children: - {fileID: 205373052} m_Father: {fileID: 474550037} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.6} m_AnchorMax: {x: 0.6, y: 0.7} @@ -17377,7 +17196,6 @@ RectTransform: m_Children: - {fileID: 2067052853} m_Father: {fileID: 474550037} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.5} m_AnchorMax: {x: 0.6, y: 0.6} @@ -17506,7 +17324,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 837682318} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17586,7 +17403,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2051303419} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -17662,7 +17478,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 412429456} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17743,7 +17558,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.9} m_AnchorMax: {x: 1, y: 1} @@ -17864,7 +17678,6 @@ RectTransform: - {fileID: 1027740130} - {fileID: 1303451073} m_Father: {fileID: 1025440990} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -17970,7 +17783,6 @@ RectTransform: - {fileID: 914395126} - {fileID: 1430500585} m_Father: {fileID: 808042027} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -18007,7 +17819,6 @@ RectTransform: m_Children: - {fileID: 1966409090} m_Father: {fileID: 1733743093} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18045,7 +17856,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1068170324} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18125,7 +17935,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1933959769} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -18265,7 +18074,6 @@ RectTransform: - {fileID: 773601863} - {fileID: 31142782} m_Father: {fileID: 203031339} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.7} m_AnchorMax: {x: 1, y: 0.8} @@ -18409,7 +18217,6 @@ RectTransform: m_Children: - {fileID: 11371924} m_Father: {fileID: 1654183377} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.2, y: 1} @@ -18543,7 +18350,6 @@ RectTransform: m_Children: - {fileID: 975801771} m_Father: {fileID: 1654183377} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.6, y: 0} m_AnchorMax: {x: 0.8, y: 1} @@ -18676,7 +18482,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1375575131} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.7} m_AnchorMax: {x: 1, y: 0.8} @@ -18794,7 +18599,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1328692213} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -18870,7 +18674,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1057592198} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -18946,7 +18749,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.35, y: 0.1} m_AnchorMax: {x: 0.55, y: 0.2} @@ -19026,7 +18828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203031339} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.1} @@ -19111,7 +18912,6 @@ RectTransform: - {fileID: 1609529337} - {fileID: 1054569277} m_Father: {fileID: 1348951833} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.95} m_AnchorMax: {x: 1, y: 1} @@ -19187,7 +18987,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2000620022} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19262,7 +19061,6 @@ RectTransform: m_Children: - {fileID: 1689106542} m_Father: {fileID: 385963018} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -19300,7 +19098,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 103026019} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -19381,7 +19178,6 @@ RectTransform: - {fileID: 945560697} - {fileID: 978564505} m_Father: {fileID: 2093776663} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.55} m_AnchorMax: {x: 1, y: 0.65} @@ -19628,7 +19424,6 @@ RectTransform: - {fileID: 209171931} - {fileID: 2012669914} m_Father: {fileID: 1663897018} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -19715,7 +19510,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.2} m_AnchorMax: {x: 0.2, y: 0.3} @@ -19834,7 +19628,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -19955,7 +19748,6 @@ RectTransform: - {fileID: 1400375815} - {fileID: 79433396} m_Father: {fileID: 2051303419} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -20126,7 +19918,6 @@ RectTransform: - {fileID: 73433045} - {fileID: 1580422957} m_Father: {fileID: 789034260} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.6} m_AnchorMax: {x: 1, y: 0.65} @@ -20166,7 +19957,6 @@ RectTransform: m_Children: - {fileID: 1788767713} m_Father: {fileID: 587820858} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20255,7 +20045,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 370360900} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -20332,7 +20121,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1375575131} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.6} m_AnchorMax: {x: 1, y: 0.7} @@ -20450,7 +20238,6 @@ RectTransform: - {fileID: 1388469548} - {fileID: 1326325874} m_Father: {fileID: 1503566205} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20490,7 +20277,6 @@ RectTransform: m_Children: - {fileID: 502891375} m_Father: {fileID: 587820858} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20614,7 +20400,6 @@ RectTransform: m_Children: - {fileID: 447210029} m_Father: {fileID: 347842748} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -20651,7 +20436,6 @@ RectTransform: m_Children: - {fileID: 1057592198} m_Father: {fileID: 1743768777} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -20731,7 +20515,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2051303419} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20811,7 +20594,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1080302694} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20850,7 +20632,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 789034260} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.65} m_AnchorMax: {x: 1, y: 0.75} @@ -20968,7 +20749,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1883359432} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21048,7 +20828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 447210029} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21124,7 +20903,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.55, y: 0.1} m_AnchorMax: {x: 0.65, y: 0.2} @@ -21206,7 +20984,6 @@ RectTransform: m_Children: - {fileID: 569324669} m_Father: {fileID: 1412671055} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21334,7 +21111,6 @@ RectTransform: - {fileID: 845733262} - {fileID: 818643949} m_Father: {fileID: 2093776663} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.75} m_AnchorMax: {x: 1, y: 0.85} @@ -21478,7 +21254,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1068170324} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21554,7 +21329,6 @@ RectTransform: - {fileID: 1074366480} - {fileID: 1826047680} m_Father: {fileID: 808042027} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -21592,7 +21366,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 837682318} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21668,7 +21441,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1075697054} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21744,7 +21516,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1689106542} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21820,7 +21591,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1952286085} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -21897,7 +21667,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 70214463} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.1} m_AnchorMax: {x: 0.2, y: 0.2} @@ -22020,7 +21789,6 @@ RectTransform: - {fileID: 70214463} - {fileID: 226838294} m_Father: {fileID: 1348951833} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.95} @@ -22096,7 +21864,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 73433045} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -22165,13 +21932,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1920075166} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 979.87616, y: 591.80164, z: 3.668579} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1920075168 MonoBehaviour: @@ -22218,7 +21985,6 @@ RectTransform: - {fileID: 413978206} - {fileID: 1184714963} m_Father: {fileID: 226838294} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0.8} m_AnchorMax: {x: 1, y: 0.85} @@ -22312,13 +22078,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1945274720} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 678.9425, y: 466.58844, z: 262.63525} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1952286084 GameObject: @@ -22356,7 +22122,6 @@ RectTransform: - {fileID: 1903724201} - {fileID: 1296262505} m_Father: {fileID: 2093776663} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.45} m_AnchorMax: {x: 1, y: 0.55} @@ -22577,7 +22342,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Window + m_Text: Fenster --- !u!222 &1955851823 CanvasRenderer: m_ObjectHideFlags: 0 @@ -22599,7 +22364,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1606028808} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -22637,7 +22401,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1580422957} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -22713,7 +22476,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 390410419} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -22791,7 +22553,6 @@ RectTransform: - {fileID: 240859586} - {fileID: 114646975} m_Father: {fileID: 2143622650} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -22879,7 +22640,6 @@ RectTransform: m_Children: - {fileID: 1061296375} m_Father: {fileID: 1481292146} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.25, y: 0} m_AnchorMax: {x: 0.45, y: 0.1} @@ -23008,7 +22768,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1689106542} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23089,7 +22848,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -23207,7 +22965,6 @@ RectTransform: - {fileID: 2074436735} - {fileID: 1195112082} m_Father: {fileID: 1503566205} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -23246,7 +23003,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1054569277} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23364,7 +23120,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 357148658} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23503,7 +23258,6 @@ RectTransform: - {fileID: 1559755824} - {fileID: 1732877456} m_Father: {fileID: 203031339} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.8} m_AnchorMax: {x: 1, y: 0.9} @@ -23580,7 +23334,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1554744550} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23698,7 +23451,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2030419180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23774,7 +23526,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4879576} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -23861,7 +23612,6 @@ RectTransform: - {fileID: 1328692213} - {fileID: 1125514045} m_Father: {fileID: 1481292146} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.75, y: 1} @@ -23941,7 +23691,6 @@ RectTransform: - {fileID: 813310407} - {fileID: 173416686} m_Father: {fileID: 343734138} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24019,7 +23768,6 @@ RectTransform: m_Children: - {fileID: 1485614862} m_Father: {fileID: 1654183377} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.2, y: 0} m_AnchorMax: {x: 0.4, y: 1} @@ -24151,7 +23899,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 738844483} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -24321,7 +24068,7 @@ MonoBehaviour: m_GameObject: {fileID: 2110460584} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6eac15f641a82224c87a6ada5746d64b, type: 3} + m_Script: {fileID: 11500000, guid: ac07c553f4e010e8299fb870481dcc49, type: 3} m_Name: m_EditorClassIdentifier: speed: 5 @@ -24382,6 +24129,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2110460584} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -24389,7 +24137,6 @@ Transform: m_Children: - {fileID: 121498047} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2119913928 GameObject: @@ -24422,7 +24169,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 291364282} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24498,7 +24244,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 412429456} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24575,7 +24320,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1503566205} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -24692,7 +24436,6 @@ RectTransform: m_Children: - {fileID: 2000620022} m_Father: {fileID: 1027740130} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -24730,7 +24473,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1160954763} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24775,3 +24517,16 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143678613} m_CullTransparentMesh: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2110460591} + - {fileID: 343734138} + - {fileID: 1945274722} + - {fileID: 686373974} + - {fileID: 1222323150} + - {fileID: 1920075167} + - {fileID: 1311414698} + - {fileID: 356515707} + - {fileID: 990713968} diff --git a/Assets/Scripts/Chest.cs b/Assets/Scripts/Chest.cs index b9d5658..a9784b9 100644 --- a/Assets/Scripts/Chest.cs +++ b/Assets/Scripts/Chest.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using System; +using Assets.Scripts.Player; namespace Assets.Scripts { @@ -29,7 +30,7 @@ namespace Assets.Scripts { gameObject.transform.parent.Find("Lid").GetComponent().Play("ChestOpen"); Item item; - int luck = GameObject.Find("Player").GetComponent().getStats()[11]; + int luck = GameObject.Find("Player").GetComponent().getPlayerStat("Luck").getAmount(); int type = new System.Random().Next(3); switch (type) { diff --git a/Assets/Scripts/Classes/BasicClass.cs b/Assets/Scripts/Classes/BasicClass.cs index 7a64669..358e200 100644 --- a/Assets/Scripts/Classes/BasicClass.cs +++ b/Assets/Scripts/Classes/BasicClass.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Classes { @@ -25,7 +26,7 @@ namespace Assets.Scripts.Classes secondaryBonus = 0; } - public void applyBonus(Player player) + public void applyBonus(PlayerObject player) { player.changeStats(strengthBonus, healthBonus, dexterityBonus, intelligenceBonus, secondaryBonus); } diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index 30033fc..184d6f3 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -5,6 +5,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.UI; +using Assets.Scripts.Player; public class Controls : MonoBehaviour { @@ -61,7 +62,7 @@ public class Controls : MonoBehaviour if(uihandler.state != UIState.GAME && playerInput.currentActionMap.name != "Menu"){ playerInput.SwitchCurrentActionMap("Menu"); } - if (!player.GetComponent().takeDamage(0)) + if (!player.GetComponent().takeDamage(0)) { if (!uihandler.isPlayerInFight()) { @@ -73,13 +74,13 @@ public class Controls : MonoBehaviour } public void FixedUpdate(){ - if (!player.GetComponent().takeDamage(0)) + if (!player.GetComponent().takeDamage(0)) { if (!uihandler.isPlayerInFight()) { if (uihandler.canPlayerMove()) { - player.GetComponent().move(input); + player.GetComponent().move(input); } } } @@ -163,10 +164,6 @@ public class Controls : MonoBehaviour } } - public void OnCharsheet(){ - uihandler.switchCharactersheet(); - } - public void OnInventory(){ uihandler.switchInventory(); } diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 72f376a..e8cb7b3 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -1,4 +1,5 @@ using Assets.Scripts; +using Assets.Scripts.Player; using Assets.Scripts.Slimes; using Newtonsoft.Json.Linq; using System.Collections; @@ -61,7 +62,7 @@ namespace Assets.Scripts } } - public void scaleEnemy(Player player) + public void scaleEnemy(PlayerGameObject player) { if (slime == null) { diff --git a/Assets/Scripts/Fight.cs b/Assets/Scripts/Fight.cs index a2561b1..b7edb63 100644 --- a/Assets/Scripts/Fight.cs +++ b/Assets/Scripts/Fight.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +using Assets.Scripts.Player; public class Fight : MonoBehaviour { @@ -18,7 +19,7 @@ public class Fight : MonoBehaviour this.tile = tile; this.enemy = enemy; this.player = player; - enemy.GetComponent().scaleEnemy(player.GetComponent()); + enemy.GetComponent().scaleEnemy(player.GetComponent()); enemy.transform.rotation = Quaternion.Euler(0,GameObject.Find("Main Camera").transform.rotation.y + 180f,0); uihandler = GameObject.Find("UIHandler").GetComponent(); @@ -46,7 +47,7 @@ public class Fight : MonoBehaviour //User waits break; case 3: - playerDamage = player.GetComponent().calculateDamage(); + playerDamage = player.GetComponent().calculateDamage(); break; case 4: skillnumber = 0; @@ -60,10 +61,10 @@ public class Fight : MonoBehaviour } if (skillnumber != -1) { - playerDamage = player.GetComponent().castSkill(skillnumber); + playerDamage = player.GetComponent().castSkill(skillnumber); } - player.GetComponent().reduceCooldown(skillnumber); - player.GetComponent().regainSecondary(); + player.GetComponent().reduceCooldown(skillnumber); + player.GetComponent().regainSecondary(); bool isDead = enemy.GetComponent().takeDamage(playerDamage); if (isDead) { @@ -73,8 +74,8 @@ public class Fight : MonoBehaviour } endFight(); tile.GetComponent().enemyKilled(enemy); - player.GetComponent().enemyKilled(); - player.GetComponent().gainExperience(enemy.GetComponent().getExperience()); + player.GetComponent().enemyKilled(); + player.GetComponent().gainExperience(enemy.GetComponent().getExperience()); GameObject.Find("Inventory").GetComponent().addItem(enemy.GetComponent().getItem()); GameObject.Find("QuestLog").GetComponent().updateQuests("kill", enemy, 1); } @@ -110,7 +111,7 @@ public class Fight : MonoBehaviour break; } - if (player.GetComponent().takeDamage(enemyDamage)) + if (player.GetComponent().takeDamage(enemyDamage)) { SteamWorksHandler.getStandardAchievement("DeathAchievement"); uihandler.showDeathScreen(); diff --git a/Assets/Scripts/Handler/ButtonHandler.cs b/Assets/Scripts/Handler/ButtonHandler.cs index 80a9f98..79a0e90 100644 --- a/Assets/Scripts/Handler/ButtonHandler.cs +++ b/Assets/Scripts/Handler/ButtonHandler.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using Assets.Scripts.Player; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -9,7 +10,7 @@ namespace Assets.Scripts public class ButtonHandler : MonoBehaviour { UIHandler uihandler; - Player player; + PlayerGameObject player; AudioHandler audioHandler; WorldGenerator worldGenerator; GameObject fight; @@ -17,7 +18,7 @@ namespace Assets.Scripts private void Start() { uihandler = GameObject.Find("UIHandler").GetComponent(); - player = GameObject.Find("Player").GetComponent(); + player = GameObject.Find("Player").GetComponent(); worldGenerator = GameObject.Find("WorldGenerator").GetComponent(); audioHandler = GameObject.Find("AudioHandler").GetComponent(); fight = GameObject.Find("Fight"); @@ -98,12 +99,6 @@ namespace Assets.Scripts uihandler.startGame(); } - public void switchCharactersheet() - { - audioHandler.playButtonClick(); - uihandler.switchCharactersheet(); - } - public void switchQuestlog() { audioHandler.playButtonClick(); diff --git a/Assets/Scripts/Handler/EasterEggHandler.cs b/Assets/Scripts/Handler/EasterEggHandler.cs index 0a3447f..1ed3fee 100644 --- a/Assets/Scripts/Handler/EasterEggHandler.cs +++ b/Assets/Scripts/Handler/EasterEggHandler.cs @@ -1,4 +1,5 @@ -using Steamworks; +using Assets.Scripts.Player; +using Steamworks; using System; using System.Collections.Generic; using System.Linq; @@ -10,7 +11,7 @@ namespace Assets.Scripts { class EasterEggHandler { - public static void applyEasterEgg(Player player) + public static void applyEasterEgg(PlayerObject player) { if (player.getPlayerName().ToLower().Length > 0) { @@ -18,10 +19,10 @@ namespace Assets.Scripts } } - private static void applyNameEasterEgg(Player player) + private static void applyNameEasterEgg(PlayerObject player) { //maxHealth, maxSecondary, strength, dexterity, intelligence - int[] result = new int[5]; + /*int[] result = new int[5]; int[] stats = player.getStats(); switch (player.getPlayerName().ToLower()) { @@ -62,10 +63,12 @@ namespace Assets.Scripts result[4] = stats[6]; break; } - player.setStats(result); + player.setStats(result);*/ + + //TODO FIX whole Easteregg mechanic to go with the new player } - public static bool isGodMode(Player player) + public static bool isGodMode(PlayerObject player) { bool result = false; if (player != null) diff --git a/Assets/Scripts/Handler/FileHandler.cs b/Assets/Scripts/Handler/FileHandler.cs index ad58e54..b6dc138 100644 --- a/Assets/Scripts/Handler/FileHandler.cs +++ b/Assets/Scripts/Handler/FileHandler.cs @@ -9,6 +9,7 @@ using UnityEngine.UI; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using UnityEngine.Localization.Settings; +using Assets.Scripts.Player; namespace Assets.Scripts { @@ -24,7 +25,7 @@ namespace Assets.Scripts sw.Close(); } - public static void loadGame(Player player, WorldGenerator worldGenerator, Inventory inventory, QuestLog questLog) + public static void loadGame(PlayerGameObject player, WorldGenerator worldGenerator, Inventory inventory, QuestLog questLog) { if (hasSaveFile()) { diff --git a/Assets/Scripts/Handler/SteamWorksHandler.cs b/Assets/Scripts/Handler/SteamWorksHandler.cs index 6aa214d..6c2b2c2 100644 --- a/Assets/Scripts/Handler/SteamWorksHandler.cs +++ b/Assets/Scripts/Handler/SteamWorksHandler.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using Steamworks; using Assets.Scripts; +using Assets.Scripts.Player; public class SteamWorksHandler : MonoBehaviour { @@ -97,7 +98,7 @@ public class SteamWorksHandler : MonoBehaviour private static bool isGodMode() { - return EasterEggHandler.isGodMode(GameObject.Find("Player").GetComponent()); + return EasterEggHandler.isGodMode(GameObject.Find("Player").GetComponent().getPlayer()); } public static void getItemAchievement(Item item) diff --git a/Assets/Scripts/Handler/TooltipHandler.cs b/Assets/Scripts/Handler/TooltipHandler.cs index fa4c248..fb191a5 100644 --- a/Assets/Scripts/Handler/TooltipHandler.cs +++ b/Assets/Scripts/Handler/TooltipHandler.cs @@ -3,19 +3,20 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; +using Assets.Scripts.Player; namespace Assets.Scripts { public class TooltipHandler : MonoBehaviour { public GameObject tooltip; - Player player; + PlayerGameObject player; UIHandler uihandler; // Start is called before the first frame update void Start() { - player = GameObject.Find("Player").GetComponent(); + player = GameObject.Find("Player").GetComponent(); uihandler = GameObject.Find("UIHandler").GetComponent(); } diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs index 4d5f405..8f4e1fd 100644 --- a/Assets/Scripts/Handler/UIHandler.cs +++ b/Assets/Scripts/Handler/UIHandler.cs @@ -1,4 +1,5 @@ using Assets.Scripts.Classes; +using Assets.Scripts.Player; using Assets.Scripts.Races; using System.Collections; using System.Collections.Generic; @@ -15,7 +16,6 @@ namespace Assets.Scripts public GameObject information; public GameObject fight; public GameObject message; - public GameObject charactersheet; public GameObject deathscreen; public GameObject options; public GameObject pauseMenu; @@ -33,6 +33,7 @@ namespace Assets.Scripts void Start() { FileHandler.loadOptions(true); + GameObject.Find("Player").GetComponent().getPlayerStat("Killcount").changeAmount(1); } // Update is called once per frame @@ -75,7 +76,7 @@ namespace Assets.Scripts private void updatePlayerHUD() { - updateHUD(GameObject.Find("Player").GetComponent()); + updateHUD(GameObject.Find("Player").GetComponent()); } public bool canPlayerMove() @@ -110,18 +111,6 @@ namespace Assets.Scripts EventSystem.current.SetSelectedGameObject(GameObject.Find("btnCloseTutorial")); } - public void switchCharactersheet() - { - if (state == UIState.CHARACTER) - { - closeCharactersheet(); - } - else - { - openCharactersheet(); - } - } - public void openOptions() { FileHandler.loadOptionDisplay(); @@ -137,22 +126,6 @@ namespace Assets.Scripts openPauseMenu(); } - public void openCharactersheet() - { - hideOtherElements(charactersheet); - state = UIState.CHARACTER; - if(GameObject.Find("btnStrengthIncrease").transform.localScale != new Vector3(0,0,0)){ - EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStrengthIncrease")); - } - } - - public void closeCharactersheet() - { - charactersheet.transform.localScale = new Vector3(0, 0, 0); - showHUD(); - state = UIState.GAME; - } - public void switchInventory() { if (state == UIState.INVENTORY) @@ -373,38 +346,36 @@ namespace Assets.Scripts public void updateFightInterface(GameObject enemy, GameObject player) { - updateFightInterfacePlayer(player); + updateFightInterfacePlayer(player.GetComponent()); updateFightInterfaceEnemy(enemy); - updateFightInterfaceActions(player); + updateFightInterfaceActions(player.GetComponent()); GameObject.Find("txtRounds").GetComponent().text = (int.Parse(GameObject.Find("txtRounds").GetComponent().text) + 1).ToString(); } - private void updateFightInterfaceActions(GameObject player) + private void updateFightInterfaceActions(PlayerGameObject player) { GameObject actionFour = GameObject.Find("btnActionFour"); GameObject actionFive = GameObject.Find("btnActionFive"); GameObject actionSix = GameObject.Find("btnActionSix"); - player.GetComponent().displayAction(0, actionFour.transform.Find("imgAction").gameObject, actionFour.transform.Find("descAction").gameObject); - player.GetComponent().displayAction(1, actionFive.transform.Find("imgAction").gameObject, actionFive.transform.Find("descAction").gameObject); - player.GetComponent().displayAction(2, actionSix.transform.Find("imgAction").gameObject, actionSix.transform.Find("descAction").gameObject); + player.displayAction(0, actionFour.transform.Find("imgAction").gameObject, actionFour.transform.Find("descAction").gameObject); + player.displayAction(1, actionFive.transform.Find("imgAction").gameObject, actionFive.transform.Find("descAction").gameObject); + player.displayAction(2, actionSix.transform.Find("imgAction").gameObject, actionSix.transform.Find("descAction").gameObject); } - private void updateFightInterfacePlayer(GameObject player) + private void updateFightInterfacePlayer(PlayerGameObject player) { - // { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence }; - int[] playerStats = player.GetComponent().getStats(); Dictionary equipment = inventory.GetComponent().getEquipmentBonus(); GameObject foreground = GameObject.Find("healthForegroundPlayer"); GameObject background = GameObject.Find("healthBackgroundPlayer"); GameObject text = GameObject.Find("healthTextPlayer"); - updateBar(foreground, background, text, playerStats[1] + equipment["HP"], playerStats[0]); + updateBar(foreground, background, text, player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"], player.getPlayerStat("Health").getAmount()); foreground = GameObject.Find("secondaryForegroundPlayer"); background = GameObject.Find("secondaryBackgroundPlayer"); text = GameObject.Find("secondaryTextPlayer"); - updateBar(foreground, background, text, playerStats[3] + equipment["MP"], playerStats[2]); + updateBar(foreground, background, text, player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"], player.getPlayerStat("Secondary").getAmount()); } private void updateFightInterfaceEnemy(GameObject enemy) @@ -423,24 +394,22 @@ namespace Assets.Scripts updateBar(foreground, background, text, enemyStats[3], enemyStats[2]); } - public void adjustInformation(Player player) + public void adjustInformation(PlayerGameObject player) { - // { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points}; - int[] playerStats = player.GetComponent().getStats(); Dictionary equipment = inventory.GetComponent().getEquipmentBonus(); - GameObject.Find("txtStrength").GetComponent().text = "STR: " + playerStats[4] + " (+" + equipment["STR"] + ")"; - GameObject.Find("txtDexterity").GetComponent().text = "DEX: " + playerStats[5] + " (+" + equipment["DEX"] + ")"; - GameObject.Find("txtIntelligence").GetComponent().text = "INT: " + playerStats[6] + " (+" + equipment["INT"] + ")"; - GameObject.Find("txtHealth").GetComponent().text = TextHandler.getText("health") + " " + playerStats[1] + " (+" + equipment["HP"] + ")"; - GameObject.Find("txtSecondary").GetComponent().text = "Mana: " + playerStats[3] + " (+" + equipment["MP"] + ")"; + GameObject.Find("txtStrength").GetComponent().text = "STR: " + player.getPlayerStat("Strength").getAmount() + " (+" + equipment["STR"] + ")"; + GameObject.Find("txtDexterity").GetComponent().text = "DEX: " + player.getPlayerStat("Dexterity").getAmount() + " (+" + equipment["DEX"] + ")"; + GameObject.Find("txtIntelligence").GetComponent().text = "INT: " + player.getPlayerStat("Intelligence").getAmount() + " (+" + equipment["INT"] + ")"; + GameObject.Find("txtHealth").GetComponent().text = TextHandler.getText("health") + " " + player.getPlayerStat("Health").getAmount() + " (+" + equipment["HP"] + ")"; + GameObject.Find("txtSecondary").GetComponent().text = "Mana: " + player.getPlayerStat("Secondary").getAmount() + " (+" + equipment["MP"] + ")"; - updateHealthUI(playerStats[0], playerStats[1] + equipment["HP"]); - updateSecondaryUI(playerStats[2], playerStats[3] + equipment["MP"]); - updateExperienceUI(playerStats[8], playerStats[9]); + updateHealthUI(player.getPlayerStat("Health").getAmount(), player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"]); + updateSecondaryUI(player.getPlayerStat("Secondary").getAmount(), player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"]); + updateExperienceUI(player.getPlayerStat("Experience").getAmount(), player.getPlayerStat("MaxExperience").getAmount()); player.updateName(GameObject.Find("txtName").GetComponent()); - updatePoints(playerStats[10]); + updatePoints(player.getPlayerStat("Points").getAmount()); player.displaySkills(GameObject.Find("pnlSkills")); } @@ -496,20 +465,18 @@ namespace Assets.Scripts updateFill(fill, null, maxExperience, experience); } - public void updateHUD(Player player) + public void updateHUD(PlayerGameObject player) { - // { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience}; - int[] playerStats = player.GetComponent().getStats(); Dictionary equipment = inventory.GetComponent().getEquipmentBonus(); GameObject information = GameObject.Find("txtInformationHUD"); player.updateNameHUD(information.GetComponent()); GameObject fill = GameObject.Find("HUD_healthFill"); - updateFill(fill, null, playerStats[1] + equipment["HP"], playerStats[0]); + updateFill(fill, null, player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"], player.getPlayerStat("Health").getAmount()); fill = GameObject.Find("HUD_secondaryFill"); - updateFill(fill, null, playerStats[3] + equipment["MP"], playerStats[2]); + updateFill(fill, null, player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"], player.getPlayerStat("Secondary").getAmount()); } public void updateBar(GameObject bar, GameObject barBackground, GameObject textField, int maxValue, int minValue) @@ -552,15 +519,14 @@ namespace Assets.Scripts if (PlayerPrefs.GetInt("isLoad") == 0) { GameObject.Find("WorldGenerator").GetComponent().resetGame(PlayerPrefs.GetInt("cityAmount")); - GameObject.Find("Player").GetComponent().generatePlayer(); - GameObject.Find("Player").GetComponent().finishPlayerCreation(); + GameObject.Find("Player").GetComponent().generatePlayer(); hideOtherElements(introduction); state = UIState.INTRODUCTION; EventSystem.current.SetSelectedGameObject(GameObject.Find("btnClose")); } else { - FileHandler.loadGame(GameObject.Find("Player").GetComponent(), GameObject.Find("WorldGenerator").GetComponent(), GameObject.Find("Inventory").GetComponent(), GameObject.Find("QuestLog").GetComponent()); + FileHandler.loadGame(GameObject.Find("Player").GetComponent(), GameObject.Find("WorldGenerator").GetComponent(), GameObject.Find("Inventory").GetComponent(), GameObject.Find("QuestLog").GetComponent()); hideOtherElements(introduction); introduction.transform.localScale = new Vector3(0, 0, 0); tutorial.transform.localScale = new Vector3(0,0,0); diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index 134d8b0..4950b0a 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -12,7 +12,6 @@ namespace Assets.Scripts { public GameObject head; public GameObject chest; - public GameObject shoulders; public GameObject feet; public GameObject ring; public GameObject amulet; @@ -135,7 +134,7 @@ namespace Assets.Scripts { GameObject slot = head; Item item; - for (int i = 0; i < 8; i++) + for (int i = 0; i < 7; i++) { switch (i) { @@ -155,12 +154,9 @@ namespace Assets.Scripts slot = feet; break; case 5: - slot = shoulders; - break; - case 6: slot = chest; break; - case 7: + case 6: slot = ring; break; } @@ -196,7 +192,7 @@ namespace Assets.Scripts { createStatBoost(); GameObject equip = head; - for (int i = 0; i < 8; i++) + for (int i = 0; i < 7; i++) { switch (i) { @@ -216,12 +212,9 @@ namespace Assets.Scripts equip = feet; break; case 5: - equip = shoulders; - break; - case 6: equip = chest; break; - case 7: + case 6: equip = ring; break; } @@ -240,7 +233,7 @@ namespace Assets.Scripts GameObject equip = head; string slotname = ""; result = result + "\"equipment\": {\r\n"; - for (int i = 0; i < 8; i++) + for (int i = 0; i < 7; i++) { switch (i) { @@ -265,14 +258,10 @@ namespace Assets.Scripts slotname = "feet"; break; case 5: - equip = shoulders; - slotname = "shoulders"; - break; - case 6: equip = chest; slotname = "chest"; break; - case 7: + case 6: equip = ring; slotname = "ring"; break; @@ -337,7 +326,7 @@ namespace Assets.Scripts { GameObject equip = head; string slotname = ""; - for (int i = 0; i < 8; i++) + for (int i = 0; i < 7; i++) { switch (i) { @@ -362,14 +351,10 @@ namespace Assets.Scripts slotname = "feet"; break; case 5: - equip = shoulders; - slotname = "shoulders"; - break; - case 6: equip = chest; slotname = "chest"; break; - case 7: + case 6: equip = ring; slotname = "ring"; break; @@ -407,9 +392,6 @@ namespace Assets.Scripts case ItemPlace.HELMET: equipSlot = head.GetComponent(); break; - case ItemPlace.SHOULDER: - equipSlot = shoulders.GetComponent(); - break; case ItemPlace.BOOTS: equipSlot = feet.GetComponent(); break; diff --git a/Assets/Scripts/InventorySlot.cs b/Assets/Scripts/InventorySlot.cs index d9c4e6b..0952ba6 100644 --- a/Assets/Scripts/InventorySlot.cs +++ b/Assets/Scripts/InventorySlot.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.Player; using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; @@ -139,10 +140,11 @@ namespace Assets.Scripts switch (place) { case ItemPlace.LEFTHAND: - image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_LeftHand"); + Debug.Log(GameObject.Find("Player").GetComponent().getClass().classname); + image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_LeftHand"); break; case ItemPlace.RIGHTHAND: - image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_RightHand"); + image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_RightHand"); break; case ItemPlace.HELMET: image = Resources.Load("Equipment/Inv_Helmet"); @@ -150,9 +152,6 @@ namespace Assets.Scripts case ItemPlace.BOOTS: image = Resources.Load("Equipment/Inv_Boots"); break; - case ItemPlace.SHOULDER: - image = Resources.Load("Equipment/Inv_Shoulders"); - break; case ItemPlace.AMULET: image = Resources.Load("Equipment/Inv_Amulet"); break; @@ -195,6 +194,9 @@ namespace Assets.Scripts } else { + if(equip == null){ + return result; + } result = result + equip.saveGame(); } return result; diff --git a/Assets/Scripts/Items/Equipment.cs b/Assets/Scripts/Items/Equipment.cs index 3482ce2..5cc7d25 100644 --- a/Assets/Scripts/Items/Equipment.cs +++ b/Assets/Scripts/Items/Equipment.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.Player; using Newtonsoft.Json.Linq; using System; using System.Collections; @@ -82,7 +83,7 @@ namespace Assets.Scripts string replacement = ""; if (place == ItemPlace.LEFTHAND) { - switch (GameObject.Find("Player").GetComponent().getClass().classname) + switch (GameObject.Find("Player").GetComponent().getClass().classname) { case "Warrior": replacement = "Greatshield"; @@ -97,7 +98,7 @@ namespace Assets.Scripts } else if (place == ItemPlace.RIGHTHAND) { - switch (GameObject.Find("Player").GetComponent().getClass().classname) + switch (GameObject.Find("Player").GetComponent().getClass().classname) { case "Warrior": replacement = "Sword"; @@ -275,10 +276,10 @@ namespace Assets.Scripts switch (place) { case ItemPlace.LEFTHAND: - image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_LeftHand"); + image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_LeftHand"); break; case ItemPlace.RIGHTHAND: - image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_RightHand"); + image = Resources.Load("Equipment/" + GameObject.Find("Player").GetComponent().getClass().classname + "/Inv_RightHand"); break; case ItemPlace.HELMET: image = Resources.Load("Equipment/Inv_Helmet"); @@ -286,9 +287,6 @@ namespace Assets.Scripts case ItemPlace.BOOTS: image = Resources.Load("Equipment/Inv_Boots"); break; - case ItemPlace.SHOULDER: - image = Resources.Load("Equipment/Inv_Shoulders"); - break; case ItemPlace.AMULET: image = Resources.Load("Equipment/Inv_Amulet"); break; diff --git a/Assets/Scripts/Items/ItemPlace.cs b/Assets/Scripts/Items/ItemPlace.cs index d2d7922..dc215f8 100644 --- a/Assets/Scripts/Items/ItemPlace.cs +++ b/Assets/Scripts/Items/ItemPlace.cs @@ -9,7 +9,6 @@ namespace Assets.Scripts public enum ItemPlace { HELMET, - SHOULDER, RIGHTHAND, LEFTHAND, RING, diff --git a/Assets/Scripts/Menu/UIHandlerMenu.cs b/Assets/Scripts/Menu/UIHandlerMenu.cs index 580a917..bcd5cca 100644 --- a/Assets/Scripts/Menu/UIHandlerMenu.cs +++ b/Assets/Scripts/Menu/UIHandlerMenu.cs @@ -1,4 +1,5 @@ using Assets.Scripts.Classes; +using Assets.Scripts.Player; using Assets.Scripts.Races; using System.Collections; using System.Collections.Generic; @@ -91,7 +92,7 @@ namespace Assets.Scripts.Menu playerRace = new GiantRace(); break; } - GameObject.Find("Player").GetComponent().generatePlayer(playerRace, playerClass, name, GameObject.Find("dropDifficulty").GetComponent().value); + GameObject.Find("Player").GetComponent().generatePlayer(playerRace, playerClass, name, GameObject.Find("dropDifficulty").GetComponent().value); } public void openCharacterCreation() @@ -192,13 +193,13 @@ namespace Assets.Scripts.Menu setPlayerInformation(); // health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points - int[] playerstats = GameObject.Find("Player").GetComponent().getStats(); + PlayerGameObject player = GameObject.Find("Player").GetComponent(); - GameObject.Find("txtStrength_Creation").GetComponent().text = TextHandler.getText("strength") + " " + playerstats[4]; - GameObject.Find("txtDexterity_Creation").GetComponent().text = TextHandler.getText("dexterity") + " " + playerstats[5]; - GameObject.Find("txtIntelligence_Creation").GetComponent().text = TextHandler.getText("intelligence") + " " + playerstats[6]; - GameObject.Find("txtHealth_Creation").GetComponent().text = TextHandler.getText("health") + " " + playerstats[1]; - GameObject.Find("txtSecondary_Creation").GetComponent().text = "Mana: " + playerstats[3]; + GameObject.Find("txtStrength_Creation").GetComponent().text = TextHandler.getText("strength") + " " + player.getPlayerStat("Strength").getAmount(); + GameObject.Find("txtDexterity_Creation").GetComponent().text = TextHandler.getText("dexterity") + " " + player.getPlayerStat("Dexterity").getAmount(); + GameObject.Find("txtIntelligence_Creation").GetComponent().text = TextHandler.getText("intelligence") + " " + player.getPlayerStat("Intelligence").getAmount(); + GameObject.Find("txtHealth_Creation").GetComponent().text = TextHandler.getText("health") + " " + player.getPlayerStat("MaxHealth").getAmount(); + GameObject.Find("txtSecondary_Creation").GetComponent().text = "Mana: " + player.getPlayerStat("MaxSecondary").getAmount(); } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs deleted file mode 100644 index 44aaab3..0000000 --- a/Assets/Scripts/Player.cs +++ /dev/null @@ -1,731 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UnityEngine; -using UnityEngine.UI; -using Assets.Scripts.Classes; -using Assets.Scripts.Races; -using Newtonsoft.Json.Linq; -using UnityEngine.InputSystem; - -namespace Assets.Scripts -{ - public class Player : MonoBehaviour - { - public float speed = 5f; - System.Random rand = new System.Random(); - DateTime now; - UIHandler uihandler; - AudioHandler audioHandler; - WorldGenerator worldGenerator; - int bobbingDirection = -1; - - string playername; - int health; - int maxHealth; - int maxSecondary; - int secondary; - int strength; - int dexterity; - int intelligence; - int level; - int luck; - int experience; - int maxExperience; - int healthRegen; - int secondaryRegen; - BasicRace race; - BasicClass role; - BasicSkill[] skills = new BasicSkill[3]; - int points = 0; - bool isDodging = false; - DateTime jumpTimer; - - int killcount = -1; - int difficulty = 0; - Dictionary equipment; - bool finishedGame = false; - - - - private void OnEnable() - { -#if UNITY_EDITOR - SceneHandler.switchGameToMenu(); -#endif - } - - // Start is called before the first frame update - void Start() - { - uihandler = GameObject.Find("UIHandler").GetComponent(); - audioHandler = GameObject.Find("AudioHandler").GetComponent(); - - if (GameObject.Find("Inventory") != null) - { - equipment = GameObject.Find("Inventory").GetComponent().getEquipmentBonus(); - } - if (GameObject.Find("WorldGenerator") != null) - { - worldGenerator = GameObject.Find("WorldGenerator").GetComponent(); - } - } - - public void finishPlayerCreation() - { - killcount = 0; - generateSkills(); - EasterEggHandler.applyEasterEgg(this); - } - - public void generatePlayer(BasicRace race, BasicClass role, string name, int difficulty) - { - playername = name; - health = 100; - maxHealth = 100; - maxSecondary = 20; - secondary = 20; - strength = 5; - dexterity = 5; - intelligence = 5; - experience = 0; - maxExperience = 10; - healthRegen = 30 / (difficulty + 1); - secondaryRegen = 5; - level = 0; - luck = 20 - (difficulty * 5); - this.race = race; - this.race.applyBonus(this); - this.role = role; - this.role.applyBonus(this); - this.difficulty = difficulty; - } - - public void generatePlayer() - { - switch (PlayerPrefs.GetInt("class")) - { - case 0: - role = new WarriorClass(); - break; - case 1: - role = new MageClass(); - break; - case 2: - role = new ThiefClass(); - break; - } - switch (PlayerPrefs.GetInt("race")) - { - case 0: - race = new HumanRace(); - break; - case 1: - race = new ElvenRace(); - break; - case 2: - race = new DwarvenRace(); - break; - case 3: - race = new GoblinRace(); - break; - case 4: - race = new GiantRace(); - break; - } - playername = PlayerPrefs.GetString("playername"); - health = 100; - maxHealth = 100; - maxSecondary = 20; - secondary = 20; - strength = 5; - dexterity = 5; - intelligence = 5; - experience = 0; - maxExperience = 10; - healthRegen = 30 / (difficulty + 1); - secondaryRegen = 5; - level = 0; - luck = 20 - (difficulty * 5); - this.race.applyBonus(this); - this.role.applyBonus(this); - this.difficulty = PlayerPrefs.GetInt("difficulty"); - } - - private void generateSkills() - { - switch (role.classname) - { - case "Warrior": - skills[0] = new BasicSkill(20, 10, 2, "Slash", "Skills/Warrior/Slash", null); - skills[0].setDescription(TextHandler.getText("slashDesc"));//""); - skills[1] = new BasicSkill(0, 5, 1, "Block", "Skills/Warrior/Block", null); - skills[1].setDescription(TextHandler.getText("blockDesc"));//""); - skills[2] = new BasicSkill(35, 30, 4, "Execution", "Skills/Warrior/Execution", null); - skills[2].setDescription(TextHandler.getText("executionDesc"));//""); - break; - case "Thief": - skills[0] = new BasicSkill(20, 10, 2, "Stab", "Skills/Thief/Stab", null); - skills[0].setDescription(TextHandler.getText("stabDesc"));//""); - skills[1] = new BasicSkill(0, 5, 1, "SmokeScreen", "Skills/Thief/SmokeScreen", null); - skills[1].setDescription(TextHandler.getText("smokeScreenDesc"));//""); - skills[2] = new BasicSkill(35, 30, 4, "Heartstop", "Skills/Thief/Heartstop", null); - skills[2].setDescription(TextHandler.getText("heartStopDesc"));//""); - break; - case "Mage": - skills[0] = new BasicSkill(20, 10, 2, "Icicle", "Skills/Mage/Icicle", null); - skills[0].setDescription(TextHandler.getText("icicleDesc"));//""); - skills[1] = new BasicSkill(0, 5, 1, "Teleport", "Skills/Mage/Teleport", null); - skills[1].setDescription(TextHandler.getText("teleportDesc"));//""); - skills[2] = new BasicSkill(35, 30, 4, "Fireball", "Skills/Mage/Fireball", null); - skills[2].setDescription(TextHandler.getText("fireballDesc"));//""); - break; - } - } - - public void changeStats(int strength, int health, int dexterity, int intelligence, int secondary) - { - this.maxHealth = this.maxHealth + health; - this.health = maxHealth; - this.maxSecondary = this.maxSecondary + secondary; - this.secondary = maxSecondary; - this.strength = this.strength + strength; - this.dexterity = this.dexterity + dexterity; - this.intelligence = this.intelligence + intelligence; - } - - // Update is called once per frame - void Update() - { - if (killcount != -1) - { - getRotation(); - regeneratePlayer(); - uihandler.adjustInformation(this); - if (!finishedGame) - { - gameFinished(); - } - } - } - - private void regeneratePlayer() - { - if (uihandler.state != UIState.FIGHT) - { - if (now == null) - { - now = DateTime.Now; - } - else - { - if (now.AddSeconds(10).CompareTo(DateTime.Now) <= 0) - { - now = DateTime.Now; - regainSecondary(); - healPlayer(); - } - } - } - else - { - now = DateTime.Now; - } - } - - public void regainSecondary() - { - secondary = secondary + secondaryRegen + equipment["MPR"]; - if (secondary >= maxSecondary + equipment["MP"]) - { - secondary = maxSecondary + equipment["MP"]; - } - } - - private void healPlayer() - { - health = health + healthRegen + equipment["HPR"]; - if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.S)) - { - health = health + 5; - } - if (health >= maxHealth + equipment["HP"]) - { - health = maxHealth + +equipment["HP"]; - } - } - - public void move(Vector3 input) - { - GameObject camera = GameObject.Find("Main Camera"); - - if (input.y != 0) - { - if (jumpTimer != null) - { - if (jumpTimer.AddSeconds(1).CompareTo(DateTime.Now) <= 0) - { - jumpTimer = DateTime.Now; - gameObject.GetComponent().velocity = new Vector3(0, 5, 0); - audioHandler.playJump(); - } - } - else - { - jumpTimer = DateTime.Now; - gameObject.GetComponent().velocity = new Vector3(0, 5, 0); - audioHandler.playJump(); - } - } - - Vector3 movement = new Vector3(input.x, 0, input.z); - movement = camera.transform.TransformDirection(movement); - movement.y = 0; - gameObject.transform.Translate(movement * speed * Time.deltaTime); - - if (input.z != 0) - { - if (camera.transform.localPosition.y >= 0.5) - { - bobbingDirection = -1; - } - else if (camera.transform.localPosition.y <= 0.3) - { - bobbingDirection = 1; - } - - camera.transform.Translate(new Vector3(0, bobbingDirection, 0) * Time.deltaTime / 2); - } - GameObject.Find("QuestLog").GetComponent().updateQuests("explore", gameObject, 1); - } - - public void getRotation() - { - GameObject needle = GameObject.Find("imgNeedle"); - float rotation = GameObject.Find("Main Camera").transform.rotation.eulerAngles.y; - if (rotation < 0) - { - rotation += 360; - } - if (rotation >= 360) - { - rotation -= 360; - } - needle.transform.eulerAngles = new Vector3(0, 0, rotation); - } - - public int[] getStats() - { - int luck = 0; - if (equipment != null && equipment.ContainsKey("LCK")) - { - luck = this.luck + equipment["LCK"]; - } - else - { - luck = this.luck; - } - int[] result = { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points, luck }; - return result; - } - - public void setStats(int[] stats) - { - maxHealth = stats[0]; - health = maxHealth; - maxSecondary = stats[1]; - secondary = maxSecondary; - strength = stats[2]; - dexterity = stats[3]; - intelligence = stats[4]; - } - - public void displayAction(int index, GameObject image, GameObject desc) - { - skills[index].display(image, desc, secondary); - } - - public int calculateDamage() - { - int result; - int bonus = 0; - if (isCrit()) - { - bonus = (strength + equipment["STR"]) * 2; - } - result = strength + bonus + 5 + equipment["STR"]; - switch (difficulty) - { - case 0: - result = result * 2; - break; - case 1: - //Default difficulty - break; - case 2: - result = result / 2; - break; - } - return result; - } - - public int castSkill(int index) - { - int damage = 0; - if (skills[index].canPlayerCast(secondary)) - { - if (index == 1) - { - isDodging = true; - } - secondary = secondary - skills[index].getSecondaryConsumption(); - if (role.classname == "Wizard") - { - damage = skills[index].calculateDamage(intelligence + equipment["INT"], isCrit()); - } - else - { - damage = skills[index].calculateDamage(strength + equipment["STR"], isCrit()); - } - - switch (difficulty) - { - case 0: - damage = damage * 2; - break; - case 1: - //Default difficulty - break; - case 2: - damage = damage / 2; - break; - } - skills[index].playSound(audioHandler); - } - return damage; - } - - public void reduceCooldown(int index) - { - for (int i = 0; i < skills.Length; i++) - { - if (i != index) - { - skills[i].reduceCooldown(); - } - } - } - - public bool isCrit() - { - return rand.Next(1, 101) <= dexterity + equipment["DEX"]; - } - - public int getKillCount() - { - return killcount; - } - - public bool takeDamage(int amount) - { - if (amount > 0) - { - if (!EasterEggHandler.isGodMode(this)) - { - if (isDodging) - { - isDodging = false; - } - else - { - if (rand.Next(1, 101) > dexterity + equipment["DEX"] + ((intelligence + equipment["INT"]) / 2)) - { - health = health - amount; - audioHandler.playDamage(); - } - } - } - } - return health <= 0; - } - - public void enemyKilled() - { - uihandler.showMessage("SUCCESS;" + TextHandler.getText("enemyKilled")); - killcount++; - SteamWorksHandler.getSlimeAchievement(killcount); - gameFinished(); - } - - public void gameFinished() - { - if (worldGenerator.gameWon()) - { - finishedGame = true; - uihandler.showMessage("SUCCESS;" + TextHandler.getText("gameWon")); - switch (difficulty) - { - case 0: - SteamWorksHandler.getStandardAchievement("EasyAchievement"); - break; - case 1: - SteamWorksHandler.getStandardAchievement("NormalAchievement"); - break; - case 2: - SteamWorksHandler.getStandardAchievement("HardAchievement"); - break; - } - } - } - - public void gainExperience(int amount) - { - experience = experience + amount; - if (experience >= maxExperience) - { - experience = experience - maxExperience; - maxExperience = maxExperience * 2; - level++; - uihandler.showMessage("SUCCESS;" + TextHandler.getText("levelUp")); - points = points + 3; - audioHandler.playLevelUp(); - luck = luck + 2; - } - } - - public void updateName(Text nameUI) - { - nameUI.text = playername + " (" + TextHandler.getText(race.racename) + "/" + TextHandler.getText(role.classname) + ", Lvl. " + level + ")"; - } - - public void updateNameHUD(Text nameUI) - { - nameUI.text = playername + "\n\r" + TextHandler.getText(race.racename) + "/" + TextHandler.getText(role.classname) + "\r\n Lvl. " + level; - } - - public void upgradeStrength() - { - if (points > 0) - { - strength++; - points--; - } - else - { - uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); - } - } - - public void upgradeDexterity() - { - if (points > 0) - { - dexterity++; - points--; - } - else - { - uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); - } - } - - public void upgradeIntelligence() - { - if (points > 0) - { - intelligence++; - points--; - } - else - { - uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); - } - } - - public void upgradeHealth() - { - if (points > 0) - { - maxHealth = maxHealth + 5; - health = maxHealth + equipment["HP"]; - points--; - } - else - { - uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); - } - } - - public void upgradeSecondary() - { - if (points > 0) - { - maxSecondary = maxSecondary + 5; - secondary = maxSecondary + equipment["MP"]; - points--; - } - else - { - uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); - } - } - - public void displaySkills(GameObject pnlSkills) - { - for (int i = 1; i <= 3; i++) - { - GameObject skill = pnlSkills.transform.Find("skill" + i).gameObject; - skills[i - 1].displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject); - } - } - - public string getPlayerName() - { - return playername; - } - - public int getDifficulty() - { - return difficulty; - } - - public BasicRace getRace() - { - return race; - } - - public BasicClass getClass() - { - return role; - } - - public string saveGame() - { - string result = ""; - result = result + FileHandler.generateJSON("playername", "\"" + playername + "\"") + ",\r\n"; - result = result + FileHandler.generateJSON("maxHealth", maxHealth) + ",\r\n"; - result = result + FileHandler.generateJSON("maxSecondary", maxSecondary) + ",\r\n"; - result = result + FileHandler.generateJSON("secondary", secondary) + ",\r\n"; - result = result + FileHandler.generateJSON("health", health) + ",\r\n"; - result = result + FileHandler.generateJSON("strength", strength) + ",\r\n"; - result = result + FileHandler.generateJSON("dexterity", dexterity) + ",\r\n"; - result = result + FileHandler.generateJSON("intelligence", intelligence) + ",\r\n"; - result = result + FileHandler.generateJSON("level", level) + ",\r\n"; - result = result + FileHandler.generateJSON("experience", experience) + ",\r\n"; - result = result + FileHandler.generateJSON("maxExperience", maxExperience) + ",\r\n"; - result = result + FileHandler.generateJSON("race", "\"" + race.racename + "\"") + ",\r\n"; - result = result + FileHandler.generateJSON("role", "\"" + role.classname + "\"") + ",\r\n"; - result = result + FileHandler.generateJSON("points", points) + ",\r\n"; - result = result + FileHandler.generateJSON("healthRegen", healthRegen) + ",\r\n"; - result = result + FileHandler.generateJSON("secondaryRegen", secondaryRegen) + ",\r\n"; - result = result + FileHandler.generateJSON("isDodging", "\"" + isDodging + "\"") + ",\r\n"; - result = result + FileHandler.generateJSON("killcount", killcount) + ",\r\n"; - result = result + FileHandler.generateJSON("luck", luck) + ",\r\n"; - result = result + FileHandler.generateJSON("difficulty", difficulty); - return result; - } - - public void loadPlayer(JToken json) - { - playername = json["playername"].ToString(); - maxHealth = (int)json["maxHealth"]; - maxSecondary = (int)json["maxSecondary"]; - secondary = (int)json["secondary"]; - health = (int)json["health"]; - strength = (int)json["strength"]; - dexterity = (int)json["dexterity"]; - intelligence = (int)json["intelligence"]; - level = (int)json["level"]; - experience = (int)json["experience"]; - maxExperience = (int)json["maxExperience"]; - loadRole(json["role"].ToString()); - loadRace(json["race"].ToString()); - points = (int)json["points"]; - luck = (int)json["luck"]; - healthRegen = (int)json["healthRegen"]; - secondaryRegen = (int)json["secondaryRegen"]; - isDodging = bool.Parse(json["isDodging"].ToString()); - killcount = (int)json["killcount"]; - difficulty = (int)json["difficulty"]; - generateSkills(); - } - - private void loadRole(string name) - { - switch (name) - { - case "Warrior": - role = new WarriorClass(); - break; - case "Mage": - role = new MageClass(); - break; - case "Thief": - role = new ThiefClass(); - break; - } - } - - private void loadRace(string name) - { - switch (name) - { - case "Human": - race = new HumanRace(); - break; - case "Dwarf": - race = new DwarvenRace(); - break; - case "Elf": - race = new ElvenRace(); - break; - case "Giant": - race = new GiantRace(); - break; - case "Goblin": - race = new GoblinRace(); - break; - } - } - - public int getLuck() - { - return luck; - } - - void OnTriggerEnter(Collider col) - { - if (col.gameObject.name.Contains("_")) - { - worldGenerator.changeCurrentTile(col.gameObject); - } - } - - void OnTriggerStay(Collider col) - { - if (col.gameObject.name.Contains("border")) - { - Vector3 newTile = new Vector3(); - if (col.gameObject.name.ToLower() == "bordernorth") - { - newTile = newTile + new Vector3(0, 0, 1); - } - if (col.gameObject.name.ToLower() == "bordersouth") - { - newTile = newTile + new Vector3(0, 0, -1); - } - if (col.gameObject.name.ToLower() == "bordereast") - { - newTile = newTile + new Vector3(1, 0, 0); - } - if (col.gameObject.name.ToLower() == "borderwest") - { - newTile = newTile + new Vector3(-1, 0, 0); - } - worldGenerator.createTile(newTile); - } - } - } -} diff --git a/Assets/TerrainData_33a72348-ac93-47a3-9894-de9d09449b1c.asset.meta b/Assets/Scripts/Player.meta similarity index 52% rename from Assets/TerrainData_33a72348-ac93-47a3-9894-de9d09449b1c.asset.meta rename to Assets/Scripts/Player.meta index ae34163..c4b380f 100644 --- a/Assets/TerrainData_33a72348-ac93-47a3-9894-de9d09449b1c.asset.meta +++ b/Assets/Scripts/Player.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 708b71484eb134b679733d6faf5be21d -NativeFormatImporter: +guid: f3d401c0fa6bedaed8fd60cec0ed3af7 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 15600000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs similarity index 99% rename from Assets/Scripts/PlayerCamera.cs rename to Assets/Scripts/Player/PlayerCamera.cs index e011144..6f355b5 100644 --- a/Assets/Scripts/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -namespace Assets.Scripts +namespace Assets.Scripts.Player { public class PlayerCamera : MonoBehaviour { diff --git a/Assets/Scripts/PlayerCamera.cs.meta b/Assets/Scripts/Player/PlayerCamera.cs.meta similarity index 83% rename from Assets/Scripts/PlayerCamera.cs.meta rename to Assets/Scripts/Player/PlayerCamera.cs.meta index 28d4c16..f66223d 100644 --- a/Assets/Scripts/PlayerCamera.cs.meta +++ b/Assets/Scripts/Player/PlayerCamera.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0dafbb406c854e141ba4c7f354514063 +guid: ccf47fd0e7044a6f08a0f3353ee62cf5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs new file mode 100644 index 0000000..98d7a93 --- /dev/null +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -0,0 +1,376 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.UI; +using Assets.Scripts.Classes; +using Assets.Scripts.Races; +using Newtonsoft.Json.Linq; +using UnityEngine.InputSystem; + +namespace Assets.Scripts.Player +{ + public class PlayerGameObject : MonoBehaviour + { + UIHandler uihandler; + AudioHandler audioHandler; + WorldGenerator worldGenerator; + Inventory inventory; + int difficulty = 0; + bool finishedGame = false; + PlayerObject player; + public float speed = 5f; + DateTime jumpTimer; + DateTime now; + int bobbingDirection = -1; + + private void OnEnable() + { +#if UNITY_EDITOR + SceneHandler.switchGameToMenu(); +#endif + } + + void Start() + { + uihandler = GameObject.Find("UIHandler").GetComponent(); + audioHandler = GameObject.Find("AudioHandler").GetComponent(); + + if (GameObject.Find("Inventory") != null) + { + inventory = GameObject.Find("Inventory").GetComponent(); + } + if (GameObject.Find("WorldGenerator") != null) + { + worldGenerator = GameObject.Find("WorldGenerator").GetComponent(); + } + generatePlayer(); + } + + // Update is called once per frame + void Update() + { + if (player.getStat("Killcount").getAmount() != -1) + { + getRotation(); + regeneratePlayer(); + uihandler.adjustInformation(this); + if (!finishedGame) + { + gameFinished(); + } + } + } + + private void regeneratePlayer() + { + if (uihandler.state != UIState.FIGHT) + { + if (now == null) + { + now = DateTime.Now; + } + else + { + if (now.AddSeconds(10).CompareTo(DateTime.Now) <= 0) + { + now = DateTime.Now; + player.regainSecondary(inventory.getEquipmentBonus()["MPR"],inventory.getEquipmentBonus()["MP"]); + player.healPlayer(inventory.getEquipmentBonus()["HPR"],inventory.getEquipmentBonus()["HP"]); + } + } + } + else + { + now = DateTime.Now; + } + } + + + public void generatePlayer() + { + BasicRace race = new BasicRace(); + BasicClass role = new BasicClass(); + switch (PlayerPrefs.GetInt("class")) + { + case 0: + role = new WarriorClass(); + break; + case 1: + role = new MageClass(); + break; + case 2: + role = new ThiefClass(); + break; + } + switch (PlayerPrefs.GetInt("race")) + { + case 0: + race = new HumanRace(); + break; + case 1: + race = new ElvenRace(); + break; + case 2: + race = new DwarvenRace(); + break; + case 3: + race = new GoblinRace(); + break; + case 4: + race = new GiantRace(); + break; + } + string playername = PlayerPrefs.GetString("playername"); + difficulty = PlayerPrefs.GetInt("difficulty"); + player = new PlayerObject(playername, race, role, difficulty); + } + + public void generatePlayer(BasicRace playerRace, BasicClass playerClass, string name, int difficulty){ + player = new PlayerObject(name, playerRace, playerClass, difficulty); + } + + public void move(Vector3 input) + { + GameObject camera = GameObject.Find("Main Camera"); + + if (input.y != 0) + { + if (jumpTimer != null) + { + if (jumpTimer.AddSeconds(1).CompareTo(DateTime.Now) <= 0) + { + jumpTimer = DateTime.Now; + gameObject.GetComponent().velocity = new Vector3(0, 5, 0); + audioHandler.playJump(); + } + } + else + { + jumpTimer = DateTime.Now; + gameObject.GetComponent().velocity = new Vector3(0, 5, 0); + audioHandler.playJump(); + } + } + + Vector3 movement = new Vector3(input.x, 0, input.z); + movement = camera.transform.TransformDirection(movement); + movement.y = 0; + gameObject.transform.Translate(movement * speed * Time.deltaTime); + + if (input.z != 0) + { + if (camera.transform.localPosition.y >= 0.5) + { + bobbingDirection = -1; + } + else if (camera.transform.localPosition.y <= 0.3) + { + bobbingDirection = 1; + } + + camera.transform.Translate(new Vector3(0, bobbingDirection, 0) * Time.deltaTime / 2); + } + GameObject.Find("QuestLog").GetComponent().updateQuests("explore", gameObject, 1); + } + + public void getRotation() + { + GameObject needle = GameObject.Find("imgNeedle"); + float rotation = GameObject.Find("Main Camera").transform.rotation.eulerAngles.y; + if (rotation < 0) + { + rotation += 360; + } + if (rotation >= 360) + { + rotation -= 360; + } + needle.transform.eulerAngles = new Vector3(0, 0, rotation); + } + + public void gameFinished() + { + if (worldGenerator.gameWon()) + { + finishedGame = true; + uihandler.showMessage("SUCCESS;" + TextHandler.getText("gameWon")); + switch (difficulty) + { + case 0: + SteamWorksHandler.getStandardAchievement("EasyAchievement"); + break; + case 1: + SteamWorksHandler.getStandardAchievement("NormalAchievement"); + break; + case 2: + SteamWorksHandler.getStandardAchievement("HardAchievement"); + break; + } + } + } + void OnTriggerEnter(Collider col) + { + if (col.gameObject.name.Contains("_")) + { + worldGenerator.changeCurrentTile(col.gameObject); + } + } + + void OnTriggerStay(Collider col) + { + if (col.gameObject.name.Contains("border")) + { + Vector3 newTile = new Vector3(); + if (col.gameObject.name.ToLower() == "bordernorth") + { + newTile = newTile + new Vector3(0, 0, 1); + } + if (col.gameObject.name.ToLower() == "bordersouth") + { + newTile = newTile + new Vector3(0, 0, -1); + } + if (col.gameObject.name.ToLower() == "bordereast") + { + newTile = newTile + new Vector3(1, 0, 0); + } + if (col.gameObject.name.ToLower() == "borderwest") + { + newTile = newTile + new Vector3(-1, 0, 0); + } + worldGenerator.createTile(newTile); + } + } + + public void displayAction(int index, GameObject image, GameObject desc) + { + player.getSkill(index).display(image, desc, player.getStat("Secondary").getAmount()); + } + + public void enemyKilled() + { + uihandler.showMessage("SUCCESS;" + TextHandler.getText("enemyKilled")); + player.getStat("Killcount").changeAmount(1); + SteamWorksHandler.getSlimeAchievement(player.getStat("Killcount").getAmount()); + gameFinished(); + } + + public void gainExperience(int amount) + { + if (player.gainExperience(amount)) + { + uihandler.showMessage("SUCCESS;" + TextHandler.getText("levelUp")); + audioHandler.playLevelUp(); + } + } + + public void updateName(Text nameUI) + { + nameUI.text = player.getPlayerName() + " (" + TextHandler.getText(player.getRace().racename) + "/" + TextHandler.getText(player.getClass().classname) + ", Lvl. " + player.getStat("Level").getAmount() + ")"; + } + + public void updateNameHUD(Text nameUI) + { + nameUI.text = player.getPlayerName() + "\n\r" + TextHandler.getText(player.getRace().racename) + "/" + TextHandler.getText(player.getClass().classname) + "\r\n Lvl. " + player.getStat("Level").getAmount(); + } + + public void upgradeStrength() + { + if (!player.upgradeStat("Strength", 1)) + { + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); + } + } + + public void upgradeDexterity() + { + if (!player.upgradeStat("Dexterity", 1)) + { + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); + } + } + + public void upgradeIntelligence() + { + if (!player.upgradeStat("Intelligence", 1)) + { + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); + } + } + + public void upgradeHealth() + { + if (!player.upgradeStat("MaxHealth", 5)) + { + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); + } + } + + public void upgradeSecondary() + { + if (!player.upgradeStat("MaxSecondary", 5)) + { + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); + } + } + + public void displaySkills(GameObject pnlSkills) + { + for (int i = 1; i <= 3; i++) + { + GameObject skill = pnlSkills.transform.Find("skill" + i).gameObject; + player.getSkill(i - 1).displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject); + } + } + + public PlayerStat getPlayerStat(string identifier){ + return player.getStat(identifier); + } + + public void loadPlayer(JToken json){ + player = new PlayerObject(); + player.loadPlayer(json); + } + + public PlayerObject getPlayer(){ + return player; + } + + public string saveGame(){ + return player.saveGame(); + } + + public BasicClass getClass(){ + return player.getClass(); + } + + public BasicRace getRace(){ + return player.getRace(); + } + + public int calculateDamage(){ + return player.calculateDamage(inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]); + } + + public bool takeDamage(int amount){ + if(player != null){ + return player.takeDamage(amount,inventory.getEquipmentBonus()["DEX"], inventory.getEquipmentBonus()["INT"]); + } + return false; + } + + public int castSkill(int skillnumber){ + return player.castSkill(skillnumber,inventory.getEquipmentBonus()["INT"], inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]); + } + + public void reduceCooldown(int skillnumber){ + player.reduceCooldown(skillnumber); + } + + public void regainSecondary(){ + player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]); + } + } +} diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/Player/PlayerGameObject.cs.meta similarity index 83% rename from Assets/Scripts/Player.cs.meta rename to Assets/Scripts/Player/PlayerGameObject.cs.meta index e492561..aebda18 100644 --- a/Assets/Scripts/Player.cs.meta +++ b/Assets/Scripts/Player/PlayerGameObject.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6eac15f641a82224c87a6ada5746d64b +guid: ac07c553f4e010e8299fb870481dcc49 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Player/PlayerObject.cs b/Assets/Scripts/Player/PlayerObject.cs new file mode 100644 index 0000000..9890179 --- /dev/null +++ b/Assets/Scripts/Player/PlayerObject.cs @@ -0,0 +1,381 @@ +using System; +using System.Collections.Generic; +using Assets.Scripts.Classes; +using Assets.Scripts.Races; +using Newtonsoft.Json.Linq; + +namespace Assets.Scripts.Player +{ + public class PlayerObject + { + Random rand = new Random(); + Dictionary stats; + string playername; + BasicRace race; + BasicClass role; + BasicSkill[] skills = new BasicSkill[3]; + bool isDodging = false; + int difficulty; + + public PlayerObject(string playername, BasicRace race, BasicClass role, int difficulty) + { + this.playername = playername; + this.race = race; + this.role = role; + this.difficulty = difficulty; + generateStats(false); + generateSkills(); + EasterEggHandler.applyEasterEgg(this); + } + + public PlayerObject() + { + generateStats(true); + } + + private void generateStats(bool isLoad) + { + stats = new Dictionary(); + stats.Add("Health", new PlayerStat("Health", 100, "The current health of the player")); + stats.Add("MaxHealth", new PlayerStat("MaxHealth", 100, "The current max health of the player")); + stats.Add("Secondary", new PlayerStat("Secondary", 20, "The current secondary of the player")); + stats.Add("MaxSecondary", new PlayerStat("MaxSecondary", 20, "The current max secondary of the player")); + stats.Add("Strength", new PlayerStat("Strength", 5, "The current strength of the player")); + stats.Add("Dexterity", new PlayerStat("Dexterity", 5, "The current dexterity of the player")); + stats.Add("Intelligence", new PlayerStat("Intelligence", 5, "The current intelligence of the player")); + stats.Add("Experience", new PlayerStat("Experience", 0, "The current experience of the player")); + stats.Add("MaxExperience", new PlayerStat("MaxExperience", 10, "The current max experience of the player")); + stats.Add("HealthRegen", new PlayerStat("HealthRegen", 30 / (difficulty + 1), "The current health regen of the player")); + stats.Add("SecondaryRegen", new PlayerStat("SecondaryRegen", 5, "The current secondary regen of the player")); + stats.Add("Level", new PlayerStat("Level", 0, "The current level of the player")); + stats.Add("Luck", new PlayerStat("Luck", 20 - (difficulty * 5), "The current luck of the player")); + stats.Add("Killcount", new PlayerStat("Killcount", -1, "The current killcount of the player")); + stats.Add("Points", new PlayerStat("Points", 0, "The current skillpoints of the player")); + + if (!isLoad) + { + race.applyBonus(this); + role.applyBonus(this); + } + + } + + private void generateSkills() + { + switch (role.classname) + { + case "Warrior": + skills[0] = new BasicSkill(20, 10, 2, "Slash", "Skills/Warrior/Slash", null); + skills[0].setDescription(TextHandler.getText("slashDesc")); + skills[1] = new BasicSkill(0, 5, 1, "Block", "Skills/Warrior/Block", null); + skills[1].setDescription(TextHandler.getText("blockDesc")); + skills[2] = new BasicSkill(35, 30, 4, "Execution", "Skills/Warrior/Execution", null); + skills[2].setDescription(TextHandler.getText("executionDesc")); + break; + case "Thief": + skills[0] = new BasicSkill(20, 10, 2, "Stab", "Skills/Thief/Stab", null); + skills[0].setDescription(TextHandler.getText("stabDesc")); + skills[1] = new BasicSkill(0, 5, 1, "SmokeScreen", "Skills/Thief/SmokeScreen", null); + skills[1].setDescription(TextHandler.getText("smokeScreenDesc")); + skills[2] = new BasicSkill(35, 30, 4, "Heartstop", "Skills/Thief/Heartstop", null); + skills[2].setDescription(TextHandler.getText("heartStopDesc")); + break; + case "Mage": + skills[0] = new BasicSkill(20, 10, 2, "Icicle", "Skills/Mage/Icicle", null); + skills[0].setDescription(TextHandler.getText("icicleDesc")); + skills[1] = new BasicSkill(0, 5, 1, "Teleport", "Skills/Mage/Teleport", null); + skills[1].setDescription(TextHandler.getText("teleportDesc")); + skills[2] = new BasicSkill(35, 30, 4, "Fireball", "Skills/Mage/Fireball", null); + skills[2].setDescription(TextHandler.getText("fireballDesc")); + break; + } + } + + public void loadPlayer(JToken json) + { + playername = json["playername"].ToString(); + + stats["MaxHealth"].setAmount((int)json["maxHealth"]); + stats["MaxSecondary"].setAmount((int)json["maxSecondary"]); + stats["Secondary"].setAmount((int)json["secondary"]); + stats["Health"].setAmount((int)json["health"]); + stats["Strength"].setAmount((int)json["strength"]); + stats["Dexterity"].setAmount((int)json["dexterity"]); + stats["Intelligence"].setAmount((int)json["intelligence"]); + stats["Level"].setAmount((int)json["level"]); + stats["Experience"].setAmount((int)json["experience"]); + stats["MaxExperience"].setAmount((int)json["maxExperience"]); + stats["Points"].setAmount((int)json["points"]); + stats["Luck"].setAmount((int)json["luck"]); + stats["HealthRegen"].setAmount((int)json["healthRegen"]); + stats["SecondaryRegen"].setAmount((int)json["secondaryRegen"]); + stats["Killcount"].setAmount((int)json["killcount"]); + + loadRole(json["role"].ToString()); + loadRace(json["race"].ToString()); + isDodging = bool.Parse(json["isDodging"].ToString()); + difficulty = (int)json["difficulty"]; + generateSkills(); + } + + private void loadRole(string name) + { + switch (name) + { + case "Warrior": + role = new WarriorClass(); + break; + case "Mage": + role = new MageClass(); + break; + case "Thief": + role = new ThiefClass(); + break; + } + } + + private void loadRace(string name) + { + switch (name) + { + case "Human": + race = new HumanRace(); + break; + case "Dwarf": + race = new DwarvenRace(); + break; + case "Elf": + race = new ElvenRace(); + break; + case "Giant": + race = new GiantRace(); + break; + case "Goblin": + race = new GoblinRace(); + break; + } + } + + public void changeStats(int strength, int health, int dexterity, int intelligence, int secondary) + { + stats["MaxHealth"].changeAmount(health); + stats["Health"].changeAmount(stats["MaxHealth"].getAmount()); + stats["MaxSecondary"].changeAmount(secondary); + stats["Secondary"].changeAmount(stats["MaxSecondary"].getAmount()); + stats["Strength"].changeAmount(strength); + stats["Dexterity"].changeAmount(dexterity); + stats["Intelligence"].changeAmount(intelligence); + } + + public void regainSecondary(int equipRegen, int equipStat) + { + stats["Secondary"].changeAmount(stats["SecondaryRegen"].getAmount() + equipRegen); + if (stats["Secondary"].getAmount() >= stats["MaxSecondary"].getAmount() + equipStat) + { + stats["Secondary"].setAmount(stats["MaxSecondary"].getAmount() + equipStat); + } + } + + public void healPlayer(int equipRegen, int equipStat) + { + stats["Health"].changeAmount(stats["HealthRegen"].getAmount() + equipRegen); + if (stats["Health"].getAmount() >= stats["MaxHealth"].getAmount() + equipStat) + { + stats["Health"].setAmount(stats["MaxHealth"].getAmount() + equipStat); + } + } + + public Dictionary getStats() + { + return stats; + } + + public void setStats(Dictionary stats) + { + this.stats = stats; + } + + public PlayerStat getStat(string identifier) + { + return stats[identifier]; + } + + public BasicSkill getSkill(int index) + { + return skills[index]; + } + + public int calculateDamage(int equipStatStr, int equipStatDex) + { + int result; + int bonus = 0; + if (isCrit(equipStatDex)) + { + bonus = (stats["Strength"].getAmount() + equipStatStr) * 2; + } + result = stats["Strength"].getAmount() + bonus + 5 + equipStatStr; + switch (difficulty) + { + case 0: + result = result * 2; + break; + case 1: + //Default difficulty + break; + case 2: + result = result / 2; + break; + } + return result; + } + + public int castSkill(int index, int equipStatInt, int equipStatStr, int equipStatDex) + { + int damage = 0; + if (skills[index].canPlayerCast(stats["Secondary"].getAmount())) + { + if (index == 1) + { + isDodging = true; + } + stats["Secondary"].changeAmount(-skills[index].getSecondaryConsumption()); + if (role.classname == "Wizard") + { + damage = skills[index].calculateDamage(stats["Intelligence"].getAmount() + equipStatInt, isCrit(equipStatDex)); + } + else + { + damage = skills[index].calculateDamage(stats["Strength"].getAmount() + equipStatStr, isCrit(equipStatDex)); + } + + switch (difficulty) + { + case 0: + damage = damage * 2; + break; + case 1: + //Default difficulty + break; + case 2: + damage = damage / 2; + break; + } + //TODO: Let caller of this method handle audio if damage is higher than 0 // skills[index].playSound(audioHandler); + } + return damage; + } + + public void reduceCooldown(int index) + { + for (int i = 0; i < skills.Length; i++) + { + if (i != index) + { + skills[i].reduceCooldown(); + } + } + } + + public bool isCrit(int equipStat) + { + return rand.Next(1, 101) <= stats["Dexterity"].getAmount() + equipStat; + } + + public bool takeDamage(int amount, int equipStatDex, int equipStatInt) + { + + if (amount <= 0 || EasterEggHandler.isGodMode(this)) + { + return stats["Health"].getAmount() <= 0; + } + + if (isDodging) + { + isDodging = false; + } + else + { + int dodgeChance = stats["Dexterity"].getAmount() + equipStatDex + ((stats["Intelligence"].getAmount() + equipStatInt) / 2); + if (rand.Next(1, 101) > dodgeChance) + { + stats["Health"].changeAmount(-amount); + //TODO: Let caller of this method handle audio // audioHandler.playDamage(); + } + } + return stats["Health"].getAmount() <= 0; + } + + public bool gainExperience(int amount) + { + bool result = false; + stats["Experience"].changeAmount(amount); + if (stats["Experience"].getAmount() >= stats["MaxExperience"].getAmount()) + { + stats["Experience"].changeAmount(-stats["MaxExperience"].getAmount()); + stats["MaxExperience"].changeAmount(stats["MaxExperience"].getAmount()); + stats["Level"].changeAmount(1); + stats["Points"].changeAmount(3); + stats["Luck"].changeAmount(2); + result = true; + } + return result; + } + + public bool upgradeStat(string identifier, int amount) + { + bool result = false; + if (stats["Points"].getAmount() > 0) + { + result = true; + stats[identifier].changeAmount(amount); + } + return result; + } + + public string getPlayerName() + { + return playername; + } + + public int getDifficulty() + { + return difficulty; + } + + public BasicRace getRace() + { + return race; + } + + public BasicClass getClass() + { + return role; + } + + public string saveGame() + { + string result = ""; + result = result + FileHandler.generateJSON("playername", "\"" + playername + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("maxHealth", stats["MaxHealth"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("maxSecondary", stats["MaxSecondary"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("secondary", stats["Secondary"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("health", stats["Health"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("strength", stats["Strength"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("dexterity", stats["Dexterity"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("intelligence", stats["Intelligence"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("level", stats["Level"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("experience", stats["Experience"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("maxExperience", stats["MaxExperience"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("race", "\"" + race.racename + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("role", "\"" + role.classname + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("points", stats["Points"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("healthRegen", stats["HealthRegen"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("secondaryRegen", stats["SecondaryRegen"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("isDodging", "\"" + isDodging + "\"") + ",\r\n"; + result = result + FileHandler.generateJSON("killcount", stats["Killcount"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("luck", stats["Luck"].getAmount()) + ",\r\n"; + result = result + FileHandler.generateJSON("difficulty", difficulty); + return result; + } + } +} diff --git a/Assets/Scripts/Player/PlayerObject.cs.meta b/Assets/Scripts/Player/PlayerObject.cs.meta new file mode 100644 index 0000000..cf06da1 --- /dev/null +++ b/Assets/Scripts/Player/PlayerObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8f3ccf8e929cf8c32b9a9479e8870bbd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerStat.cs b/Assets/Scripts/Player/PlayerStat.cs new file mode 100644 index 0000000..940c961 --- /dev/null +++ b/Assets/Scripts/Player/PlayerStat.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.UI; +using Assets.Scripts.Classes; +using Assets.Scripts.Races; +using Newtonsoft.Json.Linq; +using UnityEngine.InputSystem; + +namespace Assets.Scripts.Player +{ + public class PlayerStat + { + string text; + int amount; + string tooltip; + + public PlayerStat(string text, int amount, string tooltip){ + this.text = text; + this.amount = amount; + this.tooltip = tooltip; + } + + public string getTooltip(){ + return this.tooltip; + } + + public string getText(){ + return this.text; + } + + public int getAmount(){ + return this.amount; + } + + public void changeAmount(int change){ + this.amount = this.amount + change; + } + + public void setAmount(int amount){ + this.amount = amount; + } + + } +} diff --git a/Assets/Scripts/Player/PlayerStat.cs.meta b/Assets/Scripts/Player/PlayerStat.cs.meta new file mode 100644 index 0000000..c2bec86 --- /dev/null +++ b/Assets/Scripts/Player/PlayerStat.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3038d55d00ed9d790b3f50d461689251 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/QuestLog.cs b/Assets/Scripts/QuestLog.cs index 1613e4c..497d055 100644 --- a/Assets/Scripts/QuestLog.cs +++ b/Assets/Scripts/QuestLog.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.Player; using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; @@ -112,7 +113,7 @@ namespace Assets.Scripts public void removeQuests() { Inventory inventory = GameObject.Find("Inventory").GetComponent(); - int luck = GameObject.Find("Player").GetComponent().getLuck(); + int luck = GameObject.Find("Player").GetComponent().getPlayerStat("Luck").getAmount(); luck = luck + inventory.getEquipmentBonus()["LCK"]; Dictionary> toDelete = new Dictionary>(); foreach (string key in quests.Keys) diff --git a/Assets/Scripts/Quests/ExploreQuest.cs b/Assets/Scripts/Quests/ExploreQuest.cs index 8a53e90..9364111 100644 --- a/Assets/Scripts/Quests/ExploreQuest.cs +++ b/Assets/Scripts/Quests/ExploreQuest.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.Player; using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; @@ -9,7 +10,7 @@ namespace Assets.Scripts { public ExploreQuest(GameObject display) : base(display) { - Vector3 playerPos = GameObject.Find("Player").GetComponent().transform.position; + Vector3 playerPos = GameObject.Find("Player").GetComponent().transform.position; float coordX = getRandomNumber(1000) - 500; float coordZ = getRandomNumber(1000) - 500; coordinates = new Vector3(playerPos.x + coordX, 0, playerPos.z + coordZ); diff --git a/Assets/Scripts/Races/BasicRace.cs b/Assets/Scripts/Races/BasicRace.cs index 9bdcfb1..5a8a82a 100644 --- a/Assets/Scripts/Races/BasicRace.cs +++ b/Assets/Scripts/Races/BasicRace.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Races { @@ -25,7 +26,7 @@ namespace Assets.Scripts.Races secondaryBonus = 0; } - public void applyBonus(Player player) + public void applyBonus(PlayerObject player) { player.changeStats(strengthBonus, healthBonus, dexterityBonus, intelligenceBonus, secondaryBonus); } diff --git a/Assets/Scripts/Slimes/BasicSlime.cs b/Assets/Scripts/Slimes/BasicSlime.cs index 7f7d4f2..a4b41db 100644 --- a/Assets/Scripts/Slimes/BasicSlime.cs +++ b/Assets/Scripts/Slimes/BasicSlime.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json.Linq; +using Assets.Scripts.Player; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Linq; @@ -21,20 +22,18 @@ namespace Assets.Scripts.Slimes protected Item item; protected int luck; - public BasicSlime(Player player) + public BasicSlime(PlayerGameObject player) { - //health,maxHealth,secondary,maxSecondary,strength,dexterity,intelligence,level,experience,maxExperience,points,luck - int[] playerStats = player.getStats(); - maxHealth = playerStats[1]; + maxHealth = player.getPlayerStat("MaxHealth").getAmount(); health = maxHealth; - maxSecondary = playerStats[3]; + maxSecondary = player.getPlayerStat("MaxSecondary").getAmount(); secondary = maxSecondary; - strength = playerStats[4]; - dexterity = playerStats[5]; - intelligence = playerStats[6]; - experience = (int)(10 + playerStats[7] * 2.5f); - level = playerStats[7]; - luck = playerStats[11]; + strength = player.getPlayerStat("Strength").getAmount(); + dexterity = player.getPlayerStat("Dexterity").getAmount(); + intelligence = player.getPlayerStat("Intelligence").getAmount(); + experience = (int)(10 + player.getPlayerStat("Experience").getAmount() * 2.5f); + level = player.getPlayerStat("Level").getAmount(); + luck = player.getPlayerStat("Luck").getAmount(); } public BasicSlime(JToken json) diff --git a/Assets/Scripts/Slimes/BossSlime.cs b/Assets/Scripts/Slimes/BossSlime.cs index c2004cf..878fedb 100644 --- a/Assets/Scripts/Slimes/BossSlime.cs +++ b/Assets/Scripts/Slimes/BossSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class BossSlime : BasicSlime { - public BossSlime(Player player) : base(player) + public BossSlime(PlayerGameObject player) : base(player) { intelligence = intelligence + 5; strength = strength + 10; diff --git a/Assets/Scripts/Slimes/ForestSlime.cs b/Assets/Scripts/Slimes/ForestSlime.cs index 91f94e5..3c217c5 100644 --- a/Assets/Scripts/Slimes/ForestSlime.cs +++ b/Assets/Scripts/Slimes/ForestSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class ForestSlime : BasicSlime { - public ForestSlime(Player player) : base(player) + public ForestSlime(PlayerGameObject player) : base(player) { //intelligence = intelligence; //strength = strength; diff --git a/Assets/Scripts/Slimes/MageSlime.cs b/Assets/Scripts/Slimes/MageSlime.cs index 3e4c741..b74d010 100644 --- a/Assets/Scripts/Slimes/MageSlime.cs +++ b/Assets/Scripts/Slimes/MageSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { public class MageSlime : BasicSlime { - public MageSlime(Player player) : base(player) + public MageSlime(PlayerGameObject player) : base(player) { intelligence = intelligence + 2; strength = strength - 2; diff --git a/Assets/Scripts/Slimes/MetalSlime.cs b/Assets/Scripts/Slimes/MetalSlime.cs index 68e4a81..5033062 100644 --- a/Assets/Scripts/Slimes/MetalSlime.cs +++ b/Assets/Scripts/Slimes/MetalSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class MetalSlime : BasicSlime { - public MetalSlime(Player player) : base(player) + public MetalSlime(PlayerGameObject player) : base(player) { //intelligence = intelligence; strength = strength + 2; diff --git a/Assets/Scripts/Slimes/MiniBossSlime.cs b/Assets/Scripts/Slimes/MiniBossSlime.cs index edd21fb..c4cef78 100644 --- a/Assets/Scripts/Slimes/MiniBossSlime.cs +++ b/Assets/Scripts/Slimes/MiniBossSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class MiniBossSlime : BasicSlime { - public MiniBossSlime(Player player) : base(player) + public MiniBossSlime(PlayerGameObject player) : base(player) { intelligence = intelligence + 3; strength = strength + 3; diff --git a/Assets/Scripts/Slimes/NormalSlime.cs b/Assets/Scripts/Slimes/NormalSlime.cs index 731d4ad..434fa7d 100644 --- a/Assets/Scripts/Slimes/NormalSlime.cs +++ b/Assets/Scripts/Slimes/NormalSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class NormalSlime : BasicSlime { - public NormalSlime(Player player) : base(player) + public NormalSlime(PlayerGameObject player) : base(player) { maxHealth = maxHealth + 10; health = maxHealth; diff --git a/Assets/Scripts/Slimes/SlimeFactory.cs b/Assets/Scripts/Slimes/SlimeFactory.cs index 2d5d581..f16cc68 100644 --- a/Assets/Scripts/Slimes/SlimeFactory.cs +++ b/Assets/Scripts/Slimes/SlimeFactory.cs @@ -3,42 +3,43 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class SlimeFactory { - public NormalSlime generateNormalSlime(Player player) + public NormalSlime generateNormalSlime(PlayerGameObject player) { return new NormalSlime(player); } - public MageSlime generateMageSlime(Player player) + public MageSlime generateMageSlime(PlayerGameObject player) { return new MageSlime(player); } - public MetalSlime generateMetalSlime(Player player) + public MetalSlime generateMetalSlime(PlayerGameObject player) { return new MetalSlime(player); } - public MiniBossSlime generateMiniBossSlime(Player player) + public MiniBossSlime generateMiniBossSlime(PlayerGameObject player) { return new MiniBossSlime(player); } - public WarriorSlime generateWarriorSlime(Player player) + public WarriorSlime generateWarriorSlime(PlayerGameObject player) { return new WarriorSlime(player); } - public ForestSlime generateForestSlime(Player player) + public ForestSlime generateForestSlime(PlayerGameObject player) { return new ForestSlime(player); } - public BossSlime generateBossSlime(Player player) + public BossSlime generateBossSlime(PlayerGameObject player) { return new BossSlime(player); } diff --git a/Assets/Scripts/Slimes/WarriorSlime.cs b/Assets/Scripts/Slimes/WarriorSlime.cs index bbf0713..e420daa 100644 --- a/Assets/Scripts/Slimes/WarriorSlime.cs +++ b/Assets/Scripts/Slimes/WarriorSlime.cs @@ -3,12 +3,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Assets.Scripts.Player; namespace Assets.Scripts.Slimes { class WarriorSlime : BasicSlime { - public WarriorSlime(Player player) : base(player) + public WarriorSlime(PlayerGameObject player) : base(player) { intelligence = intelligence - 2; strength = strength + 2; diff --git a/Assets/TerrainData_24238373-2d55-4b95-9746-1f7e69d39853.asset b/Assets/TerrainData_24238373-2d55-4b95-9746-1f7e69d39853.asset deleted file mode 100644 index ac22460..0000000 Binary files a/Assets/TerrainData_24238373-2d55-4b95-9746-1f7e69d39853.asset and /dev/null differ diff --git a/Assets/TerrainData_33a72348-ac93-47a3-9894-de9d09449b1c.asset b/Assets/TerrainData_33a72348-ac93-47a3-9894-de9d09449b1c.asset deleted file mode 100644 index bf3225a..0000000 Binary files a/Assets/TerrainData_33a72348-ac93-47a3-9894-de9d09449b1c.asset and /dev/null differ diff --git a/Assets/TerrainData_44fb1595-7d55-4c04-a305-376b28cfa924.asset b/Assets/TerrainData_44fb1595-7d55-4c04-a305-376b28cfa924.asset deleted file mode 100644 index 9524893..0000000 Binary files a/Assets/TerrainData_44fb1595-7d55-4c04-a305-376b28cfa924.asset and /dev/null differ diff --git a/Assets/TerrainData_44fb1595-7d55-4c04-a305-376b28cfa924.asset.meta b/Assets/TerrainData_44fb1595-7d55-4c04-a305-376b28cfa924.asset.meta deleted file mode 100644 index 21dd4ab..0000000 --- a/Assets/TerrainData_44fb1595-7d55-4c04-a305-376b28cfa924.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 751c5cacb250e75659f0d758a42a016d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 15600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TerrainData_5060fb3d-2bfc-499e-bfb5-838127cde0a8.asset b/Assets/TerrainData_5060fb3d-2bfc-499e-bfb5-838127cde0a8.asset deleted file mode 100644 index 0104185..0000000 Binary files a/Assets/TerrainData_5060fb3d-2bfc-499e-bfb5-838127cde0a8.asset and /dev/null differ diff --git a/Assets/TerrainData_5060fb3d-2bfc-499e-bfb5-838127cde0a8.asset.meta b/Assets/TerrainData_5060fb3d-2bfc-499e-bfb5-838127cde0a8.asset.meta deleted file mode 100644 index d8ea787..0000000 --- a/Assets/TerrainData_5060fb3d-2bfc-499e-bfb5-838127cde0a8.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a8efd3ad46a629fb871a2cb2d93566d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 15600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TerrainData_76e70aaa-60bf-4d0f-a8bb-4b9c4e11f5b9.asset b/Assets/TerrainData_76e70aaa-60bf-4d0f-a8bb-4b9c4e11f5b9.asset deleted file mode 100644 index f05979f..0000000 Binary files a/Assets/TerrainData_76e70aaa-60bf-4d0f-a8bb-4b9c4e11f5b9.asset and /dev/null differ diff --git a/Assets/TerrainData_76e70aaa-60bf-4d0f-a8bb-4b9c4e11f5b9.asset.meta b/Assets/TerrainData_76e70aaa-60bf-4d0f-a8bb-4b9c4e11f5b9.asset.meta deleted file mode 100644 index 402e450..0000000 --- a/Assets/TerrainData_76e70aaa-60bf-4d0f-a8bb-4b9c4e11f5b9.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0a52adae5d772f7d0bfd83e0289b0ba3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 15600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TerrainData_9ea9d306-00d6-4413-8a11-1241f3220101.asset b/Assets/TerrainData_9ea9d306-00d6-4413-8a11-1241f3220101.asset deleted file mode 100644 index e6fbef6..0000000 Binary files a/Assets/TerrainData_9ea9d306-00d6-4413-8a11-1241f3220101.asset and /dev/null differ diff --git a/Assets/TerrainData_9ea9d306-00d6-4413-8a11-1241f3220101.asset.meta b/Assets/TerrainData_9ea9d306-00d6-4413-8a11-1241f3220101.asset.meta deleted file mode 100644 index 4eba004..0000000 --- a/Assets/TerrainData_9ea9d306-00d6-4413-8a11-1241f3220101.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b10cedcc8209111bebc4e847fcf35da0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 15600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/TerrainData_f695169a-3b97-4a0f-a2f6-2d889ec7115a.asset b/Assets/TerrainData_f695169a-3b97-4a0f-a2f6-2d889ec7115a.asset deleted file mode 100644 index 8b77786..0000000 Binary files a/Assets/TerrainData_f695169a-3b97-4a0f-a2f6-2d889ec7115a.asset and /dev/null differ diff --git a/Assets/TerrainData_f695169a-3b97-4a0f-a2f6-2d889ec7115a.asset.meta b/Assets/TerrainData_f695169a-3b97-4a0f-a2f6-2d889ec7115a.asset.meta deleted file mode 100644 index 8f6ac9d..0000000 --- a/Assets/TerrainData_f695169a-3b97-4a0f-a2f6-2d889ec7115a.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 51aa34e911071054887b24683e3e4458 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 15600000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index fe8017b..be4b050 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,14 +6,14 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a - flags: 0 - RecentlyUsedSceneGuid-1: value: 05550c040100590e5c0c097446220f164e164d732a7072682c2a1f31b7b7666c flags: 0 - RecentlyUsedSceneGuid-2: + RecentlyUsedSceneGuid-1: value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 + RecentlyUsedSceneGuid-2: + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + flags: 0 RecentlyUsedSceneGuid-3: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index a1bab96..7484341 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1020 m_ShowMode: 4 - m_Title: Game + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 40 + controlID: 116 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 41 + controlID: 67 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 42 + controlID: 43 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -180,7 +180,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneHierarchyWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -191,9 +191,9 @@ MonoBehaviour: height: 685 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 15} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 @@ -217,13 +217,13 @@ MonoBehaviour: height: 685 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 20} m_Panes: + - {fileID: 14} + - {fileID: 20} + - {fileID: 15} - {fileID: 16} - {fileID: 17} - - {fileID: 18} - - {fileID: 19} - - {fileID: 20} m_Selected: 1 m_LastSelected: 0 --- !u!114 &10 @@ -247,64 +247,13 @@ MonoBehaviour: height: 285 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 21} - - {fileID: 14} + - {fileID: 18} + - {fileID: 12} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 12} - - {fileID: 13} - m_Position: - serializedVersion: 2 - x: 1520 - y: 0 - width: 400 - height: 970 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 117 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneControlsWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 400 - height: 136 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 22} - m_Panes: - - {fileID: 22} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -319,18 +268,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 0 - y: 136 + x: 1520 + y: 0 width: 400 - height: 834 + height: 970 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 23} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 23} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -364,7 +313,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &15 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -401,9 +350,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: c26c0000 m_LastClickedID: 0 - m_ExpandedIDs: a6cffeffb8d4feff9ed6feffcaddfeffe6defeff12e0feff32e1feff90eafeff + m_ExpandedIDs: 20fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -419,7 +368,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -427,7 +376,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &16 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -447,10 +396,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 - y: 90 + x: 2226 + y: 118 width: 1212 - height: 664 + height: 644 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -491,7 +440,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -720,16 +669,16 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 + - dockPosition: 0 + containerId: Floating + floating: 1 collapsed: 0 - displayed: 1 - snapOffset: {x: 48, y: 48} + displayed: 0 + snapOffset: {x: -392.26807, y: -264.45514} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 3 id: AINavigationOverlay - index: 7 + index: 1 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -742,7 +691,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/TrailRenderer - index: 8 + index: 7 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -765,14 +714,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -226.4418, y: -253.85118, z: 861.5535} + m_Target: {x: 963.93134, y: 540.3141, z: 10.1945715} speed: 2 - m_Value: {x: -226.4418, y: -253.85118, z: 861.5535} + m_Value: {x: 963.93134, y: 540.3141, z: 10.1945715} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -800,17 +749,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -818,17 +767,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.14660643, y: -0.091043964, z: 0.015109609, w: 0.9844031} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.14667538, y: -0.091086775, z: 0.015116714, w: 0.984866} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 458.9204 + m_Target: 544.3202 speed: 2 - m_Value: 458.9204 + m_Value: 544.3202 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 0.9452999 m_SpeedNormalized: 0.46999997 @@ -842,112 +791,14 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.028054088, y: -0.89433724, z: -0.056315146, w: -0.44282255} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 306 - y: 90 - width: 1212 - height: 664 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 1 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 2 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 1 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1212 - height: 643 - m_Scale: {x: 0.59537035, y: 0.59537035} - m_Translation: {x: 606, y: 321.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1017.8538 - y: -540 - width: 2035.7076 - height: 1080 - m_MinimalGUI: 1 - m_defaultScale: 0.59537035 - m_LastWindowPixelSize: {x: 1212, y: 664} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1519,7 +1370,7 @@ MonoBehaviour: m_Text: Input (Input Actions) m_Image: {fileID: 0} m_Tooltip: ---- !u!114 &19 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1575,7 +1426,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &20 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1609,7 +1460,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &21 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1654,7 +1505,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1662,16 +1513,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 24070000 - m_LastClickedID: 1828 - m_ExpandedIDs: 000000002406000000ca9a3b + scrollPos: {x: 0, y: 32} + m_SelectedIDs: 466c0000 + m_LastClickedID: 27718 + m_ExpandedIDs: 00000000966b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1699,7 +1550,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002406000074060000 + m_ExpandedIDs: 00000000966b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1755,41 +1606,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &22 -MonoBehaviour: - m_ObjectHideFlags: 52 - 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: 4d0eea65a4b934e48b2b8115dcfbac57, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Localization Scene Controls - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1520 - y: 90 - width: 399 - height: 115 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1810,9 +1627,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1520 - y: 226 + y: 90 width: 399 - height: 813 + height: 949 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1836,3 +1653,103 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 306 + y: 90 + width: 1212 + height: 664 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /home/nicola/Schreibtisch/TalesOfNovariel/Library/PlayModeViewStates/73794f0e7d30a59fe8d0dbd0d2ea0bd5 + m_PlayModeViewName: GameView + m_ShowGizmos: 1 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 1 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1212 + height: 643 + m_Scale: {x: 0.59537035, y: 0.59537035} + m_Translation: {x: 606, y: 321.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1017.8538 + y: -540 + width: 2035.7076 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.59537035 + m_LastWindowPixelSize: {x: 1212, y: 664} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} diff --git a/save.json b/save.json index 87b3896..0669a6b 100644 --- a/save.json +++ b/save.json @@ -1,30 +1,30 @@ { "player": { -"playername": "Nicola", -"maxHealth": 120, -"maxSecondary": 30, -"secondary": 38, -"health": 130, -"strength": 10, +"playername": "", +"maxHealth": 110, +"maxSecondary": 10, +"secondary": 50, +"health": 310, +"strength": 7, "dexterity": 5, "intelligence": 3, -"level": 3, -"experience": 56, -"maxExperience": 80, +"level": 0, +"experience": 0, +"maxExperience": 10, "race": "Human", "role": "Warrior", "points": 0, "healthRegen": 30, "secondaryRegen": 5, "isDodging": "False", -"killcount": 5, -"luck": 26, +"killcount": -1, +"luck": 20, "difficulty": 0 }, "world": { "cityAmount": 5, "maxCityAmount": 5, -"currentTile": "0/0/1", +"currentTile": "0/0/0", "map": { "tile0": "./save/tile0.json" } @@ -33,121 +33,67 @@ "equipment": { "head": "empty", "rightHand": "empty", -"leftHand": { -"rarity": "LEGENDARY", -"place": "LEFTHAND", -"itemName": "Greatshield (legendary)", -"MPR": 3, -"HPR": 3, -"MP": 3, -"HP": 3, -"STR": 3, -"DEX": 3, -"INT": 3, -"LCK": 3 -}, +"leftHand": "empty", "amulet": "empty", "feet": "empty", -"shoulders": "empty", -"chest": { -"rarity": "RARE", -"place": "ARMOR", -"itemName": "Armor of health attribute (rare)", -"HP": 10, -"MP": 8 -}, -"ring": "empty" +"chest": "empty", +"ring": "empty", + }, "bags": { "slot0": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot1": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot2": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot3": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot4": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot5": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot6": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot7": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot8": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot9": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot10": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot11": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot12": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot13": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot14": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot15": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot16": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + }, "slot17": { -"bag1": "empty", -"bag2": "empty", -"bag3": "empty" + } } }, diff --git a/settings.txt b/settings.txt index ffe0945..e3ae56d 100644 --- a/settings.txt +++ b/settings.txt @@ -1,7 +1,7 @@ -Resolution:1 +Resolution:2 Mode:0 Language:de Music:0 Effects:0 SensitivityMouse:1 -SensitivityController:2 \ No newline at end of file +SensitivityController:6.234979 \ No newline at end of file