Commit e565361e authored by Rene's avatar Rene

Merge branch 'work' of...

Merge branch 'work' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/explosive-temper into work
parents 5d17f99b cff36064
......@@ -6351,6 +6351,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: yMaxHoehe
......@@ -6371,6 +6376,11 @@ PrefabInstance:
propertyPath: LevelTimeLimit
value: 120
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[0]
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 655c31af15390a04b9e81f860a5652ad, type: 3}
--- !u!4 &1243012736 stripped
......
This diff is collapsed.
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571334, b: 0.3069219, a: 1}
m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -181,7 +181,7 @@ PrefabInstance:
- target: {fileID: 2538585548309394087, guid: c7fce6ae8c8f6c4c68e4eb23d70aa6f8,
type: 3}
propertyPath: m_LocalPosition.x
value: 16
value: 16.5
objectReference: {fileID: 0}
- target: {fileID: 2538585548309394087, guid: c7fce6ae8c8f6c4c68e4eb23d70aa6f8,
type: 3}
......@@ -983,12 +983,12 @@ PrefabInstance:
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.85
value: -4.85
objectReference: {fileID: 0}
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
propertyPath: m_LocalPosition.y
value: 7.85
value: 8.85
objectReference: {fileID: 0}
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
......@@ -3672,12 +3672,12 @@ PrefabInstance:
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
propertyPath: m_LocalPosition.x
value: 6
value: 7
objectReference: {fileID: 0}
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
propertyPath: m_LocalPosition.y
value: -5
value: -4
objectReference: {fileID: 0}
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
......@@ -4969,14 +4969,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1433885274362733645, guid: ca95ab9111487384891d803db2e75b67,
- target: {fileID: 1433885273798513686, guid: ca95ab9111487384891d803db2e75b67,
type: 3}
propertyPath: speed
propertyPath: m_LocalPosition.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1433885273798513686, guid: ca95ab9111487384891d803db2e75b67,
- target: {fileID: 1433885274362733645, guid: ca95ab9111487384891d803db2e75b67,
type: 3}
propertyPath: m_LocalPosition.x
propertyPath: speed
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
......@@ -5239,12 +5239,12 @@ PrefabInstance:
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.85
value: -4.85
objectReference: {fileID: 0}
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
propertyPath: m_LocalPosition.y
value: 8.85
value: 9.85
objectReference: {fileID: 0}
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
......@@ -5806,6 +5806,26 @@ PrefabInstance:
value:
objectReference: {fileID: 2160690945321569126, guid: fe79a1688bb4bc345a192ec9451ef8bf,
type: 3}
- target: {fileID: 2707152133387111790, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2707152133387111790, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.y
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2707152133282648010, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.x
value: -8.9
objectReference: {fileID: 0}
- target: {fileID: 2707152133282648010, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.8
objectReference: {fileID: 0}
- target: {fileID: 2707152133282648011, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_BackGroundColor.r
......@@ -5826,26 +5846,6 @@ PrefabInstance:
propertyPath: m_ClearFlags
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2707152133282648010, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.x
value: -8.9
objectReference: {fileID: 0}
- target: {fileID: 2707152133282648010, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.8
objectReference: {fileID: 0}
- target: {fileID: 2707152133387111790, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2707152133387111790, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_LocalPosition.y
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5, type: 3}
--- !u!1 &1153599346
......@@ -7454,12 +7454,12 @@ PrefabInstance:
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
propertyPath: m_LocalPosition.x
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
propertyPath: m_LocalPosition.y
value: -5
value: -4
objectReference: {fileID: 0}
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
......@@ -9625,12 +9625,12 @@ PrefabInstance:
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.85
value: -4.85
objectReference: {fileID: 0}
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
propertyPath: m_LocalPosition.y
value: 9.85
value: 10.85
objectReference: {fileID: 0}
- target: {fileID: 8517243535879592964, guid: 5df05c0633a5dd64c882e42408b75dac,
type: 3}
......@@ -9725,7 +9725,7 @@ PrefabInstance:
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
propertyPath: m_LocalPosition.y
value: -6
value: -5
objectReference: {fileID: 0}
- target: {fileID: 2538585548309394087, guid: 9414143b820e3794a8248155c9fbf1f2,
type: 3}
......@@ -11012,10 +11012,15 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: LevelTimeLimit
value: 120
value: 150
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
......@@ -11037,6 +11042,26 @@ PrefabInstance:
propertyPath: yMinHoehe
value: 3.5
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[0]
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[1]
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[2]
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4412409797423783345, guid: 655c31af15390a04b9e81f860a5652ad,
type: 3}
propertyPath: availableBombs.Array.data[3]
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 655c31af15390a04b9e81f860a5652ad, type: 3}
--- !u!1001 &5087871263228485405
......
fileFormatVersion: 2
guid: 22b50696c7e74294187ebd3a1ca35078
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -22,6 +22,7 @@ public class GameManager : MonoBehaviour
public bool withoutTimer = false; //Bomben explodieren nicht nach ihren Timer
[SerializeField] private bool localSceneManager = false;
public float LevelTimeLimit = 10;
public Globals.BombType[] availableBombs;
public BombSelector bombSelector;
[SerializeField] private Camera mainCamera;
......@@ -64,6 +65,12 @@ public class GameManager : MonoBehaviour
//Debug.Log("SetRespawnImmediately: " + value);
}
public void SetLevelInformation(LevelInformation info)
{
LevelTimeLimit = info.LevelTimeLimit;
availableBombs = info.availableBombs;
}
public void StartGame() {
Spawn();
PauseGame(false);
......
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Global;
public class LevelInformation : MonoBehaviour
{
......@@ -9,4 +10,5 @@ public class LevelInformation : MonoBehaviour
public float yMinHoehe = -50f;
public float xMaxHoehe = 50f;
public float xMinHoehe = -50f;
public Globals.BombType[] availableBombs;
}
fileFormatVersion: 2
guid: f0e626d655663b54cace9c8ac40de916
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -14,6 +14,8 @@ public class BombButton : MyButton
private Image normalImage;
public bool Selected = false;
private bool enabled = true;
void Start()
{
GetComponent<Button>().onClick.AddListener(() => Click());
......@@ -23,6 +25,12 @@ public class BombButton : MyButton
}
}
public void SetEnabled(bool value)
{
SetEnabledOverlay(value);
enabled = value;
}
// Update is called once per frame
public Global.Globals.BombType GetBombType()
......@@ -32,6 +40,9 @@ public class BombButton : MyButton
public void Click()
{
GameManager.Instance.HudController.SetSelectedBomb(this);
if (enabled)
{
GameManager.Instance.HudController.SetSelectedBomb(this);
}
}
}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System;
using UnityEngine.UI;
using System;
using Global;
public class BombSelection : MonoBehaviour
{
......@@ -13,6 +12,10 @@ public class BombSelection : MonoBehaviour
BombButton selectedButton;
[SerializeField] private TimeSelectSlider slider;
[SerializeField] private Button launchButton;
[SerializeField] private BombButton casual;
[SerializeField] private BombButton water;
[SerializeField] private BombButton fire;
[SerializeField] private BombButton rocket;
private float usedTime;
private float calculatedTimeInSec;
......@@ -66,6 +69,30 @@ public class BombSelection : MonoBehaviour
public void Init()
{
setUsedTime(0);
casual.SetEnabled(false);
water.SetEnabled(false);
fire.SetEnabled(false);
rocket.SetEnabled(false);
Globals.BombType[] availableBombs = GameManager.Instance.availableBombs;
for (int i = 0; i < availableBombs.Length; i++)
{
switch (availableBombs[i])
{
case Globals.BombType.CasualBomb :
casual.SetEnabled(true);
break;
case Globals.BombType.Wasserfest :
water.SetEnabled(true);
break;
case Globals.BombType.Feuerfest :
fire.SetEnabled(true);
break;
case Globals.BombType.Rocket :
rocket.SetEnabled(true);
break;
}
}
}
private void ValueChangeCheck()
......
......@@ -222,7 +222,7 @@ public class HUDController : MonoBehaviour
public void onSceneLoaded(Scene scene, LoadSceneMode mode)
{
SceneManager.sceneLoaded -= onSceneLoaded;
gameManager.LevelTimeLimit = GameObject.FindGameObjectWithTag("Respawn").GetComponent<LevelInformation>().LevelTimeLimit;
gameManager.SetLevelInformation(GameObject.FindGameObjectWithTag("Respawn").GetComponent<LevelInformation>());
InitBombSelection();
ActivateBombSelection();
}
......
......@@ -12,6 +12,7 @@ public class MyButton : MonoBehaviour
public Text text;
private string value;
public Image selectionOverlay;
public Image disableOverlay;
// Start is called before the first frame update
void Start()
......@@ -25,4 +26,13 @@ public class MyButton : MonoBehaviour
selectionOverlay.gameObject.SetActive(select);
}
}
public void SetEnabledOverlay(bool enable)
{
if (disableOverlay != null)
{
disableOverlay.gameObject.SetActive(!enable);
}
}
}
......@@ -536,7 +536,7 @@ GameObject:
- component: {fileID: 5290580658490923436}
- component: {fileID: 7280364207647481675}
m_Layer: 5
m_Name: Panel
m_Name: BombsPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -1068,7 +1068,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
slider: {fileID: 6246056141170644964}
launchButton: {fileID: 5520277152199466356}
MaxTime: 10
casual: {fileID: 6760151830514557376}
water: {fileID: 7438857972880612366}
fire: {fileID: 4965478729296520511}
rocket: {fileID: 7875942735875440920}
--- !u!95 &6809694157640525711
Animator:
serializedVersion: 3
......@@ -1360,11 +1363,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Fire
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -1475,6 +1473,11 @@ PrefabInstance:
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Fire
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreferredHeight
......@@ -1554,6 +1557,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 5493759835647372881}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4965478729296520511 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 636465422743096174, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
m_PrefabInstance: {fileID: 5493759835647372881}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b4ab538ae0cdfd84da46037997018a21, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &5634736071893045499
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1636,10 +1651,40 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Casual
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.x
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.y
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.z
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
......@@ -1761,6 +1806,11 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Casual
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreferredHeight
......@@ -1791,11 +1841,6 @@ PrefabInstance:
propertyPath: m_FlexibleWidth
value: 1
objectReference: {fileID: 0}
- target: {fileID: 636465422743096174, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: BombType
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4558080732912568387, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreserveAspect
......@@ -1842,6 +1887,11 @@ PrefabInstance:
propertyPath: m_Colors.m_PressedColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3940267594205183388, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f20bec1d9a427542af5d6c88d43bc9c, type: 3}
--- !u!224 &1381255078203642501 stripped
......@@ -1850,6 +1900,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6126531205479082670}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6760151830514557376 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 636465422743096174, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
m_PrefabInstance: {fileID: 6126531205479082670}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b4ab538ae0cdfd84da46037997018a21, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &7321117821298494070
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -1857,11 +1919,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Rocket
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -1982,6 +2039,11 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Rocket
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreferredHeight
......@@ -2071,6 +2133,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 7321117821298494070}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7875942735875440920 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 636465422743096174, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
m_PrefabInstance: {fileID: 7321117821298494070}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b4ab538ae0cdfd84da46037997018a21, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8063989835918628704
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -2078,11 +2152,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Water
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -2198,20 +2267,10 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMax.y