Skip to content
Snippets Groups Projects
Commit 88d22ddb authored by Richard Marcus's avatar Richard Marcus
Browse files

fixed another delete problem and adapted radial menu asset as prototype

parent 535757d7
Branches
No related tags found
No related merge requests found
Showing
with 6654 additions and 306 deletions
fileFormatVersion: 2
guid: d7832c5fd5a7a004395847f4d5c3bff2
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: -2, y: -2}
- {x: -2, y: 2}
- {x: 2, y: 2}
- {x: 2, y: -2}
physicsShape: []
bones: []
spriteID: 30ed1e1a954622c49b02aac78a663b37
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 7ed52491f6729f94cb45e3d59765be8d
folderAsset: yes
timeCreated: 1498701092
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: e4772b127aee05d4bbecc4509ad49cd0
timeCreated: 1492976662
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine.UI;
using UnityEngine;
public class Test : MonoBehaviour
{
/*
[SerializeField]
PiUIManager piUi;
private bool menuOpened;
private PiUI normalMenu;
// Use this for initialization
void Start()
{
//Get menu for easy not repetitive getting of the menu when setting joystick input
normalMenu = piUi.GetPiUIOf("Normal Menu");
}
// Update is called once per frame
void Update()
{
//Bool function that returns true if on a menu
if (piUi.OverAMenu( ))
Debug.Log("You are over a menu");
else
Debug.Log("You are not over a menu");
//Just open the normal Menu if A is pressed
if (Input.GetKeyDown(KeyCode.A))
{
piUi.ChangeMenuState("Normal Menu", new Vector2(Screen.width / 2f, Screen.height / 2f));
}
//Update the menu and add the Testfunction to the button action if s or Fire1 axis is pressed
if (Input.GetKeyDown(KeyCode.S) || Input.GetButtonDown("Fire1"))
{
//Ensure menu isnt currently open on update just for a cleaner look
if (!piUi.PiOpened("Normal Menu"))
{
int i = 0;
//Iterate through the piData on normal menu
foreach (PiUI.PiData data in normalMenu.piData)
{
//Changes slice label
data.sliceLabel = "Test" + i.ToString( );
//Creates a new unity event and adds the testfunction to it
data.onSlicePressed = new UnityEngine.Events.UnityEvent( );
data.onSlicePressed.AddListener(TestFunction);
i++;
}
//Since PiUI.sliceCount or PiUI.equalSlices didnt change just calling update
piUi.UpdatePiMenu("Normal Menu");
}
//Open or close the menu depending on it's current state at the center of the screne
piUi.ChangeMenuState("Normal Menu", new Vector2(Screen.width / 2f, Screen.height / 2f));
}
if (Input.GetKeyDown(KeyCode.D))
{
//Ensure menu isnt currently open on regenerate so it doesnt spasm
if (!piUi.PiOpened("Normal Menu"))
{
//Make all angles equal
normalMenu.equalSlices = true;
normalMenu.iconDistance = 0f;
//Changes the piDataLength and adds new piData
normalMenu.piData = new PiUI.PiData[10];
for(int j = 0; j < 10; j++)
{
normalMenu.piData[j] = new PiUI.PiData( );
}
//Turns of the syncing of colors
normalMenu.syncColors = false;
//Changes open/Close animations
normalMenu.openTransition = PiUI.TransitionType.Fan;
normalMenu.closeTransition = PiUI.TransitionType.SlideRight;
int i = 0;
foreach (PiUI.PiData data in normalMenu.piData)
{
//Turning off the interactability of a slice
if(i % 2 ==0)
{
data.isInteractable = false;
}
//Set new highlight/non highlight colors
data.nonHighlightedColor = new Color(1 - i/10f, 0, 0, 1);
data.highlightedColor = new Color(0, 0, 1 - i/10f, 1);
data.disabledColor = Color.grey;
//Changes slice label
data.sliceLabel = "Test" + i.ToString( );
//Creates a new unity event and adds the testfunction to it
data.onSlicePressed = new UnityEngine.Events.UnityEvent( );
data.onSlicePressed.AddListener(TestFunction);
i += 1;
//Enables hoverFunctions
data.hoverFunctions = true;
//Creates a new unity event to adds on hovers function
data.onHoverEnter = new UnityEngine.Events.UnityEvent( );
data.onHoverEnter.AddListener(OnHoverEnter);
data.onHoverExit = new UnityEngine.Events.UnityEvent( );
data.onHoverExit.AddListener(OnHoverExit);
}
piUi.RegeneratePiMenu("Normal Menu");
}
piUi.ChangeMenuState("Normal Menu", new Vector2(Screen.width / 2f, Screen.height / 2f));
}
//Set joystick input on the normal menu which the piPieces check
normalMenu.joystickInput = new Vector2(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"));
//Set the bool to detect if the controller button has been pressed
normalMenu.joystickButton = Input.GetButtonDown("Fire1");
//If the button isnt pressed check if has been released
if (!normalMenu.joystickButton)
{
normalMenu.joystickButton = Input.GetButtonUp("Fire1");
}
}
//Test function that writes to the console and also closes the menu
public void TestFunction()
{
//Closes the menu
piUi.ChangeMenuState("Normal Menu");
Debug.Log("You Clicked me!");
}
public void OnHoverEnter()
{
Debug.Log("Hey get off of me!");
}
public void OnHoverExit()
{
Debug.Log("That's right and dont come back!");
}*/
}
fileFormatVersion: 2
guid: e4eeac98074d65f44baf4d22f245dfba
timeCreated: 1497550934
licenseType: Store
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections;
using System.Collections.Generic;
using UnityEngine.UI;
using UnityEngine;
public class TestWorld : MonoBehaviour
{
[SerializeField]
PiUIManager piUi;
private bool menuOpened;
private PiUI normalMenu;
// Use this for initialization
void Start()
{
//Get menu for easy not repetitive getting of the menu when setting joystick input
normalMenu = piUi.GetPiUIOf("Normal Menu");
}
// Update is called once per frame
void Update()
{
//Bool function that returns true if on a menu
if (piUi.OverAMenu( ))
Debug.Log("You are over a menu");
else
Debug.Log("You are not over a menu");
//Just open the normal Menu if A is pressed
if (Input.GetKeyDown(KeyCode.A))
{
Vector3 temp = Camera.main.ScreenToWorldPoint(Input.mousePosition);
temp.z = 0;
piUi.ChangeMenuState("Normal Menu",temp);
}
//Update the menu and add the Testfunction to the button action if s or Fire1 axis is pressed
if (Input.GetKeyDown(KeyCode.S) || Input.GetButtonDown("Fire1"))
{
//Ensure menu isnt currently open on update just for a cleaner look
if (!piUi.PiOpened("Normal Menu"))
{
int i = 0;
//Iterate through the piData on normal menu
foreach (PiUI.PiData data in normalMenu.piData)
{
//Changes slice label
data.sliceLabel = "Test" + i.ToString( );
//Creates a new unity event and adds the testfunction to it
// data.onSlicePressed = new UnityEngine.Events.UnityEvent( );
// data.onSlicePressed.AddListener(TestFunction);
i++;
}
//Since PiUI.sliceCount or PiUI.equalSlices didnt change just calling update
piUi.UpdatePiMenu("Normal Menu");
}
//Open or close the menu depending on it's current state at the center of the screne
piUi.ChangeMenuState("Normal Menu", new Vector2(Screen.width / 2f, Screen.height / 2f));
}
if (Input.GetKeyDown(KeyCode.D))
{
//Ensure menu isnt currently open on regenerate so it doesnt spasm
if (!piUi.PiOpened("Normal Menu"))
{
//Make all angles equal
normalMenu.equalSlices = true;
normalMenu.iconDistance = 0f;
//Changes the piDataLength and adds new piData
normalMenu.piData = new PiUI.PiData[10];
for(int j = 0; j < 10; j++)
{
normalMenu.piData[j] = new PiUI.PiData( );
}
//Turns of the syncing of colors
normalMenu.syncColors = false;
//Changes open/Close animations
normalMenu.openTransition = PiUI.TransitionType.Fan;
normalMenu.closeTransition = PiUI.TransitionType.SlideRight;
int i = 0;
foreach (PiUI.PiData data in normalMenu.piData)
{
//Turning off the interactability of a slice
if(i % 2 ==0)
{
data.isInteractable = false;
}
//Set new highlight/non highlight colors
data.nonHighlightedColor = new Color(1 - i/10f, 0, 0, 1);
data.highlightedColor = new Color(0, 0, 1 - i/10f, 1);
data.disabledColor = Color.grey;
//Changes slice label
data.sliceLabel = "Test" + i.ToString( );
//Creates a new unity event and adds the testfunction to it
// data.onSlicePressed = new UnityEngine.Events.UnityEvent( );
// data.onSlicePressed.AddListener(TestFunction);
i += 1;
//Enables hoverFunctions
data.hoverFunctions = true;
//Creates a new unity event to adds on hovers function
data.onHoverEnter = new UnityEngine.Events.UnityEvent( );
data.onHoverEnter.AddListener(OnHoverEnter);
data.onHoverExit = new UnityEngine.Events.UnityEvent( );
data.onHoverExit.AddListener(OnHoverExit);
}
piUi.RegeneratePiMenu("Normal Menu");
}
piUi.ChangeMenuState("Normal Menu", new Vector2(Screen.width / 2f, Screen.height / 2f));
}
//Set joystick input on the normal menu which the piPieces check
normalMenu.joystickInput = new Vector2(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"));
//Set the bool to detect if the controller button has been pressed
normalMenu.joystickButton = Input.GetButtonDown("Fire1");
//If the button isnt pressed check if has been released
if (Input.GetButtonUp("Fire1"))
{
normalMenu.joystickButton = Input.GetButtonUp("Fire1");
normalMenu.CloseMenu();
}
}
//Test function that writes to the console and also closes the menu
public void TestFunction()
{
//Closes the menu
piUi.ChangeMenuState("Normal Menu");
Debug.Log("You Clicked me!");
}
public void OnHoverEnter()
{
Debug.Log("Hey get off of me!");
}
public void OnHoverExit()
{
Debug.Log("That's right and dont come back!");
}
}
fileFormatVersion: 2
guid: a3940b2159cc54a4aa36b0177174a0da
timeCreated: 1497550934
licenseType: Store
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2b2cf75c3ee2f514094ade2274c0a6ca
folderAsset: yes
timeCreated: 1501016739
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/PiUi/Tools/Hammer.png

129 B

fileFormatVersion: 2
guid: f3a0ea9f0ad34184faa45ad4b37d3019
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 242bfe502257a1c49acd91b831152dc6
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/PiUi/Tools/Saw.png

130 B

fileFormatVersion: 2
guid: 9b3b8b9ebb1a7a6469f34c8a939829ae
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8b30aacaa7d40864b8148096fb694dfd
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/PiUi/Tools/ScrewDriver.png

130 B

fileFormatVersion: 2
guid: 8267cc0dfa9947e4fa363078fb00a7e2
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 1daa3ef050994e84b80393d4e3a4ef42
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/PiUi/Tools/Wrench.png

130 B

fileFormatVersion: 2
guid: ca34d7eb0cdd548478e4eb6ad3775901
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
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: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 0d78b85cdaa51924e93970d3330cb2a9
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
...@@ -3,15 +3,16 @@ ...@@ -3,15 +3,16 @@
--- !u!1 &100000 --- !u!1 &100000
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
serializedVersion: 4 m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component: m_Component:
- 4: {fileID: 400000} - component: {fileID: 400000}
- 143: {fileID: 14300000} - component: {fileID: 14300000}
- 114: {fileID: 11400000} - component: {fileID: 11400000}
- 54: {fileID: 5400000} - component: {fileID: 5400000}
- 82: {fileID: 8200000} - component: {fileID: 8200000}
m_Layer: 0 m_Layer: 0
m_Name: FPSController m_Name: FPSController
m_TagString: Untagged m_TagString: Untagged
...@@ -19,29 +20,12 @@ GameObject: ...@@ -19,29 +20,12 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
m_Component:
- 4: {fileID: 400002}
- 20: {fileID: 2000000}
- 81: {fileID: 8100000}
- 124: {fileID: 12474086}
m_Layer: 0
m_Name: FirstPersonCharacter
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400000 --- !u!4 &400000
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
...@@ -50,153 +34,31 @@ Transform: ...@@ -50,153 +34,31 @@ Transform:
- {fileID: 400002} - {fileID: 400002}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
--- !u!4 &400002 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Transform: --- !u!143 &14300000
m_ObjectHideFlags: 1 CharacterController:
m_PrefabParentObject: {fileID: 0} m_ObjectHideFlags: 0
m_PrefabInternal: {fileID: 100100000} m_CorrespondingSourceObject: {fileID: 0}
m_GameObject: {fileID: 100002} m_PrefabInstance: {fileID: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_PrefabAsset: {fileID: 0}
m_LocalPosition: {x: 0, y: 0.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 400000}
m_RootOrder: 0
--- !u!20 &2000000
Camera:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoMirrorMode: 0
--- !u!54 &5400000
Rigidbody:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!81 &8100000
AudioListener:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Enabled: 1
--- !u!82 &8200000
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 4 serializedVersion: 2
OutputAudioMixerGroup: {fileID: 0} m_Height: 1.8
m_audioClip: {fileID: 0} m_Radius: 0.5
m_PlayOnAwake: 1 m_SlopeLimit: 45
m_Volume: 1 m_StepOffset: 0.3
m_Pitch: 1 m_SkinWidth: 0.08
Loop: 0 m_MinMoveDistance: 0
Mute: 0 m_Center: {x: 0, y: 0, z: 0}
Spatialize: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!114 &11400000 --- !u!114 &11400000
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000} m_GameObject: {fileID: 100000}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
...@@ -229,16 +91,24 @@ MonoBehaviour: ...@@ -229,16 +91,24 @@ MonoBehaviour:
IncreaseCurve: IncreaseCurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- time: 0 - serializedVersion: 3
time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
- time: 1 weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1 value: 1
inSlope: 2 inSlope: 2
outSlope: 2 outSlope: 2
tangentMode: 0 tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
...@@ -249,31 +119,51 @@ MonoBehaviour: ...@@ -249,31 +119,51 @@ MonoBehaviour:
Bobcurve: Bobcurve:
serializedVersion: 2 serializedVersion: 2
m_Curve: m_Curve:
- time: 0 - serializedVersion: 3
time: 0
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
- time: 0.5 weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1 value: 1
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
- time: 1 weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
- time: 1.5 weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.5
value: -1 value: -1
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
- time: 2 weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0 value: 0
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
tangentMode: 0 tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
...@@ -287,38 +177,206 @@ MonoBehaviour: ...@@ -287,38 +177,206 @@ MonoBehaviour:
- {fileID: 8300000, guid: 8bc94ec6ed537e743b481638bdcd503d, type: 3} - {fileID: 8300000, guid: 8bc94ec6ed537e743b481638bdcd503d, type: 3}
m_JumpSound: {fileID: 8300000, guid: 5897aeed9b676024fbb8c694b421a861, type: 3} m_JumpSound: {fileID: 8300000, guid: 5897aeed9b676024fbb8c694b421a861, type: 3}
m_LandSound: {fileID: 8300000, guid: 3b09d59f4499d45428baa7a21e954296, type: 3} m_LandSound: {fileID: 8300000, guid: 3b09d59f4499d45428baa7a21e954296, type: 3}
--- !u!54 &5400000
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!82 &8200000
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100000}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!1 &100002
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 400002}
- component: {fileID: 2000000}
- component: {fileID: 8100000}
- component: {fileID: 12474086}
m_Layer: 0
m_Name: FirstPersonCharacter
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400002
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100002}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 400000}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &2000000
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100002}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_GateFitMode: 2
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &8100000
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100002}
m_Enabled: 1
--- !u!124 &12474086 --- !u!124 &12474086
Behaviour: Behaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100002} m_GameObject: {fileID: 100002}
m_Enabled: 1 m_Enabled: 1
--- !u!143 &14300000
CharacterController:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 1.8
m_Radius: 0.5
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100000}
m_IsPrefabParent: 1
This diff is collapsed.
...@@ -291,6 +291,9 @@ PlayerSettings: ...@@ -291,6 +291,9 @@ PlayerSettings:
- m_BuildTarget: WebGLSupport - m_BuildTarget: WebGLSupport
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport
m_APIs: 0b000000
m_Automatic: 0
m_BuildTargetVRSettings: m_BuildTargetVRSettings:
- m_BuildTarget: Standalone - m_BuildTarget: Standalone
m_Enabled: 0 m_Enabled: 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment