Commit e3323487 authored by Domm29's avatar Domm29
Browse files

Merge branch 'Max' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling into Dominik

# Conflicts:
#	ProjectSettings/TagManager.asset
parent f0835144
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Users\Dominik\.Rider2019.1\system\extResources" t="IncludeRecursive" />
<e p="C:\Users\Dominik\.Rider2019.1\system\resharper-host\local\Transient\ReSharperHost\v191\SolutionCaches\_seedling.1686364454.00" t="ExcludeRecursive" />
<e p="C:\Users\Dominik\Documents\seedling" t="IncludeRecursive">
<e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
<e p="Assets" t="Include">
<e p="Scripts" t="Include">
<e p="AudioManager.cs" t="Include" />
<e p="Character.cs" t="Include" />
<e p="DamageTestScript.cs" t="Include" />
<e p="Player" t="Include">
<e p="InputManager.cs" t="Include" />
<e p="Player.cs" t="Include" />
</e>
<e p="SceneManager.cs" t="Include" />
<e p="UI_Health.cs" t="Include" />
</e>
</e>
<e p="obj" t="ExcludeRecursive" />
<e p="Packages" t="ExcludeRecursive" />
<e p="seedling.sln" t="IncludeFlat" />
<e p="Temp\bin" t="ExcludeRecursive" />
</e>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelUserStore">
<attachedFolders />
<explicitIncludes>
<Path>Library/PackageCache/com.unity.ads@2.0.8</Path>
<Path>Library/PackageCache/com.unity.analytics@3.3.2</Path>
<Path>Library/PackageCache/com.unity.collab-proxy@1.2.16</Path>
<Path>Library/PackageCache/com.unity.purchasing@2.0.6</Path>
<Path>Library/PackageCache/com.unity.textmeshpro@2.0.0</Path>
<Path>Packages</Path>
<Path>ProjectSettings</Path>
</explicitIncludes>
<explicitExcludes>
<Path>.git</Path>
<Path>.idea</Path>
<Path>.vs</Path>
<Path>Library</Path>
<Path>Logs</Path>
<Path>Temp</Path>
</explicitExcludes>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.seedling/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.seedling/riderModule.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="733d3c65-0808-4521-9eb8-db65378fcec2" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Player/Player.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="14" column="28" lean-forward="true" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<folding>
<marker date="1559225917861" expanded="true" signature="6:78" ph="..." />
<marker date="1559225917861" expanded="true" signature="111:409" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="309:322" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="341:354" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="386:407" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Player/Player.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Assets/Scripts/Player/Player.cs" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="170" />
<option name="y" value="91" />
<option name="width" value="1026" />
<option name="height" value="546" />
</component>
<component name="ProjectView">
<navigator currentView="UnityExplorer" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AssemblyExplorer" />
<pane id="UnityExplorer">
<option name="show-hidden-items" value="false" />
<option name="show-project-names" value="true" />
</pane>
<pane id="SolutionExplorer">
<option name="show-all-files" value="false" />
</pane>
<pane id="FileSystemExplorer" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="Discover.Launch.Via.Unity" value="true" />
<property name="Rider.DefaultBreakpoints.AreToggled" value="true" />
<property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="userSelectedPid" value="false" />
<method v="2" />
</configuration>
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="userSelectedPid" value="false" />
<method v="2" />
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="733d3c65-0808-4521-9eb8-db65378fcec2" name="Default Changelist" comment="" />
<created>1559225649697</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1559225649697</updated>
<workItem from="1559225707665" duration="462000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="462000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="170" y="91" width="1026" height="546" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24948241" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="NuGet" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Unit Tests" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Performance Profiler" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Errors In Solution" />
<window_info anchor="right" id="Database" />
<window_info anchor="right" id="Unit Tests Coverage" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="true" />
<component name="UnityUnitTestConfiguration" currentTestLauncher="NUnit" />
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<breakpoint enabled="true" suspend="NONE" type="DotNet Exception Breakpoints">
<properties exception="System.Threading.ThreadAbortException" displayValue="System.Threading.ThreadAbortException" />
<option name="timeStamp" value="1" />
</breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Player/Player.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="14" column="28" lean-forward="true" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<folding>
<marker date="1559225917861" expanded="true" signature="6:78" ph="..." />
<marker date="1559225917861" expanded="true" signature="111:409" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="309:322" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="341:354" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="386:407" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../.." />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
fileFormatVersion: 2
guid: e86e0b261769faa4f911ea200102aa20
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 63c0bc6818fbdd64ca4aa6906ec231e7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e2288795a2a07334d82dc7bed0308ccf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5d6cebcf03fb81440893c5ede421b959
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: 672ea468ca7d59448b6472e17782e268
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -291,6 +291,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Size.x
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_Size.y
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: 264577551908436771, guid: a1e0107a2375e1140a669c1da0647f9a,
type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1e0107a2375e1140a669c1da0647f9a, type: 3}
--- !u!1 &2142912997
......
......@@ -9,6 +9,7 @@ public class Player : Character
private bool b_crouch = false;
//hook
public bool isSwinging;
public Vector2 ropeHook;
......@@ -27,5 +28,4 @@ public class Player : Character
{
}
}
\ No newline at end of file
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class UI_Health : MonoBehaviour
{
public Image leaf1;
public Image leaf2;
public Image leaf3;
public GameObject playerObject;
private int startHealth;
private GameObject hudCanvas;
private void Awake()
{
hudCanvas = GameObject.Find("Hud Canvas");
}
private void Start()
{
//healthBar = hudCanvas.transform.GetChild(1).transform.GetChild(0).GetComponent<Image>();
//playerObject = GameObject.Find("PlayerManager");
// startHealth = playerObject.GetComponent<Scr_PlayerStats>().playerLife;
showHealth();
}
public void showHealth()
{
//healthBar.fillAmount = playerObject.GetComponent<Scr_PlayerStats>().playerLife / startHealth;
}
}
fileFormatVersion: 2
guid: b5f394753a60eb649a49d4bc92ff65e3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -8,14 +8,18 @@ EditorSettings:
m_SerializationMode: 2
m_LineEndingsForNewScripts: 2
m_DefaultBehaviorMode: 1
m_PrefabRegularEnvironment: {fileID: 0}
m_PrefabUIEnvironment: {fileID: 0}
m_SpritePackerMode: 4
m_SpritePackerPaddingPower: 1
m_EtcTextureCompressorBehavior: 1
m_EtcTextureFastCompressor: 1
m_EtcTextureNormalCompressor: 2
m_EtcTextureBestCompressor: 4
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef
m_ProjectGenerationRootNamespace:
m_UserGeneratedProjectSuffix:
m_CollabEditorSettings:
inProgressEnabled: 1
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 1
......@@ -36,7 +36,7 @@ TagManager:
-
-
-
-
- test damage
m_SortingLayers:
- name: Default
uniqueID: 0
......
B<!DOCTYPE html>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment