1
Fork 0
mirror of https://github.com/Steffo99/gravity-fusion.git synced 2024-11-22 00:14:18 +00:00
This commit is contained in:
Maxim Lobovsky 2019-10-07 16:41:47 +02:00
commit 0fc6ce3c0f
21 changed files with 605 additions and 42 deletions

View file

@ -13,7 +13,32 @@ AnimationClip:
m_UseHighQualityCurve: 1 m_UseHighQualityCurve: 1
m_RotationCurves: [] m_RotationCurves: []
m_CompressedRotationCurves: [] m_CompressedRotationCurves: []
m_EulerCurves: [] m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 360}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 30
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Aura
m_PositionCurves: [] m_PositionCurves: []
m_ScaleCurves: [] m_ScaleCurves: []
m_FloatCurves: [] m_FloatCurves: []
@ -27,7 +52,7 @@ AnimationClip:
script: {fileID: 0} script: {fileID: 0}
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300000, guid: ab3f4553d6bf2b242be8e8ce993da26e, type: 3} value: {fileID: 21300000, guid: e12ad02d88fac2d42912da985d96256e, type: 3}
attribute: m_Sprite attribute: m_Sprite
path: Aura path: Aura
classID: 212 classID: 212
@ -46,6 +71,13 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant: m_ClipBindingConstant:
genericBindings: genericBindings:
- serializedVersion: 2
path: 2003435589
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 0 path: 0
attribute: 0 attribute: 0
@ -69,14 +101,14 @@ AnimationClip:
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300000, guid: a09c27e32b0cedd4ba6fae57f2d7d08b, type: 3} - {fileID: 21300000, guid: a09c27e32b0cedd4ba6fae57f2d7d08b, type: 3}
- {fileID: 21300000, guid: ab3f4553d6bf2b242be8e8ce993da26e, type: 3} - {fileID: 21300000, guid: e12ad02d88fac2d42912da985d96256e, type: 3}
- {fileID: 0} - {fileID: 0}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 0.016666668 m_StopTime: 30
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
@ -91,8 +123,122 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0 m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0 m_HeightFromFeet: 0
m_Mirror: 0 m_Mirror: 0
m_EditorCurves: [] m_EditorCurves:
m_EulerEditorCurves: [] - curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 30
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: Aura
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 30
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: Aura
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 360
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 30
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: Aura
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Aura
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Aura
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Aura
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0
m_Events: [] m_Events: []

View file

@ -11,7 +11,7 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 3299165908801264640} m_State: {fileID: 3299165908801264640}
m_Position: {x: 200, y: 0, z: 0} m_Position: {x: 240, y: 80, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

View file

@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class BigBang : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c376f1674be0b92429fb7196da95ecc1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -68,6 +68,9 @@ public class GameController : MonoBehaviour
public int maxTierPresent; public int maxTierPresent;
[Header("References")] [Header("References")]
[HideInInspector]
public UpgradePanel upgradePanel;
[HideInInspector] [HideInInspector]
public SpawnOnMouseClick spawner; public SpawnOnMouseClick spawner;
@ -86,8 +89,6 @@ public class GameController : MonoBehaviour
[HideInInspector] [HideInInspector]
public BlackHole blackHole; public BlackHole blackHole;
[HideInInspector]
public GameObject upgradePanel;
protected void Awake() { protected void Awake() {
spawner = Camera.main.GetComponent<SpawnOnMouseClick>(); spawner = Camera.main.GetComponent<SpawnOnMouseClick>();
@ -97,7 +98,7 @@ public class GameController : MonoBehaviour
simulatedObjects = new List<Gravitation>(); simulatedObjects = new List<Gravitation>();
canvas = GameObject.FindGameObjectWithTag("Canvas").GetComponent<Canvas>(); canvas = GameObject.FindGameObjectWithTag("Canvas").GetComponent<Canvas>();
blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent<BlackHole>(); blackHole = GameObject.FindGameObjectWithTag("BlackHole").GetComponent<BlackHole>();
upgradePanel = GameObject.FindGameObjectWithTag("UpgradePanel"); upgradePanel = GameObject.FindGameObjectWithTag("UpgradePanel").GetComponent<UpgradePanel>();
} }
protected void Start() { protected void Start() {

View file

@ -43,6 +43,9 @@ public class Particle : MonoBehaviour {
animator.runtimeAnimatorController = gameController.tierAnimation[_tier % gameController.tierAnimation.Length]; animator.runtimeAnimatorController = gameController.tierAnimation[_tier % gameController.tierAnimation.Length];
hue.PossibleColors = gameController.tierGradients[_tier % gameController.tierGradients.Length]; hue.PossibleColors = gameController.tierGradients[_tier % gameController.tierGradients.Length];
gameController.CheckNewMaxTier(_tier); gameController.CheckNewMaxTier(_tier);
mainRenderer.rendererPriority = _tier;
auraRenderer.rendererPriority = _tier;
detailsRenderer.rendererPriority = _tier;
disappear.ResetTimer(); disappear.ResetTimer();
} }
} }

