Commit ec3bda99 authored by 18손재민's avatar 18손재민

Merge remote-tracking branch 'origin/BS'

# Conflicts:
#	Assets/Data.meta
#	Assets/Models/Animation.meta
#	Assets/Prefabs/UIs.meta
#	Assets/Scripts/Interactors/Mannequin.cs
#	Assets/Scripts/PlayerController.cs
parents cd286c62 8e505385
fileFormatVersion: 2
guid: 3c975d10e31a99e4fa693f64e1afe4b8
guid: 6aaeac95275fd9142a4a0f13fc71837e
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
fileFormatVersion: 2
guid: 6aaeac95275fd9142a4a0f13fc71837e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8117973799670001114
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4099832322368774600}
- component: {fileID: 5465999785063868804}
- component: {fileID: 4600568409270918213}
m_Layer: 5
m_Name: BriefcaseUI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4099832322368774600
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8117973799670001114}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5465999785063868804
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8117973799670001114}
m_CullTransparentMesh: 0
--- !u!114 &4600568409270918213
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8117973799670001114}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
fileFormatVersion: 2
guid: c6f12e53258397c43bfc12d265ce13d0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -181,6 +181,119 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &29245965
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 29245970}
- component: {fileID: 29245969}
- component: {fileID: 29245968}
- component: {fileID: 29245967}
- component: {fileID: 29245966}
m_Layer: 5
m_Name: IngameUIManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &29245966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 29245965}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5368094da13102748bbb05bcf3bda996, type: 3}
m_Name:
m_EditorClassIdentifier:
briefcaseGrid: {fileID: 0}
briefcaseUIPrefab: {fileID: 0}
--- !u!114 &29245967
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 29245965}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &29245968
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 29245965}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &29245969
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 29245965}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &29245970
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 29245965}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!1001 &291381408
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -428,6 +541,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5f15a625122ee354090202ddf9cb0299, type: 3}
m_Name:
m_EditorClassIdentifier:
mannequinMesh:
- {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
- {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
--- !u!65 &540232520
BoxCollider:
m_ObjectHideFlags: 0
......@@ -670,6 +786,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 00412ad71b8f0e14c9a23118682ee6f9, type: 3}
m_Name:
m_EditorClassIdentifier:
floor: {fileID: 0}
--- !u!135 &1034141965
SphereCollider:
m_ObjectHideFlags: 0
......@@ -742,6 +859,72 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1733721345
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1733721348}
- component: {fileID: 1733721347}
- component: {fileID: 1733721346}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1733721346
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733721345}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1733721347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733721345}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1733721348
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733721345}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1966616854
GameObject:
m_ObjectHideFlags: 0
......@@ -852,7 +1035,7 @@ PrefabInstance:
- target: {fileID: 5901026180355857054, guid: bfe2c93abf5421b4a9b142f60d689533,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.3183
value: -0.52
objectReference: {fileID: 0}
- target: {fileID: 5901026180355857054, guid: bfe2c93abf5421b4a9b142f60d689533,
type: 3}
......@@ -862,7 +1045,7 @@ PrefabInstance:
- target: {fileID: 5901026180355857054, guid: bfe2c93abf5421b4a9b142f60d689533,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.49
value: -1.188
objectReference: {fileID: 0}
- target: {fileID: 5901026180355857054, guid: bfe2c93abf5421b4a9b142f60d689533,
type: 3}
......
This diff is collapsed.
fileFormatVersion: 2
guid: 5a6ac0928b41cf64ea0e67fc9218e39b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -6,6 +6,10 @@ public class FakeBullet : Bullet
{
protected override void OnTriggerEnter(Collider other)
{
//TODO : if mirror, break mirror and make objects
}
if (other.GetComponent<IBulletInteractor>() != null)
{
other.GetComponent<IBulletInteractor>().Interact(this);
}
Destroy(gameObject);
}
}
......@@ -6,6 +6,10 @@ public class MirrorBullet : Bullet
{
protected override void OnTriggerEnter(Collider other)
{
//If wall, make a new mirror on the wall
}
if (other.GetComponent<IBulletInteractor>() != null)
{
other.GetComponent<IBulletInteractor>().Interact(this);
}
Destroy(gameObject);
}
}
\ No newline at end of file
......@@ -10,9 +10,9 @@ public class TruthBullet : Bullet
{
other.GetComponent<IBreakable>().Break();
}
else if (other.GetComponent<IInteractor>() != null)
else if (other.GetComponent<IBulletInteractor>() != null)
{
other.GetComponent<IInteractor>().Interact(this);
other.GetComponent<IBulletInteractor>().Interact(this);
}
Destroy(gameObject);
}
......
fileFormatVersion: 2
guid: 474265907ab450e4f9441a7c7d59cf8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public static class Vector2IntExtensions
{
public static bool IsInSquareArea(this Vector2Int a, Vector2Int b, int size)
{
return Mathf.Abs(a.x - b.x) <= size && Mathf.Abs(a.y - b.y) <= size;
}
public static int ManhattanDistance(this Vector2Int a, Vector2Int b)
{
return Mathf.Abs(a.x - b.x) + Mathf.Abs(a.y - b.y);
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 5363adbaf4d2c0641a9702aabc77f52c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Briefcase : MonoBehaviour, IPlayerInteractor
{
[SerializeField]
private Floor floor = null;
public Vector2Int Position { get { return floor != null ? floor.mapPos : throw new UnassignedReferenceException("Floor of Interactor is not assigned"); } }
public void Init(Floor floor)
{
this.floor = floor;
PlayerController.inst.OnPlayerMove += Interact;
}
public void Interact(Vector2Int position)
{
Debug.Log(Position + " " + position);
if (Position == position)
{
IngameManager.inst.BriefcaseCount++;
Destroy(gameObject);
}
}
}
fileFormatVersion: 2
guid: 821171481de43df46b274296d8061cb5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -2,10 +2,29 @@
using System.Collections.Generic;
using UnityEngine;
public class CameraTurret : MonoBehaviour, IBreakable
public class CameraTurret : MonoBehaviour, IBreakable, IPlayerInteractor
{
[SerializeField]
private Floor floor = null;
public Vector2Int Position { get { return floor != null ? floor.mapPos : throw new UnassignedReferenceException("Floor of Interactor is not assigned"); } }
public void Init(Floor floor)
{
this.floor = floor;
PlayerController.inst.OnPlayerMove += Interact;
}
public void Break()
{
Destroy(gameObject);
}
public void Interact(Vector2Int pos)
{
if (Position.IsInSquareArea(pos, 1))
{
Debug.Log("Stage Restart!");
//TODO : Restart Level
}
}
}
......@@ -2,7 +2,12 @@
using System.Collections.Generic;
using UnityEngine;
public interface IInteractor
public interface IBulletInteractor
{
void Interact(Bullet bullet);
}
public interface IPlayerInteractor
{
void Interact(Vector2Int position);
}
\ No newline at end of file
......@@ -2,55 +2,50 @@
using System.Collections.Generic;
using UnityEngine;
public class Mannequin : MonoBehaviour, IInteractor
public class Mannequin : MonoBehaviour, IBulletInteractor
{
// 일단은 이렇게 해두긴 하는데 나중에 마네킹 매니저같은게 생기면 거기에 두고 쓰는게 편할듯
public Material white;
public Material black;
public bool isWhite;
private SkinnedMeshRenderer[] _mats;
private void Start()
{
_mats = GetComponentsInChildren<SkinnedMeshRenderer>();
[SerializeField]
private Mesh[] mannequinMesh = new Mesh[2];
private Color _color;
public Color Color {
get
{
return _color;
}
private set
{
if (value == Color.black)
{
GetComponent<MeshFilter>().mesh = mannequinMesh[0];
//Change mesh to black mannequin
}
else if (value == Color.white)
{
GetComponent<MeshFilter>().mesh = mannequinMesh[1];
//Change mesh to white mannequin
}
else
{
Debug.LogWarning("Invalid color input");
}
_color = value;
}
}
//public Color Color {
// get
// {
// return GetComponent<MeshRenderer>().material.color;
// }
// private set
// {
// GetComponent<MeshRenderer>().material.color = value;
// }
//}
public void Interact(Bullet bullet)
{
if (bullet is TruthBullet)
{
//GetComponent<MeshRenderer>().material.color = Color.white;
isWhite = true;
foreach (var mat in _mats)
mat.material = white;
Color = Color.white;
}
if (bullet is FakeBullet)
{
//GetComponent<MeshRenderer>().material.color = Color.black;
isWhite = false;
foreach (var mat in _mats)
mat.material = black;
Color = Color.black;
}
}
public void Init(bool isWhite)
{
//Color = isWhite ? Color.white : Color.black;
this.isWhite = isWhite;
foreach (var mat in _mats)
mat.material = isWhite ? white : black;
Color = isWhite ? Color.white : Color.black;
}
}
......@@ -3,7 +3,7 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
public class Mirror : MonoBehaviour, IInteractor, IBreakable
public class Mirror : MonoBehaviour, IBulletInteractor, IBreakable
{
private Camera camera;
private RenderTexture rt;
......
......@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
public class NormalWall : MonoBehaviour, IInteractor
public class NormalWall : MonoBehaviour, IBulletInteractor
{
public void Interact(Bullet bullet)
{
......
fileFormatVersion: 2
guid: e31b766c78dd4084ea268dce5ba8df43
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System.Linq;
public class GameManager : SingletonBehaviour<GameManager>
{
/*
private List<IPlayerInteractor> playerInteractors;
public void UpdateInteractorList()
{
playerInteractors = FindObjectsOfType<MonoBehaviour>().OfType<IPlayerInteractor>().ToList();
}
public void AddInteractor()
{
}
public void TriggerPlayerInteractors(Vector2Int pos)
{
foreach (var interactor in playerInteractors)
{
interactor.Interact(pos);
}
}
*/
}
fileFormatVersion: 2
guid: f94477ce50cfef746baa12d77bb9d4eb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class IngameManager : SingletonBehaviour<IngameManager>
{
private int _briefcaseCount = 0;
public int BriefcaseCount {
get { return _briefcaseCount; }
set {
for (int i = 0; i < value - _briefcaseCount; ++i)
{
IngameUIManager.inst.AddBriefcaseUI();
}
for (int i = 0; i < _briefcaseCount - value; ++i)
{
//RemoveBriefcaseUI();
}
_briefcaseCount = value;
}
}
}
fileFormatVersion: 2
guid: 8995125956e2a254c9d8a0fcd0e7555c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class IngameUIManager : SingletonBehaviour<IngameUIManager>
{
public RectTransform briefcaseGrid;
public GameObject briefcaseUIPrefab;
public void AddBriefcaseUI()
{
Instantiate(briefcaseUIPrefab, briefcaseGrid);
}
public void UpdateBriefcaseUI()
{
//TODO : Add briefcase Marker
}
}
fileFormatVersion: 2
guid: 5368094da13102748bbb05bcf3bda996
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
......@@ -7,16 +8,36 @@ public class PlayerController : SingletonBehaviour<PlayerController>
{
public Player currentPlayer;
public bool isPlayerMoving;
private Vector2Int prePos;
public Vector2Int MapPos
{
get
{
Vector2Int pos = Vector2Int.zero;
pos.x = Mathf.RoundToInt(transform.position.x);
pos.y = Mathf.RoundToInt(transform.position.y);
return pos;
}
}
public event Action<Vector2Int> OnPlayerMove;
// Start is called before the first frame update
void Start()
{
prePos = MapPos;
}
// Update is called once per frame
void Update()
{
if (prePos != MapPos)
{
Debug.Log(MapPos);
OnPlayerMove?.Invoke(MapPos);
prePos = MapPos;
}
if (Input.GetMouseButtonDown(0) && !isPlayerMoving)
{
Ray mouseRay = Camera.main.ScreenPointToRay(Input.mousePosition);
......
......@@ -29,9 +29,16 @@ QualitySettings:
vSyncCount: 0
lodBias: 0.3
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 4
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
......@@ -57,9 +64,16 @@ QualitySettings:
vSyncCount: 0
lodBias: 0.4
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 16
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
......@@ -85,9 +99,16 @@ QualitySettings:
vSyncCount: 1
lodBias: 0.7
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 64
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
......@@ -113,9 +134,16 @@ QualitySettings:
vSyncCount: 1
lodBias: 1
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 256
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
......@@ -141,9 +169,16 @@ QualitySettings:
vSyncCount: 1
lodBias: 1.5
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 1024
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- serializedVersion: 2
......@@ -169,22 +204,16 @@ QualitySettings:
vSyncCount: 1
lodBias: 2
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 4096
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
m_PerPlatformDefaultQuality:
Android: 2
Nintendo 3DS: 5
Nintendo Switch: 5
PS4: 5
PSP2: 2
Standalone: 5
Tizen: 2
WebGL: 3
WiiU: 5
Windows Store Apps: 5
XboxOne: 5
iPhone: 2
tvOS: 2
m_PerPlatformDefaultQuality: {}
......@@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
m_Enabled: 0
m_Enabled: 1
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
......
Markdown is supported
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