mirror of
https://github.com/Leahnaya/TheKingsRace.git
synced 2026-04-25 16:15:39 -05:00
Merge branch 'MomGrappleOther'
This commit is contained in:
commit
87c6095623
|
|
@ -276,7 +276,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 6621380958853746498, guid: 9d82c67b12dc08a4e8782d89114d7e45, type: 3}
|
||||
m_Sprite: {fileID: 8953198066205750476, guid: 827eb2c03f1391542975f74191d7c32f, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -123,6 +123,37 @@ NavMeshSettings:
|
|||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &628299623
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 628299624}
|
||||
m_Layer: 0
|
||||
m_Name: StandInKing
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &628299624
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 628299623}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 23, y: 2.1, z: 45.1}
|
||||
m_LocalScale: {x: 10, y: 10, z: 10}
|
||||
m_Children:
|
||||
- {fileID: 1607833154}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &651583808
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -368,6 +399,106 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3}
|
||||
--- !u!1 &1129569236 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2080873442886702253, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3}
|
||||
m_PrefabInstance: {fileID: 1129569235}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1607833153
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1607833154}
|
||||
- component: {fileID: 1607833157}
|
||||
- component: {fileID: 1607833156}
|
||||
- component: {fileID: 1607833155}
|
||||
m_Layer: 0
|
||||
m_Name: Sphere
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1607833154
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1607833153}
|
||||
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: 628299624}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &1607833155
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1607833153}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &1607833156
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1607833153}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &1607833157
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1607833153}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1 &1857311124
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -441,6 +572,14 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1900253489175822351, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
|
||||
propertyPath: king
|
||||
value:
|
||||
objectReference: {fileID: 628299623}
|
||||
- target: {fileID: 1900253489175822351, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
|
||||
propertyPath: player
|
||||
value:
|
||||
objectReference: {fileID: 1129569236}
|
||||
- target: {fileID: 2240580173848419138, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ public class MoveRagdollState : MoveBaseState
|
|||
mSM.capCol.enabled = true; // enable capsule collider
|
||||
mSM.moveController.enabled = false; // disable move controller
|
||||
mSM.rB.isKinematic = false; // disable kinematic
|
||||
mSM.rB.detectCollisions = true; // detect collisions
|
||||
|
||||
//apply force
|
||||
mSM.rB.AddForce(mSM.dirHit, ForceMode.Impulse);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ public class MoveRecoveringState : MoveBaseState
|
|||
mSM.capCol.enabled = false; // disable capsule collider
|
||||
mSM.moveController.enabled = true; // enable move controller
|
||||
mSM.rB.isKinematic = true; // enable kinematic
|
||||
mSM.rB.detectCollisions = false; // detect collisions false
|
||||
mSM.CancelMomentum(); // reset player variables
|
||||
mSM.moveController.Move(new Vector3(0,2,0));
|
||||
}
|
||||
|
|
|
|||
116
Assets/Scripts/UI/Lobby/KingTooltips.cs
Normal file
116
Assets/Scripts/UI/Lobby/KingTooltips.cs
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class KingTooltips : MonoBehaviour
|
||||
{
|
||||
|
||||
////Weather Wheel Variables
|
||||
public GameObject curWeatherSpriteObj;
|
||||
public Text curWeatherText;
|
||||
public Image curWeatherImage;
|
||||
float curSpriteRotation;
|
||||
|
||||
string rainExplanation = "Increases the players acceleration & decreases the players traction.";
|
||||
string snowExplanation = "Increases the players traction & decreases the players acceleration.";
|
||||
string windExplanation = "Pushes the player in a random direction altering their movement.";
|
||||
string fogExplanation = "Obscures the players vision.";
|
||||
string defaultWeatherExplanation;
|
||||
|
||||
public Sprite rain;
|
||||
public Sprite snow;
|
||||
public Sprite wind;
|
||||
public Sprite fog;
|
||||
////
|
||||
|
||||
////Placeables Variables
|
||||
public GameObject curPlaceablesSpriteObj;
|
||||
public Text curPlaceablesText;
|
||||
public Image curPlaceablesImage;
|
||||
|
||||
string blockExplanation = "Place a block on the grid to obstruct a players movement.";
|
||||
string thunderExplanation = "Places Thunder Above both players forcing them to the ground if they stay aerial for too long.";
|
||||
string slimeExplanation = "Click and hold the mouse to place and then choose the direction the slowing slime goes.";
|
||||
string hailExplanation = "Click and hold the mouse to adjust the hail size dropping papers";
|
||||
string defaultPlaceablesExplanation;
|
||||
|
||||
public Sprite block;
|
||||
public Sprite thunder;
|
||||
public Sprite slime;
|
||||
public Sprite hail;
|
||||
|
||||
|
||||
void Start(){
|
||||
defaultWeatherExplanation = curWeatherText.text;
|
||||
defaultPlaceablesExplanation = curPlaceablesText.text;
|
||||
curWeatherSpriteObj.SetActive(false);
|
||||
curPlaceablesSpriteObj.SetActive(false);
|
||||
}
|
||||
|
||||
////Weather Wheel Functions
|
||||
public void OnEnterRain(){
|
||||
curWeatherSpriteObj.SetActive(true);
|
||||
curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, 135);
|
||||
curWeatherImage.sprite = rain;
|
||||
curWeatherText.text = rainExplanation;
|
||||
}
|
||||
|
||||
public void OnEnterSnow(){
|
||||
curWeatherSpriteObj.SetActive(true);
|
||||
curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, -135);
|
||||
curWeatherImage.sprite = snow;
|
||||
curWeatherText.text = snowExplanation;
|
||||
}
|
||||
|
||||
public void OnEnterWind(){
|
||||
curWeatherSpriteObj.SetActive(true);
|
||||
curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, -45);
|
||||
curWeatherImage.sprite = wind;
|
||||
curWeatherText.text = windExplanation;
|
||||
}
|
||||
|
||||
public void OnEnterFog(){
|
||||
curWeatherSpriteObj.SetActive(true);
|
||||
curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, 45);
|
||||
curWeatherImage.sprite = fog;
|
||||
curWeatherText.text = fogExplanation;
|
||||
}
|
||||
|
||||
public void OnExitWeather(){
|
||||
curWeatherSpriteObj.SetActive(false);
|
||||
curWeatherText.text = defaultWeatherExplanation;
|
||||
}
|
||||
////
|
||||
|
||||
////Placeables Functions
|
||||
public void OnEnterBlock(){
|
||||
curPlaceablesSpriteObj.SetActive(true);
|
||||
curPlaceablesImage.sprite = block;
|
||||
curPlaceablesText.text = blockExplanation;
|
||||
}
|
||||
|
||||
public void OnEnterThunder(){
|
||||
curPlaceablesSpriteObj.SetActive(true);
|
||||
curPlaceablesImage.sprite = thunder;
|
||||
curPlaceablesText.text = thunderExplanation;
|
||||
}
|
||||
|
||||
public void OnEnterSlime(){
|
||||
curPlaceablesSpriteObj.SetActive(true);
|
||||
curPlaceablesImage.sprite = slime;
|
||||
curPlaceablesText.text = slimeExplanation;
|
||||
}
|
||||
|
||||
public void OnEnterHail(){
|
||||
curPlaceablesSpriteObj.SetActive(true);
|
||||
curPlaceablesImage.sprite = hail;
|
||||
curPlaceablesText.text = hailExplanation;
|
||||
}
|
||||
|
||||
public void OnExitPlaceables(){
|
||||
curPlaceablesSpriteObj.SetActive(false);
|
||||
curPlaceablesText.text = defaultPlaceablesExplanation;
|
||||
}
|
||||
////
|
||||
}
|
||||
11
Assets/Scripts/UI/Lobby/KingTooltips.cs.meta
Normal file
11
Assets/Scripts/UI/Lobby/KingTooltips.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f2e12472a6d6ff6468d4fb8c7c12007a
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
36
Assets/Scripts/UI/Lobby/LobbySwap.cs
Normal file
36
Assets/Scripts/UI/Lobby/LobbySwap.cs
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class LobbySwap : MonoBehaviour
|
||||
{
|
||||
public GameObject playerLobby;
|
||||
public GameObject kingLobby;
|
||||
|
||||
public GameObject player;
|
||||
public GameObject king;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
kingLobby.SetActive(false);
|
||||
king.SetActive(false);
|
||||
}
|
||||
|
||||
public void SwapLobby(){
|
||||
if(playerLobby.active){
|
||||
kingLobby.SetActive(true);
|
||||
king.SetActive(true);
|
||||
|
||||
playerLobby.SetActive(false);
|
||||
player.SetActive(false);
|
||||
}
|
||||
else{
|
||||
playerLobby.SetActive(true);
|
||||
player.SetActive(true);
|
||||
|
||||
kingLobby.SetActive(false);
|
||||
king.SetActive(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/UI/Lobby/LobbySwap.cs.meta
Normal file
11
Assets/Scripts/UI/Lobby/LobbySwap.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e0ba335dd24406440bdb8aefabd610b1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -14,11 +14,11 @@ public class Tooltip : MonoBehaviour
|
|||
}
|
||||
|
||||
public void ShowTooltip(string curTooltip){
|
||||
gameObject.SetActive(true);
|
||||
this.gameObject.SetActive(true);
|
||||
tooltipText.text = curTooltip;
|
||||
}
|
||||
|
||||
public void HideTooltip(){
|
||||
gameObject.SetActive(false);
|
||||
this.gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
Assets/Sprites/Lobby/KR-UIPaper-CamO.png
Normal file
BIN
Assets/Sprites/Lobby/KR-UIPaper-CamO.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.0 MiB |
252
Assets/Sprites/Lobby/KR-UIPaper-CamO.png.meta
Normal file
252
Assets/Sprites/Lobby/KR-UIPaper-CamO.png.meta
Normal file
|
|
@ -0,0 +1,252 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 827eb2c03f1391542975f74191d7c32f
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -4961362372881410234
|
||||
second: KR-UIPaper-CamO_0
|
||||
- first:
|
||||
213: -7878662621293769924
|
||||
second: KR-UIPaper-CamO_1
|
||||
- first:
|
||||
213: 8953198066205750476
|
||||
second: KR-UIPaper-CamO_2
|
||||
- first:
|
||||
213: -6103285600961616840
|
||||
second: KR-UIPaper-CamO_3
|
||||
- first:
|
||||
213: -8487237290780451639
|
||||
second: KR-UIPaper-CamO_4
|
||||
- first:
|
||||
213: -8077703910084242262
|
||||
second: KR-UIPaper-CamO_5
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
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
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: KR-UIPaper-CamO_0
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 5460
|
||||
y: 200
|
||||
width: 1600
|
||||
height: 1200
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 6471a625533b52bb0800000000000000
|
||||
internalID: -4961362372881410234
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: KR-UIPaper-CamO_1
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 7032
|
||||
y: 200
|
||||
width: 1600
|
||||
height: 1200
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: c3b03a0c61e59a290800000000000000
|
||||
internalID: -7878662621293769924
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: KR-UIPaper-CamO_2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 8514
|
||||
y: 200
|
||||
width: 1600
|
||||
height: 1200
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: cc478e38436204c70800000000000000
|
||||
internalID: 8953198066205750476
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: KR-UIPaper-CamO_3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 5160
|
||||
y: 3200
|
||||
width: 5000
|
||||
height: 3400
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 8342def1516cc4ba0800000000000000
|
||||
internalID: -6103285600961616840
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: KR-UIPaper-CamO_4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 5160
|
||||
y: 1517
|
||||
width: 5000
|
||||
height: 1600
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 9cc159eb6a6473a80800000000000000
|
||||
internalID: -8487237290780451639
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: KR-UIPaper-CamO_5
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 60
|
||||
y: 170
|
||||
width: 5000
|
||||
height: 6500
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: aa415ae571b36ef80800000000000000
|
||||
internalID: -8077703910084242262
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 1c6b5603df0255f4889d9dbd49600e39
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Assets/Sprites/UI/WheelWeathers.png
Normal file
BIN
Assets/Sprites/UI/WheelWeathers.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
204
Assets/Sprites/UI/WheelWeathers.png.meta
Normal file
204
Assets/Sprites/UI/WheelWeathers.png.meta
Normal file
|
|
@ -0,0 +1,204 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a036275538de07d43a97d88b71a700ec
|
||||
TextureImporter:
|
||||
internalIDToNameTable:
|
||||
- first:
|
||||
213: -6768675186751372735
|
||||
second: Windy
|
||||
- first:
|
||||
213: -2196999812744318433
|
||||
second: Fog
|
||||
- first:
|
||||
213: 7206854781991241367
|
||||
second: Snow
|
||||
- first:
|
||||
213: 2227736008206240503
|
||||
second: Rain
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
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
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
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
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: Windy
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 200
|
||||
width: 200
|
||||
height: 200
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 1420fa597c5d012a0800000000000000
|
||||
internalID: -6768675186751372735
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: Fog
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 200
|
||||
y: 200
|
||||
width: 200
|
||||
height: 200
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: f1276cd7f40b281e0800000000000000
|
||||
internalID: -2196999812744318433
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: Snow
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 200
|
||||
height: 200
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 796c96c9d34e30460800000000000000
|
||||
internalID: 7206854781991241367
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
- serializedVersion: 2
|
||||
name: Rain
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 200
|
||||
y: 1
|
||||
width: 200
|
||||
height: 200
|
||||
alignment: 0
|
||||
pivot: {x: 0.5, y: 0.5}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: 0
|
||||
bones: []
|
||||
spriteID: 7faca7ea8128aee10800000000000000
|
||||
internalID: 2227736008206240503
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: c66dc3b7d7de3b240a3bbfcfb7e59239
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -12,13 +12,13 @@ EditorUserSettings:
|
|||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-2:
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-3:
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-4:
|
||||
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
|
||||
|
|
@ -27,10 +27,10 @@ EditorUserSettings:
|
|||
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-7:
|
||||
value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-8:
|
||||
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-9:
|
||||
value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user