View file

@ -20,13 +20,13 @@ public class PushOnMouseClick : MonoBehaviour
protected void Update() protected void Update()
{ {
if(!gameController.upgradePanel.activeSelf && Input.GetMouseButton(mouseButton)) { if(!gameController.upgradePanel.gameObject.activeSelf && Input.GetMouseButton(mouseButton)) {
Vector3 mousePosition = GetWorldMousePosition(); Vector3 mousePosition = GetWorldMousePosition();
Collider2D[] affected = Physics2D.OverlapCircleAll(mousePosition, pushRadius); Collider2D[] affected = Physics2D.OverlapCircleAll(mousePosition, pushRadius);
foreach(Collider2D collider in affected) { foreach(Collider2D collider in affected) {
float distance = Vector3.Distance(mousePosition, collider.transform.position); float distance = Vector3.Distance(mousePosition, collider.transform.position);
Vector2 direction = (collider.transform.position - mousePosition).normalized; Vector2 direction = (collider.transform.position - mousePosition).normalized;
collider.attachedRigidbody?.AddForce(direction * pushForce / Mathf.Pow(distance, 2)); collider.attachedRigidbody?.AddForce(direction * pushForce / distance);
} }
} }
} }

View file

@ -22,7 +22,7 @@ public class SpawnOnMouseClick : MonoBehaviour
void Update() void Update()
{ {
if(!gameController.upgradePanel.activeSelf && Input.GetMouseButtonDown(mouseButton)) { if(!gameController.upgradePanel.gameObject.activeSelf && Input.GetMouseButtonDown(mouseButton)) {
Vector3 mousePosition = GetWorldMousePosition(); Vector3 mousePosition = GetWorldMousePosition();
for(int i = 0; i < spawnCount; i++) { for(int i = 0; i < spawnCount; i++) {
GameObject particleObject = Instantiate(gameController.particlePrefab, new Vector3(mousePosition.x, mousePosition.y, 0f), Quaternion.identity); GameObject particleObject = Instantiate(gameController.particlePrefab, new Vector3(mousePosition.x, mousePosition.y, 0f), Quaternion.identity);

View file

@ -0,0 +1,7 @@
using UnityEngine;
public class UpgradePanel : MonoBehaviour {
public void Start() {
gameObject.SetActive(false);
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 252ca2c1ac2c3174fb94e2bf31456d1b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 20 KiB

BIN
Assets/Media/unity_icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 KiB

View file

@ -0,0 +1,91 @@
fileFormatVersion: 2
guid: 701648e6e9c182d47a63632d3e686f5b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
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
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -304,7 +304,8 @@ MonoBehaviour:
particlesToMerge: 5 particlesToMerge: 5
scaleMultiplier: 3 scaleMultiplier: 3
particleDurationConstant: 5 particleDurationConstant: 5
blackHolePrefab: {fileID: 0} blackHolePrefab: {fileID: 2084275844800580026, guid: d2ff0823532914e4a8f5ecd0efc2a146,
type: 3}
particlePrefab: {fileID: 5473375028011702754, guid: e73d8e05bd7498c4a80a63094f4594a8, particlePrefab: {fileID: 5473375028011702754, guid: e73d8e05bd7498c4a80a63094f4594a8,
type: 3} type: 3}
tierGradients: tierGradients:
@ -486,10 +487,10 @@ MonoBehaviour:
upgradePushForce: upgradePushForce:
- 0 - 0
- 100 - 100
- 1000 - 500
- 2500
- 5000
- 10000 - 10000
- 100000
- 1000000
upgradePushRadius: upgradePushRadius:
- 0 - 0
- 3 - 3
@ -504,13 +505,13 @@ MonoBehaviour:
_levelFission: 0 _levelFission: 0
simulatedObjects: [] simulatedObjects: []
maxTierPresent: 0 maxTierPresent: 0
upgradePanel: {fileID: 0}
spawner: {fileID: 0} spawner: {fileID: 0}
pusher: {fileID: 0} pusher: {fileID: 0}
panner: {fileID: 0} panner: {fileID: 0}
musicManager: {fileID: 0} musicManager: {fileID: 0}
canvas: {fileID: 0} canvas: {fileID: 0}
blackHole: {fileID: 0} blackHole: {fileID: 0}
upgradePanel: {fileID: 0}
--- !u!114 &1086337020 --- !u!114 &1086337020
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -63,7 +63,7 @@ Camera:
far clip plane: 1000 far clip plane: 1000
field of view: 60 field of view: 60
orthographic: 1 orthographic: 1
orthographic size: 5 orthographic size: 8
m_Depth: -1 m_Depth: -1
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
@ -99,7 +99,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6c6157b8c0c98584db4becc892a8f6fd, type: 3} m_Script: {fileID: 11500000, guid: 6c6157b8c0c98584db4becc892a8f6fd, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
gameController: {fileID: 0}
mouseButton: 0 mouseButton: 0
spawnedTier: 0 spawnedTier: 0
spawnCount: 1 spawnCount: 1
@ -116,7 +115,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 45a8a9da7e5b8734eb709105fd6e30e1, type: 3} m_Script: {fileID: 11500000, guid: 45a8a9da7e5b8734eb709105fd6e30e1, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
zoomMultiplier: 3 zoomMultiplier: 10
zoomAxisName: MouseWheel zoomAxisName: MouseWheel
--- !u!114 &6700387586635078816 --- !u!114 &6700387586635078816
MonoBehaviour: MonoBehaviour:

View file

@ -972,6 +972,7 @@ GameObject:
- component: {fileID: 6071206155585637459} - component: {fileID: 6071206155585637459}
- component: {fileID: 6071206155585637457} - component: {fileID: 6071206155585637457}
- component: {fileID: 6071206155585637458} - component: {fileID: 6071206155585637458}
- component: {fileID: 1172115635686627452}
m_Layer: 5 m_Layer: 5
m_Name: Upgrades m_Name: Upgrades
m_TagString: UpgradePanel m_TagString: UpgradePanel
@ -1039,7 +1040,19 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 0.5
--- !u!114 &1172115635686627452
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6071206155585637468}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 252ca2c1ac2c3174fb94e2bf31456d1b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6071206155747220282 --- !u!1 &6071206155747220282
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -538,7 +538,7 @@ PrefabInstance:
- target: {fileID: 5870222235995333643, guid: 48928de23c4bf22498a7fc6a69f24b08, - target: {fileID: 5870222235995333643, guid: 48928de23c4bf22498a7fc6a69f24b08,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 115 value: 360
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5870222235995333643, guid: 48928de23c4bf22498a7fc6a69f24b08, - target: {fileID: 5870222235995333643, guid: 48928de23c4bf22498a7fc6a69f24b08,
type: 3} type: 3}
@ -599,11 +599,6 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Upgrades value: Upgrades
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6071206155585637468, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6071206155585637459, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, - target: {fileID: 6071206155585637459, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -709,10 +704,45 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0.5 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6071206155585637458, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, - target: {fileID: 6071206154778020748, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3} type: 3}
propertyPath: m_PixelsPerUnitMultiplier propertyPath: m_SizeDelta.x
value: 0.5 value: 360
objectReference: {fileID: 0}
- target: {fileID: 6071206155260561004, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_SizeDelta.x
value: 360
objectReference: {fileID: 0}
- target: {fileID: 6071206155164727663, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_AnchorMin.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6071206155164727663, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6071206155164727663, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6071206155164727663, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 15
objectReference: {fileID: 0}
- target: {fileID: 6071206155164727663, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_SizeDelta.x
value: 111.29999
objectReference: {fileID: 0}
- target: {fileID: 6071206155164727663, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb,
type: 3}
propertyPath: m_Pivot.x
value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 92e4f986dfcd64b42bf3ab401d8a2ecb, type: 3}
@ -783,10 +813,5 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9221969453073420047, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1,
type: 3}
propertyPath: orthographic size
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 6baf9ec6ad712d940a83a3bf6ae3e6b1, type: 3}

View file

@ -45,7 +45,7 @@ TextureImporter:
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 200 spritePixelsToUnits: 212
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1

View file

@ -0,0 +1,115 @@
fileFormatVersion: 2
guid: e12ad02d88fac2d42912da985d96256e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 212
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,115 @@
fileFormatVersion: 2
guid: 985a0ee44d1bd7944a36d99c81e62773
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 212
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 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
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View file

@ -113,9 +113,9 @@ PlayerSettings:
vulkanNumSwapchainBuffers: 2 vulkanNumSwapchainBuffers: 2
vulkanEnableSetSRGBWrite: 0 vulkanEnableSetSRGBWrite: 0
m_SupportedAspectRatios: m_SupportedAspectRatios:
4:3: 0 4:3: 1
5:4: 0 5:4: 1
16:10: 0 16:10: 1
16:9: 1 16:9: 1
Others: 0 Others: 0
bundleVersion: 0.3 bundleVersion: 0.3
@ -273,7 +273,14 @@ PlayerSettings:
androidGamepadSupportLevel: 0 androidGamepadSupportLevel: 0
AndroidValidateAppBundleSize: 1 AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150 AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: [] m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 701648e6e9c182d47a63632d3e686f5b, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: [] m_BuildTargetPlatformIcons: []
m_BuildTargetBatching: [] m_BuildTargetBatching: []
m_BuildTargetGraphicsJobs: m_BuildTargetGraphicsJobs: