Skip to content

GitLab

Commit 1c7d38dc authored by Frederic Nicolas Schneider's avatar Frederic Nicolas Schneider
Browse files

smal Buxfixes and Add Resoluton for Android

parent 3ab161ec
Pipeline #3103 waiting for manual action with stages
in 23 minutes and 36 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Assets/Resources.meta deleted 100644 → 0
View file @ 3ab161ec
fileFormatVersion: 2
guid: 78380e81b80d4ba4b8fe2bf39ba75f86
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Animation/Player/Die.anim
View file @ 1c7d38dc
......@@ -21,21 +21,21 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 21300000, guid: 4d230d5868fda24428e56fbdd0cd66fa, type: 3}
- time: 0.2
- time: 0.125
value: {fileID: 21300000, guid: 29b973dd7ecc0ae4f8b05955dc79b812, type: 3}
- time: 0.4
- time: 0.25
value: {fileID: 21300000, guid: 6f25b7c20c10cff43b3a66517327f8f5, type: 3}
- time: 0.6
- time: 0.375
value: {fileID: 21300000, guid: 9cb057f43bc01b74eb4088ef190a2b69, type: 3}
- time: 1
- time: 0.625
value: {fileID: 21300000, guid: 0d9d34bbea0f87d4694b27cb6aa5f086, type: 3}
- time: 1.2
- time: 0.75
value: {fileID: 21300000, guid: f2cf7fedc76de5a4ea7024bf307e1bf0, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 5
m_SampleRate: 8
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
......@@ -61,7 +61,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.4000001
m_StopTime: 0.875
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......@@ -81,7 +81,7 @@ AnimationClip:
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events:
- time: 1.2
- time: 0.75
functionName: AnimEnds
data:
objectReferenceParameter: {fileID: 0}
......
Assets/_Game/Scenes/Level 1.unity
View file @ 1c7d38dc
This diff is collapsed.
Assets/_Game/Scenes/Level 2.unity
View file @ 1c7d38dc
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -747,12 +747,12 @@ PrefabInstance:
- target: {fileID: 19556386157785875, guid: e804e536083fc83499f1ea6ca298f699,
type: 3}
propertyPath: m_LocalPosition.x
value: -4.772993
value: -4.340618
objectReference: {fileID: 0}
- target: {fileID: 19556386157785875, guid: e804e536083fc83499f1ea6ca298f699,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.027786136
value: -0.025270462
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e804e536083fc83499f1ea6ca298f699, type: 3}
......@@ -7714,6 +7714,16 @@ PrefabInstance:
propertyPath: level
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: currentLemmings
value: 7
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: maxLemming
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf18cb00ef043184eb50a0f82e61aba6, type: 3}
--- !u!4 &1353807006 stripped
......@@ -9020,61 +9030,6 @@ PrefabInstance:
propertyPath: m_Name
value: Background
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.x
value: 5.1884933
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.3981559
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.z
value: 6.706999
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3867834897397423627, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].x
......@@ -9130,6 +9085,61 @@ PrefabInstance:
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.x
value: 5.1884933
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.3981559
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.z
value: 6.706999
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8375226316301169767, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6026287475586208035, guid: d7ad169a547d4f449b3a75f5845af2a1,
type: 3}
propertyPath: m_LocalPosition.y
......
Assets/_Game/Scenes/Level 3.unity
View file @ 1c7d38dc
......@@ -16478,26 +16478,6 @@ PrefabInstance:
propertyPath: m_Name
value: Game Manager
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: level
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: maxLemming
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: currentLemmings
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5039903204970821658, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717514, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -16553,6 +16533,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5039903204970821658, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7393841134299425669, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: m_text
......@@ -16595,6 +16580,21 @@ PrefabInstance:
propertyPath: m_textInfo.spaceCount
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: level
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: maxLemming
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6970042148868717515, guid: bf18cb00ef043184eb50a0f82e61aba6,
type: 3}
propertyPath: currentLemmings
value: 7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf18cb00ef043184eb50a0f82e61aba6, type: 3}
--- !u!1001 &899264582
......@@ -17631,12 +17631,12 @@ PrefabInstance:
- target: {fileID: 19556386157785875, guid: e804e536083fc83499f1ea6ca298f699,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -3.3331184
objectReference: {fileID: 0}
- target: {fileID: 19556386157785875, guid: e804e536083fc83499f1ea6ca298f699,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -0.016998947
objectReference: {fileID: 0}
- target: {fileID: 19556386157785875, guid: e804e536083fc83499f1ea6ca298f699,
type: 3}
......@@ -19343,6 +19343,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c88f077fe5d375e468cec39724778166, type: 3}
m_Name:
m_EditorClassIdentifier:
childTile: 0
--- !u!483693784 &1875358047
TilemapRenderer:
m_ObjectHideFlags: 0
......@@ -20046,16 +20047,16 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 8
objectReference: {fileID: 0}
- target: {fileID: 4248358192071150866, guid: dfb1138e6b7a4844ebd523cf63723f2e,
type: 3}
propertyPath: duration
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4248358192071150867, guid: dfb1138e6b7a4844ebd523cf63723f2e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.83
objectReference: {fileID: 0}
- target: {fileID: 4248358192071150866, guid: dfb1138e6b7a4844ebd523cf63723f2e,
type: 3}
propertyPath: duration
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dfb1138e6b7a4844ebd523cf63723f2e, type: 3}
--- !u!1001 &2031574323
......
Assets/_Game/Scripts/Controller_Camera/GroupController.cs
View file @ 1c7d38dc
......@@ -64,7 +64,7 @@ public class GroupController : MonoBehaviour, IKillTarget
ActiveLemmingIndex = 0;
SetActiveLemming(ActiveLemmingIndex);
while (gameManager.getInstance().currentLemmings+3 > gameManager.getInstance().maxLemming)
while (gameManager.getInstance().currentLemmings > gameManager.getInstance().maxLemming)
{
RemoveLemmingFromGroup();
}
......
Assets/_Game/Scripts/GameManager.cs
View file @ 1c7d38dc
......@@ -110,6 +110,11 @@ public class GameManager : MonoBehaviour
private void Start()
{
if(Application.platform == RuntimePlatform.Android)
{
Screen.SetResolution(800, 480, true);
}
groupButton.enabled = false;
actionButton.enabled = false;
fireButton.enabled= UnlockedAbilities["Fire"];
......
ProjectSettings/GraphicsSettings.asset
View file @ 1c7d38dc
......@@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
......
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