WARNING! CRASH INVENTORY!!! /// Incident System + small improvements
This commit is contained in:
parent
ac1950d901
commit
c8c6f0c010
BIN
.vs/PO/v16/.suo
BIN
.vs/PO/v16/.suo
Binary file not shown.
|
|
@ -16,6 +16,8 @@ public class DataHolder : MonoBehaviour
|
||||||
|
|
||||||
public MissionConfig mission;
|
public MissionConfig mission;
|
||||||
[SerializeField] private string _currentScene;
|
[SerializeField] private string _currentScene;
|
||||||
|
public bool warning = true;
|
||||||
|
|
||||||
private int score = 10;
|
private int score = 10;
|
||||||
|
|
||||||
private int missionChecker;
|
private int missionChecker;
|
||||||
|
|
@ -42,6 +44,7 @@ public class DataHolder : MonoBehaviour
|
||||||
|
|
||||||
main = this;
|
main = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetScore(int _newScore)
|
public void SetScore(int _newScore)
|
||||||
{
|
{
|
||||||
score = _newScore;
|
score = _newScore;
|
||||||
|
|
@ -111,22 +114,14 @@ public class DataHolder : MonoBehaviour
|
||||||
mission = _mission;
|
mission = _mission;
|
||||||
missionChecker = 0;
|
missionChecker = 0;
|
||||||
}
|
}
|
||||||
public BattleConfig NextBattle()
|
|
||||||
{
|
|
||||||
missionChecker++;
|
|
||||||
if(missionChecker > mission.missionItems.Count)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return mission.missionItems[missionChecker - 1].battle;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ReturnInMainMenu()
|
public void ReturnInMainMenu()
|
||||||
{
|
{
|
||||||
ChangeScene("MainMenu");
|
ChangeScene("MainMenu");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddEquipmentToPlayerInvaentary(GameObject _item)
|
public void AddEquipmentToPlayerInventory(GameObject _item)
|
||||||
{
|
{
|
||||||
AllEquipment.Add(_item);
|
AllEquipment.Add(_item);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 368 KiB |
|
|
@ -0,0 +1,96 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1f3d695623e698d49bf7296e256823e0
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
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: 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
|
||||||
|
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
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 244 KiB |
|
|
@ -0,0 +1,96 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ea1c0d9719d5f2c4cbf28490e87b2caf
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
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: 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
|
||||||
|
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
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -175,8 +175,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
currentNum: 5
|
|
||||||
equipmentNum: -1
|
|
||||||
--- !u!114 &23443383
|
--- !u!114 &23443383
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -958,6 +956,81 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 347814892}
|
m_GameObject: {fileID: 347814892}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &451995720
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 451995721}
|
||||||
|
- component: {fileID: 451995723}
|
||||||
|
- component: {fileID: 451995722}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: IncidentPos
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &451995721
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 451995720}
|
||||||
|
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: 1302787964}
|
||||||
|
m_RootOrder: 6
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &451995722
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 451995720}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 0}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
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
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!222 &451995723
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 451995720}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &518861535
|
--- !u!1 &518861535
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1010,8 +1083,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
currentNum: 4
|
|
||||||
equipmentNum: -1
|
|
||||||
--- !u!114 &518861538
|
--- !u!114 &518861538
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1185,7 +1256,7 @@ Camera:
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_ClearFlags: 2
|
m_ClearFlags: 2
|
||||||
m_BackGroundColor: {r: 0.2850543, g: 0.49056602, b: 0.25685295, a: 0}
|
m_BackGroundColor: {r: 0.05329534, g: 0.066037714, b: 0.051334977, a: 0}
|
||||||
m_projectionMatrixMode: 1
|
m_projectionMatrixMode: 1
|
||||||
m_GateFitMode: 2
|
m_GateFitMode: 2
|
||||||
m_FOVAxisMode: 0
|
m_FOVAxisMode: 0
|
||||||
|
|
@ -1272,13 +1343,13 @@ MonoBehaviour:
|
||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
m_BoolArgument: 0
|
m_BoolArgument: 0
|
||||||
m_CallState: 2
|
m_CallState: 2
|
||||||
- m_Target: {fileID: 1805280931}
|
- m_Target: {fileID: 519420034}
|
||||||
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
m_TargetAssemblyTypeName: Session, Assembly-CSharp
|
||||||
m_MethodName:
|
m_MethodName: Incident
|
||||||
m_Mode: 1
|
m_Mode: 1
|
||||||
m_Arguments:
|
m_Arguments:
|
||||||
m_ObjectArgument: {fileID: 0}
|
m_ObjectArgument: {fileID: 0}
|
||||||
m_ObjectArgumentAssemblyTypeName:
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
m_IntArgument: 0
|
m_IntArgument: 0
|
||||||
m_FloatArgument: 0
|
m_FloatArgument: 0
|
||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
|
|
@ -1311,6 +1382,18 @@ MonoBehaviour:
|
||||||
m_StringArgument:
|
m_StringArgument:
|
||||||
m_BoolArgument: 0
|
m_BoolArgument: 0
|
||||||
m_CallState: 2
|
m_CallState: 2
|
||||||
|
- m_Target: {fileID: 0}
|
||||||
|
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||||
|
m_MethodName:
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName:
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
onInventory:
|
onInventory:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls:
|
m_Calls:
|
||||||
|
|
@ -1415,12 +1498,14 @@ MonoBehaviour:
|
||||||
playerPosition: {fileID: 1240862618}
|
playerPosition: {fileID: 1240862618}
|
||||||
playerLink: {fileID: 0}
|
playerLink: {fileID: 0}
|
||||||
phaseCounter: {fileID: 1805280935}
|
phaseCounter: {fileID: 1805280935}
|
||||||
|
incidentPosition: {fileID: 451995721}
|
||||||
battleConfig: {fileID: 11400000, guid: 5ecf77a7ffbea54479cfcd94f4314069, type: 2}
|
battleConfig: {fileID: 11400000, guid: 5ecf77a7ffbea54479cfcd94f4314069, type: 2}
|
||||||
numberPhase: 1
|
numberPhase: 1
|
||||||
quantityEnemies: 0
|
quantityEnemies: 0
|
||||||
waitingEndingRound: 0
|
waitingEndingRound: 0
|
||||||
nextLevel: {fileID: 0}
|
|
||||||
currentEnemies: []
|
currentEnemies: []
|
||||||
|
mission: {fileID: 0}
|
||||||
|
missionChecker: 0
|
||||||
--- !u!1 &521448533
|
--- !u!1 &521448533
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1614,10 +1699,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: d09743e90e31cbf44b09c9355d4ba732, type: 3}
|
m_Script: {fileID: 11500000, guid: d09743e90e31cbf44b09c9355d4ba732, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
localName: {fileID: 54712245}
|
|
||||||
desqription: {fileID: 1685286600}
|
|
||||||
icon: {fileID: 1621110209}
|
|
||||||
AddButton: {fileID: 743217713}
|
|
||||||
--- !u!114 &559254433
|
--- !u!114 &559254433
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1627,22 +1708,14 @@ MonoBehaviour:
|
||||||
m_GameObject: {fileID: 559254427}
|
m_GameObject: {fileID: 559254427}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 6b702bb7d4d345f4a81b2a1cd9ddd648, type: 3}
|
m_Script: {fileID: 11500000, guid: 27f61c9ebd2814b42a0270c39a5dc3fa, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
allEquipment:
|
allEquipment: []
|
||||||
- {fileID: 4068511147674530333, guid: ca90993e80150994e905b83ffd525f53, type: 3}
|
|
||||||
- {fileID: 726422991776119786, guid: ffde653421f3d064cbdfc3b4571a5a2a, type: 3}
|
|
||||||
playerEquipment: []
|
playerEquipment: []
|
||||||
localplayerEquipment: []
|
localplayerEquipment: []
|
||||||
imagePlug: {fileID: 21300000, guid: 5c823983cfaec90459cde31d1c98f1a9, type: 3}
|
imagePlug: {fileID: 0}
|
||||||
playerPlace:
|
playerPlace: []
|
||||||
- {fileID: 1617960470}
|
|
||||||
- {fileID: 574309838}
|
|
||||||
- {fileID: 1212020579}
|
|
||||||
- {fileID: 943923942}
|
|
||||||
- {fileID: 518861538}
|
|
||||||
- {fileID: 23443383}
|
|
||||||
lastCardNum: 0
|
lastCardNum: 0
|
||||||
--- !u!114 &559254434
|
--- !u!114 &559254434
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
@ -1656,15 +1729,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: cd8d4ce0f427a174cb479d11b8f992b3, type: 3}
|
m_Script: {fileID: 11500000, guid: cd8d4ce0f427a174cb479d11b8f992b3, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
buttonPrefab: {fileID: 845954423796914200, guid: f33090d3cfbeff54cb49cc789b59da51, type: 3}
|
|
||||||
parent: {fileID: 1594427389}
|
|
||||||
allButtonLinks: []
|
|
||||||
distX: 30
|
|
||||||
distY: 30
|
|
||||||
maxHeroesInRow: 3
|
|
||||||
maxHeroesInColumn: 3
|
|
||||||
maxHeroButOnPage: 0
|
|
||||||
page: 0
|
|
||||||
--- !u!1 &565565346
|
--- !u!1 &565565346
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1877,8 +1941,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
currentNum: 1
|
|
||||||
equipmentNum: -1
|
|
||||||
--- !u!114 &574309838
|
--- !u!114 &574309838
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2852,8 +2914,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
currentNum: 3
|
|
||||||
equipmentNum: -1
|
|
||||||
--- !u!114 &943923942
|
--- !u!114 &943923942
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -3250,7 +3310,8 @@ RectTransform:
|
||||||
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}
|
||||||
m_LocalScale: {x: 1.9390976, y: 1.9390976, z: 1.9390976}
|
m_LocalScale: {x: 1.9390976, y: 1.9390976, z: 1.9390976}
|
||||||
m_Children: []
|
m_Children:
|
||||||
|
- {fileID: 1423529178}
|
||||||
m_Father: {fileID: 1302787964}
|
m_Father: {fileID: 1302787964}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -3696,8 +3757,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
currentNum: 2
|
|
||||||
equipmentNum: -1
|
|
||||||
--- !u!114 &1212020579
|
--- !u!114 &1212020579
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4187,6 +4246,7 @@ RectTransform:
|
||||||
- {fileID: 1128828790}
|
- {fileID: 1128828790}
|
||||||
- {fileID: 770121096}
|
- {fileID: 770121096}
|
||||||
- {fileID: 559254428}
|
- {fileID: 559254428}
|
||||||
|
- {fileID: 451995721}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -4300,6 +4360,218 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 80.99988, y: 819.74}
|
m_AnchoredPosition: {x: 80.99988, y: 819.74}
|
||||||
m_SizeDelta: {x: 100, y: 100}
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &1421722003
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1421722004}
|
||||||
|
- component: {fileID: 1421722006}
|
||||||
|
- component: {fileID: 1421722005}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1421722004
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1421722003}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.6, y: 0.6, z: 0.61839056}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1423529178}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0.21838379, y: 0.10920715}
|
||||||
|
m_SizeDelta: {x: 585.4558, y: 292.7169}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1421722005
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1421722003}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 70b66ae2355a57c4b8c207f33e7f4af0, type: 3}
|
||||||
|
m_FontSize: 300
|
||||||
|
m_FontStyle: 1
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 300
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: Main menu
|
||||||
|
--- !u!222 &1421722006
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1421722003}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &1423529177
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1423529178}
|
||||||
|
- component: {fileID: 1423529181}
|
||||||
|
- component: {fileID: 1423529180}
|
||||||
|
- component: {fileID: 1423529179}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: NextLevelButton
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1423529178
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1423529177}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.20344514, y: 0.20344514, z: 0.20344514}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 1421722004}
|
||||||
|
m_Father: {fileID: 1128828790}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0.000030518, y: -192.8}
|
||||||
|
m_SizeDelta: {x: 1600, y: 300}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1423529179
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1423529177}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1423529180}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 519420034}
|
||||||
|
m_TargetAssemblyTypeName: Session, Assembly-CSharp
|
||||||
|
m_MethodName: LaunchMainMenu
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!114 &1423529180
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1423529177}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_Type: 1
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!222 &1423529181
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1423529177}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1478977371
|
--- !u!1 &1478977371
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4421,15 +4693,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: cd8d4ce0f427a174cb479d11b8f992b3, type: 3}
|
m_Script: {fileID: 11500000, guid: cd8d4ce0f427a174cb479d11b8f992b3, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
buttonPrefab: {fileID: 845954423796914200, guid: f33090d3cfbeff54cb49cc789b59da51, type: 3}
|
|
||||||
parent: {fileID: 1594427389}
|
|
||||||
allButtonLinks: []
|
|
||||||
distX: 30
|
|
||||||
distY: 30
|
|
||||||
maxHeroesInRow: 3
|
|
||||||
maxHeroesInColumn: 3
|
|
||||||
maxHeroButOnPage: 0
|
|
||||||
page: 0
|
|
||||||
--- !u!1 &1617960467
|
--- !u!1 &1617960467
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -4482,8 +4745,6 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
m_Script: {fileID: 11500000, guid: 4bdd2e3bc474f8040b76b136ff05dde9, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
currentNum: 0
|
|
||||||
equipmentNum: -1
|
|
||||||
--- !u!114 &1617960470
|
--- !u!114 &1617960470
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -452,7 +452,7 @@ GameObject:
|
||||||
- component: {fileID: 8062193537357689324}
|
- component: {fileID: 8062193537357689324}
|
||||||
- component: {fileID: 5969591204664640872}
|
- component: {fileID: 5969591204664640872}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: LongBigDamagePrefab
|
m_Name: GrenadeLauncher
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
|
@ -531,7 +531,7 @@ GameObject:
|
||||||
- component: {fileID: 2077714030763369409}
|
- component: {fileID: 2077714030763369409}
|
||||||
- component: {fileID: 5139430113101627829}
|
- component: {fileID: 5139430113101627829}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: UltraMegaAttack
|
m_Name: SniperRifle
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &7537755910953202467
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8585648815305749523}
|
||||||
|
- component: {fileID: 5974923352310368692}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: GrenadeLauncher
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &8585648815305749523
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7537755910953202467}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 1.1494696, y: 0.52587074, z: -0.24618196}
|
||||||
|
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}
|
||||||
|
--- !u!114 &5974923352310368692
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7537755910953202467}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: dd65fdd5313c39f4088de50739b78266, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
equipmentConfig: {fileID: 11400000, guid: d429453876f16c14d8f0014e412c9aec, type: 2}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: e1a96cea4904bdb4ebacb21a79cad47b
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &6257004177646272206
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5289617596546005502}
|
||||||
|
- component: {fileID: 7828685618752226393}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: SniperRifle
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &5289617596546005502
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6257004177646272206}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 1.1494696, y: 0.52587074, z: -0.24618196}
|
||||||
|
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}
|
||||||
|
--- !u!114 &7828685618752226393
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6257004177646272206}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: dd65fdd5313c39f4088de50739b78266, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
equipmentConfig: {fileID: 11400000, guid: f6ea61a22b102dd45bceed1c63f6563a, type: 2}
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 20d7aac99a8890247b0f02dfffcd690d
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a17293d04b28214aba8c30b2567c89a
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f49428afd7c561149bc11149a44adf69
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: eb5d60415a7229a459ceb2484a2bb6c6
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2c74eeb2d2cc06748afadc5a8faf9cfb
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 94ce11ff2ebedb549b1db644b7b23c0d
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 314508a0e654e3f49ad0ebd8f2f0cb47
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -164,8 +164,11 @@ MonoBehaviour:
|
||||||
- {fileID: 11400000, guid: c76ef6aeaf7e2074fb44abc864f27a75, type: 2}
|
- {fileID: 11400000, guid: c76ef6aeaf7e2074fb44abc864f27a75, type: 2}
|
||||||
- {fileID: 11400000, guid: 1ddd96264d0ff474fb1b38acae40b69f, type: 2}
|
- {fileID: 11400000, guid: 1ddd96264d0ff474fb1b38acae40b69f, type: 2}
|
||||||
- {fileID: 11400000, guid: f978d621347647a4f8505449e105298e, type: 2}
|
- {fileID: 11400000, guid: f978d621347647a4f8505449e105298e, type: 2}
|
||||||
|
PlayerEquipment: []
|
||||||
|
AllEquipment: []
|
||||||
mission: {fileID: 0}
|
mission: {fileID: 0}
|
||||||
_currentScene: MainMenu
|
_currentScene: MainMenu
|
||||||
|
warning: 1
|
||||||
--- !u!4 &1821969147
|
--- !u!4 &1821969147
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -629,6 +629,7 @@ RectTransform:
|
||||||
- {fileID: 572215991}
|
- {fileID: 572215991}
|
||||||
- {fileID: 1284460230}
|
- {fileID: 1284460230}
|
||||||
- {fileID: 2010774228}
|
- {fileID: 2010774228}
|
||||||
|
- {fileID: 7033075633102272868}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -970,3 +971,820 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2010774227}
|
m_GameObject: {fileID: 2010774227}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!224 &58217759631665255
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3506178501693118069}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.23879457, y: 0.23879457, z: 0.23879457}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 7966085617229658878}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 0.00045776367, y: -3.6786041}
|
||||||
|
m_SizeDelta: {x: 1237.4, y: 248.656}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &196581004300628255
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 994828140751097407}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 70b66ae2355a57c4b8c207f33e7f4af0, type: 3}
|
||||||
|
m_FontSize: 300
|
||||||
|
m_FontStyle: 1
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 3
|
||||||
|
m_MaxSize: 300
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: Warning!
|
||||||
|
--- !u!114 &304713025458743293
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 554577103879885182}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 70b66ae2355a57c4b8c207f33e7f4af0, type: 3}
|
||||||
|
m_FontSize: 300
|
||||||
|
m_FontStyle: 1
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 2
|
||||||
|
m_MaxSize: 300
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: 'We are very glad that you downloaded our first build. It doesn''t reflect
|
||||||
|
a tenth of what we want to see in the game. Just go through a simple demo, tell
|
||||||
|
us about the bugs and have fun! '
|
||||||
|
--- !u!1 &554577103879885182
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5457253045426337712}
|
||||||
|
- component: {fileID: 4604223511199989596}
|
||||||
|
- component: {fileID: 304713025458743293}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: TextArea
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!1 &654431651633552233
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4217807164118416526}
|
||||||
|
- component: {fileID: 8723449715984523787}
|
||||||
|
- component: {fileID: 3660049100715550788}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Panel
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!222 &739081388284638684
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387746426652934283}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &754067590636731847
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6016088942781550791}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
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
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!1 &994828140751097407
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7488227283988255977}
|
||||||
|
- component: {fileID: 2904657802315779517}
|
||||||
|
- component: {fileID: 196581004300628255}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Name
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!222 &1004505116877856381
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3506178501693118069}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &1069125036070169665
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4872186796895608705}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0, g: 0, b: 0, a: 0.44705883}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
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
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!222 &1102915678827361069
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6016088942781550791}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!222 &1118397112616458079
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6556437639590057731}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!114 &1173036072843488308
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3506178501693118069}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 12800000, guid: 70b66ae2355a57c4b8c207f33e7f4af0, type: 3}
|
||||||
|
m_FontSize: 300
|
||||||
|
m_FontStyle: 1
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 10
|
||||||
|
m_MaxSize: 300
|
||||||
|
m_Alignment: 4
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 0
|
||||||
|
m_VerticalOverflow: 0
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text: 'Ok boss
|
||||||
|
|
||||||
|
'
|
||||||
|
--- !u!224 &1464516503656910510
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6556437639590057731}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.39466, y: 0.39466, z: 0.39466}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 8602580430568873593}
|
||||||
|
- {fileID: 7488227283988255977}
|
||||||
|
m_Father: {fileID: 7033075633102272868}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 433}
|
||||||
|
m_SizeDelta: {x: 2323.3213, y: 501.7273}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1526521015728466571
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2402766704999747399}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_Type: 1
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &1682092356193988723
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6556437639590057731}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
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
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!114 &2087423741560963509
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2402766704999747399}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_WrapAround: 0
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_SelectedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_SelectedTrigger: Selected
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 1526521015728466571}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 7352619409620332373}
|
||||||
|
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||||
|
m_MethodName: SetActive
|
||||||
|
m_Mode: 6
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
- m_Target: {fileID: 7352619409620332374}
|
||||||
|
m_TargetAssemblyTypeName: WarningTableClose, Assembly-CSharp
|
||||||
|
m_MethodName: OnClick
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 1
|
||||||
|
m_CallState: 2
|
||||||
|
--- !u!1 &2402766704999747399
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7966085617229658878}
|
||||||
|
- component: {fileID: 5052570420535577448}
|
||||||
|
- component: {fileID: 1526521015728466571}
|
||||||
|
- component: {fileID: 2087423741560963509}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Close
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!222 &2904657802315779517
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 994828140751097407}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!224 &3362204822114878035
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4872186796895608705}
|
||||||
|
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: 7033075633102272868}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 2080.4458, y: 1221.0066}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &3506178501693118069
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 58217759631665255}
|
||||||
|
- component: {fileID: 1004505116877856381}
|
||||||
|
- component: {fileID: 1173036072843488308}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Text
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &3660049100715550788
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 654431651633552233}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
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
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!224 &3681353916692629050
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387746426652934283}
|
||||||
|
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:
|
||||||
|
- {fileID: 4217807164118416526}
|
||||||
|
- {fileID: 5457253045426337712}
|
||||||
|
- {fileID: 7966085617229658878}
|
||||||
|
m_Father: {fileID: 7033075633102272868}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 1659.8256, y: 961.7505}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!224 &4217807164118416526
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 654431651633552233}
|
||||||
|
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: 3681353916692629050}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 1625.8151, y: 922.0717}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &4604223511199989596
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 554577103879885182}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!1 &4872186796895608705
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3362204822114878035}
|
||||||
|
- component: {fileID: 8132933093360626719}
|
||||||
|
- component: {fileID: 1069125036070169665}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Background
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!222 &5052570420535577448
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2402766704999747399}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!224 &5457253045426337712
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 554577103879885182}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.25889438, y: 0.25889438, z: 0.25889438}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 3681353916692629050}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -0.00027466, y: -49.871}
|
||||||
|
m_SizeDelta: {x: 6279.8, y: 2935.8}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &5857298850828319516
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387746426652934283}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
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
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!1 &6016088942781550791
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8602580430568873593}
|
||||||
|
- component: {fileID: 1102915678827361069}
|
||||||
|
- component: {fileID: 754067590636731847}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Panel
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!1 &6387746426652934283
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3681353916692629050}
|
||||||
|
- component: {fileID: 739081388284638684}
|
||||||
|
- component: {fileID: 5857298850828319516}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: BigPanel
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!1 &6556437639590057731
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1464516503656910510}
|
||||||
|
- component: {fileID: 1118397112616458079}
|
||||||
|
- component: {fileID: 1682092356193988723}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: UpPanel
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &7033075633102272868
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7352619409620332373}
|
||||||
|
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:
|
||||||
|
- {fileID: 3362204822114878035}
|
||||||
|
- {fileID: 3681353916692629050}
|
||||||
|
- {fileID: 1464516503656910510}
|
||||||
|
m_Father: {fileID: 1546570636}
|
||||||
|
m_RootOrder: 4
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!1 &7352619409620332373
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7033075633102272868}
|
||||||
|
- component: {fileID: 7352619409620332374}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: Warning
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &7352619409620332374
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7352619409620332373}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6ba3d84aaf2200a42ac1482808035afe, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!224 &7488227283988255977
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 994828140751097407}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.65599346, y: 0.65599346, z: 0.65599346}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1464516503656910510}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: -5.404928, y: 3.736023}
|
||||||
|
m_SizeDelta: {x: 3400.9712, y: 619.2305}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!224 &7966085617229658878
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2402766704999747399}
|
||||||
|
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:
|
||||||
|
- {fileID: 58217759631665255}
|
||||||
|
m_Father: {fileID: 3681353916692629050}
|
||||||
|
m_RootOrder: 2
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: -424}
|
||||||
|
m_SizeDelta: {x: 466.2068, y: 165.9969}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8132933093360626719
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4872186796895608705}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!224 &8602580430568873593
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6016088942781550791}
|
||||||
|
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: 1464516503656910510}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
|
m_SizeDelta: {x: 2227.384, y: 408.969}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &8723449715984523787
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 654431651633552233}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 26866545d8a23654794ff9e8175928b3
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
|
||||||
|
m_Name: 1
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
battleCharacteristics:
|
||||||
|
firstPhaseOptions:
|
||||||
|
enemies:
|
||||||
|
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
|
||||||
|
minimumQuantity: 2
|
||||||
|
maximumQuantity: 2
|
||||||
|
SecondPhase: 0
|
||||||
|
SecondPhaseOptions:
|
||||||
|
enemies: []
|
||||||
|
minimumQuantity: 0
|
||||||
|
maximumQuantity: 0
|
||||||
|
ThirdPhase: 0
|
||||||
|
ThirdPhaseOptions:
|
||||||
|
enemies: []
|
||||||
|
minimumQuantity: 0
|
||||||
|
maximumQuantity: 0
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1cc64428fd69f5341bb81fae9b8ca51a
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
|
||||||
|
m_Name: 2
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
battleCharacteristics:
|
||||||
|
firstPhaseOptions:
|
||||||
|
enemies:
|
||||||
|
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
|
||||||
|
minimumQuantity: 2
|
||||||
|
maximumQuantity: 3
|
||||||
|
SecondPhase: 1
|
||||||
|
SecondPhaseOptions:
|
||||||
|
enemies:
|
||||||
|
- {fileID: 11400000, guid: 311edf240c8ea15449adcfbad6d87fbe, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
|
||||||
|
minimumQuantity: 2
|
||||||
|
maximumQuantity: 3
|
||||||
|
ThirdPhase: 0
|
||||||
|
ThirdPhaseOptions:
|
||||||
|
enemies: []
|
||||||
|
minimumQuantity: 0
|
||||||
|
maximumQuantity: 0
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d8a2a8d8a1d211c4f82cb61312abd421
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b33bbefb941268c4b8f526cc6ecc1eba, type: 3}
|
||||||
|
m_Name: 3
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
battleCharacteristics:
|
||||||
|
firstPhaseOptions:
|
||||||
|
enemies:
|
||||||
|
- {fileID: 11400000, guid: 4f3f54f77793e6742beb0119340b03f5, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 8a0f4f7c6d010e34a9d74f16f1f03e7b, type: 2}
|
||||||
|
minimumQuantity: 3
|
||||||
|
maximumQuantity: 3
|
||||||
|
SecondPhase: 0
|
||||||
|
SecondPhaseOptions:
|
||||||
|
enemies: []
|
||||||
|
minimumQuantity: 0
|
||||||
|
maximumQuantity: 0
|
||||||
|
ThirdPhase: 0
|
||||||
|
ThirdPhaseOptions:
|
||||||
|
enemies: []
|
||||||
|
minimumQuantity: 0
|
||||||
|
maximumQuantity: 0
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fdf98edb4e6c0bf4d804a86f67483f38
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -10,16 +10,16 @@ MonoBehaviour:
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 9c4c6a3d3a1809644803be5d2cb70212, type: 3}
|
m_Script: {fileID: 11500000, guid: 9c4c6a3d3a1809644803be5d2cb70212, type: 3}
|
||||||
m_Name: LongBigDamage
|
m_Name: GrenadeLauncher
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
CardCharacteristics:
|
CardCharacteristics:
|
||||||
cardName: Big Damage
|
cardName: Grenade Launcher
|
||||||
picture: {fileID: 21300000, guid: 49fd699074bfe8742b2664b5fd5b5396, type: 3}
|
picture: {fileID: 21300000, guid: 49fd699074bfe8742b2664b5fd5b5396, type: 3}
|
||||||
description: This is big damage
|
description: This is big damage
|
||||||
specialization: 1
|
specialization: 1
|
||||||
quantityStamina: 2
|
quantityStamina: 2
|
||||||
quantityHealth: 0
|
quantityHealth: 0
|
||||||
damage: 15
|
damage: 15
|
||||||
healing: 0
|
addHealth: 0
|
||||||
addStamina: 0
|
addStamina: 0
|
||||||
armor: 0
|
addArmor: 0
|
||||||
|
|
@ -10,16 +10,16 @@ MonoBehaviour:
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: 9c4c6a3d3a1809644803be5d2cb70212, type: 3}
|
m_Script: {fileID: 11500000, guid: 9c4c6a3d3a1809644803be5d2cb70212, type: 3}
|
||||||
m_Name: UltraMegaAttack
|
m_Name: SniperRifle
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
CardCharacteristics:
|
CardCharacteristics:
|
||||||
cardName: UltraMegaAttack
|
cardName: Sniper Rifle
|
||||||
picture: {fileID: 21300000, guid: 49fd699074bfe8742b2664b5fd5b5396, type: 3}
|
picture: {fileID: 21300000, guid: 49fd699074bfe8742b2664b5fd5b5396, type: 3}
|
||||||
description:
|
description:
|
||||||
specialization: 1
|
specialization: 1
|
||||||
quantityStamina: 0
|
quantityStamina: 3
|
||||||
quantityHealth: 0
|
quantityHealth: 0
|
||||||
damage: 30
|
damage: 20
|
||||||
addHealth: 0
|
addHealth: 0
|
||||||
addStamina: 0
|
addStamina: 0
|
||||||
addArmor: 0
|
addArmor: 0
|
||||||
|
|
@ -29,6 +29,6 @@ public class EquipmentCharacteristic
|
||||||
public string description;
|
public string description;
|
||||||
public Sprite sprite;
|
public Sprite sprite;
|
||||||
public Place place;
|
public Place place;
|
||||||
public GameObject equipmentCard;
|
public GameObject[] equipmentCards;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e99dbdebfc0206140add44c501c04f23, type: 3}
|
||||||
|
m_Name: GrenadeLauncher
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
equipmentCharacteristics:
|
||||||
|
name: GrenadeLauncher
|
||||||
|
description: When dressing, he will give a map of a grenade launcher
|
||||||
|
sprite: {fileID: 21300000, guid: ea1c0d9719d5f2c4cbf28490e87b2caf, type: 3}
|
||||||
|
place: 3
|
||||||
|
equipmentCards:
|
||||||
|
- {fileID: 3374814057080039205, guid: ae1ab462daf0a5c4ca40701af32d6f47, type: 3}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d429453876f16c14d8f0014e412c9aec
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: e99dbdebfc0206140add44c501c04f23, type: 3}
|
||||||
|
m_Name: SniperRifle
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
equipmentCharacteristics:
|
||||||
|
name: Sniper Rifle
|
||||||
|
description: This is good sniper rifle. When dressing, he will give a map of
|
||||||
|
a sniper rifle
|
||||||
|
sprite: {fileID: 21300000, guid: 1f3d695623e698d49bf7296e256823e0, type: 3}
|
||||||
|
place: 3
|
||||||
|
equipmentCards:
|
||||||
|
- {fileID: 6765128094213305608, guid: 36c35c372a23bc349b3f2613d898cdda, type: 3}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f6ea61a22b102dd45bceed1c63f6563a
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -17,5 +17,6 @@ public class MissionCharacteristics
|
||||||
{
|
{
|
||||||
public BattleConfig battle;
|
public BattleConfig battle;
|
||||||
// В будущем сюда добавятся события
|
// В будущем сюда добавятся события
|
||||||
|
public GameObject incident;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,11 @@ MonoBehaviour:
|
||||||
m_Name: FirstMission
|
m_Name: FirstMission
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
missionItems:
|
missionItems:
|
||||||
- battle: {fileID: 11400000, guid: 3cef7b3afdcce6a4a97f2883ee7ce203, type: 2}
|
- battle: {fileID: 0}
|
||||||
- battle: {fileID: 11400000, guid: a58b74e66a955c842842e28c951d39f5, type: 2}
|
incident: {fileID: 7324350391593122206, guid: f49428afd7c561149bc11149a44adf69, type: 3}
|
||||||
- battle: {fileID: 11400000, guid: c4b45319e9ae8c24a9438acde55e9f9a, type: 2}
|
- battle: {fileID: 11400000, guid: 1cc64428fd69f5341bb81fae9b8ca51a, type: 2}
|
||||||
|
incident: {fileID: 8506220429668898645, guid: 2c74eeb2d2cc06748afadc5a8faf9cfb, type: 3}
|
||||||
|
- battle: {fileID: 11400000, guid: d8a2a8d8a1d211c4f82cb61312abd421, type: 2}
|
||||||
|
incident: {fileID: 4688601071261105505, guid: eb5d60415a7229a459ceb2484a2bb6c6, type: 3}
|
||||||
|
- battle: {fileID: 11400000, guid: fdf98edb4e6c0bf4d804a86f67483f38, type: 2}
|
||||||
|
incident: {fileID: 0}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 733e43eab8249c74a8a841384c18ef0e
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class AnswerButton : MonoBehaviour
|
||||||
|
{
|
||||||
|
[Header("for checking")]
|
||||||
|
public IncidentSystem currentIncident;
|
||||||
|
public int phaseIndex;
|
||||||
|
public void OnClick()
|
||||||
|
{
|
||||||
|
Debug.Log("CLICK! " + phaseIndex);
|
||||||
|
currentIncident.NewPhrase(phaseIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ba6d1fc5e3e069240bdcdc765f35b25c
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,79 @@
|
||||||
|
using UnityEngine;
|
||||||
|
using System.Collections;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class IncidentSystem : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
public Text namePanel;
|
||||||
|
public string nameString;
|
||||||
|
public Node[] node;
|
||||||
|
public int _currentNode;
|
||||||
|
public bool ShowDialogue = true;
|
||||||
|
|
||||||
|
public Text textArea;
|
||||||
|
public Button[] answerButtons;
|
||||||
|
public Button closeIncident;
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
NewPhrase(0);
|
||||||
|
namePanel.text = nameString;
|
||||||
|
}
|
||||||
|
public void CloseTab()
|
||||||
|
{
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
|
public void NewPhrase(int _phraseIndex)
|
||||||
|
{
|
||||||
|
Debug.Log("NEW PHASE! " + _phraseIndex);
|
||||||
|
if (ShowDialogue == false) CloseTab();
|
||||||
|
Player.main.ChangeHp(node[_phraseIndex].damage);
|
||||||
|
for (int i = 0; i < answerButtons.Length; i++)
|
||||||
|
{
|
||||||
|
answerButtons[i].gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
textArea.text = node[_phraseIndex].phrase;
|
||||||
|
if (node[_phraseIndex].PlayerAnswer.Length == 0)
|
||||||
|
{
|
||||||
|
closeIncident.gameObject.SetActive(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int j = 0;
|
||||||
|
for (int i = 0; i < node[_phraseIndex].PlayerAnswer.Length; i++)
|
||||||
|
{
|
||||||
|
if (j >= answerButtons.Length) Debug.LogError("Warning! there are more answers than buttons");
|
||||||
|
answerButtons[j].gameObject.SetActive(true);
|
||||||
|
answerButtons[j].GetComponentInChildren<Text>().text = node[_phraseIndex].PlayerAnswer[i].text;
|
||||||
|
answerButtons[j].GetComponent<AnswerButton>().phaseIndex = node[_phraseIndex].PlayerAnswer[i].toNode;
|
||||||
|
if (node[_phraseIndex].reward != null)
|
||||||
|
{
|
||||||
|
DataHolder.main.AddEquipmentToPlayerInventory(node[_phraseIndex].reward);
|
||||||
|
}
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class Node
|
||||||
|
{
|
||||||
|
[TextArea (3,20)]
|
||||||
|
public string phrase;
|
||||||
|
|
||||||
|
public Answer[] PlayerAnswer;
|
||||||
|
public GameObject reward;
|
||||||
|
[Header("Effects")]
|
||||||
|
public int damage;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class Answer
|
||||||
|
{
|
||||||
|
[TextArea(3, 10)]
|
||||||
|
public string text;
|
||||||
|
public int toNode;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0ccc15b966db97842b7ae244f3c72748
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -33,16 +33,17 @@ public class Session : MonoBehaviour
|
||||||
[Header("UI")]
|
[Header("UI")]
|
||||||
[Space]
|
[Space]
|
||||||
[SerializeField] private PhaseCounter phaseCounter;
|
[SerializeField] private PhaseCounter phaseCounter;
|
||||||
|
[SerializeField] private Transform incidentPosition;
|
||||||
[Space(3)]
|
[Space(3)]
|
||||||
[Header("For checking")]
|
[Header("For checking")]
|
||||||
[SerializeField] private BattleConfig battleConfig;
|
[SerializeField] private BattleConfig battleConfig;
|
||||||
public int numberPhase = 1;
|
public int numberPhase = 1;
|
||||||
public int quantityEnemies = 0;
|
public int quantityEnemies = 0;
|
||||||
public bool waitingEndingRound = false;
|
public bool waitingEndingRound = false;
|
||||||
[SerializeField] private BattleConfig nextLevel;
|
|
||||||
public List<GameObject> currentEnemies = new List<GameObject>();
|
|
||||||
|
|
||||||
|
public List<GameObject> currentEnemies = new List<GameObject>();
|
||||||
|
public MissionConfig mission;
|
||||||
|
public int missionChecker = 0;
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
if (main != null && main != this)
|
if (main != null && main != this)
|
||||||
|
|
@ -52,9 +53,13 @@ public class Session : MonoBehaviour
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
main = this;
|
main = this;
|
||||||
|
mission = DataHolder.main.mission;
|
||||||
battleConfig = SearchNextLevel();
|
battleConfig = SearchNextLevel();
|
||||||
nextLevel = SearchNextLevel();
|
if(battleConfig == null)
|
||||||
Debug.Log(battleConfig.name + " " + nextLevel.name);
|
{
|
||||||
|
Incident();
|
||||||
|
battleConfig = SearchNextLevel();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
|
|
@ -247,35 +252,46 @@ public class Session : MonoBehaviour
|
||||||
|
|
||||||
public void LaunchNextLevel()
|
public void LaunchNextLevel()
|
||||||
{
|
{
|
||||||
if (nextLevel == null)
|
|
||||||
|
onNextLevel?.Invoke();
|
||||||
|
}
|
||||||
|
public void LaunchMainMenu()
|
||||||
|
{
|
||||||
|
DataHolder.main.mission = null;
|
||||||
|
DataHolder.main.ReturnInMainMenu();
|
||||||
|
}
|
||||||
|
public void NextLevel()
|
||||||
|
{
|
||||||
|
battleConfig = SearchNextLevel() ;
|
||||||
|
if (battleConfig == null)
|
||||||
{
|
{
|
||||||
DataHolder.main.mission = null;
|
DataHolder.main.mission = null;
|
||||||
DataHolder.main.ReturnInMainMenu();
|
DataHolder.main.ReturnInMainMenu();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
phaseCounter.NewMaxPhase(nextLevel);
|
phaseCounter.NewMaxPhase(battleConfig);
|
||||||
onNextLevel?.Invoke();
|
|
||||||
}
|
|
||||||
public void NextLevel()
|
|
||||||
{
|
|
||||||
|
|
||||||
battleConfig = nextLevel;
|
|
||||||
nextLevel = SearchNextLevel() ;
|
|
||||||
|
|
||||||
FirstPhase();
|
FirstPhase();
|
||||||
}
|
}
|
||||||
public BattleConfig SearchNextLevel()
|
public BattleConfig SearchNextLevel()
|
||||||
{
|
{
|
||||||
if(DataHolder.main.mission != null)
|
if(mission != null)
|
||||||
{
|
{
|
||||||
return DataHolder.main.NextBattle();
|
return NextBattle();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return DataHolder.main.RandomLevel(DataHolder.complexityLevels.all);
|
return DataHolder.main.RandomLevel(DataHolder.complexityLevels.all);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public BattleConfig NextBattle()
|
||||||
|
{
|
||||||
|
missionChecker++;
|
||||||
|
if (missionChecker > mission.missionItems.Count)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return mission.missionItems[missionChecker - 1].battle;
|
||||||
|
}
|
||||||
public void UseEquipment()
|
public void UseEquipment()
|
||||||
{
|
{
|
||||||
for (int i = 0; i < DataHolder.main.PlayerEquipment.Count; i++)
|
for (int i = 0; i < DataHolder.main.PlayerEquipment.Count; i++)
|
||||||
|
|
@ -283,4 +299,10 @@ public class Session : MonoBehaviour
|
||||||
Instantiate(DataHolder.main.PlayerEquipment[i], equipmentParent.transform);
|
Instantiate(DataHolder.main.PlayerEquipment[i], equipmentParent.transform);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public void Incident()
|
||||||
|
{
|
||||||
|
if (mission == null || missionChecker >= mission.missionItems.Count) return;
|
||||||
|
|
||||||
|
Instantiate(mission.missionItems[missionChecker - 1].incident, incidentPosition);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class WarningTableClose : MonoBehaviour
|
||||||
|
{
|
||||||
|
public void OnClick()
|
||||||
|
{
|
||||||
|
DataHolder.main.warning = false;
|
||||||
|
}
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
gameObject.SetActive(DataHolder.main.warning);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6ba3d84aaf2200a42ac1482808035afe
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
|
@ -1,6 +1,30 @@
|
||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &1
|
--- !u!114 &1
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_PixelRect:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: -469.6
|
||||||
|
y: 328.80002
|
||||||
|
width: 952
|
||||||
|
height: 504.80002
|
||||||
|
m_ShowMode: 0
|
||||||
|
m_Title: Console
|
||||||
|
m_RootView: {fileID: 4}
|
||||||
|
m_MinSize: {x: 101, y: 123}
|
||||||
|
m_MaxSize: {x: 4001, y: 4023}
|
||||||
|
m_Maximized: 0
|
||||||
|
--- !u!114 &2
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -19,18 +43,62 @@ MonoBehaviour:
|
||||||
width: 1536
|
width: 1536
|
||||||
height: 780.8
|
height: 780.8
|
||||||
m_ShowMode: 4
|
m_ShowMode: 4
|
||||||
<<<<<<< HEAD
|
m_Title: Hierarchy
|
||||||
m_Title: Inspector
|
m_RootView: {fileID: 5}
|
||||||
m_RootView: {fileID: 2}
|
|
||||||
m_MinSize: {x: 875, y: 492}
|
m_MinSize: {x: 875, y: 492}
|
||||||
=======
|
|
||||||
m_Title: Project
|
|
||||||
m_RootView: {fileID: 6}
|
|
||||||
m_MinSize: {x: 875, y: 542}
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_MaxSize: {x: 10000, y: 10000}
|
m_MaxSize: {x: 10000, y: 10000}
|
||||||
m_Maximized: 1
|
m_Maximized: 1
|
||||||
--- !u!114 &2
|
--- !u!114 &3
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name: ConsoleWindow
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Children: []
|
||||||
|
m_Position:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 952
|
||||||
|
height: 504.80002
|
||||||
|
m_MinSize: {x: 101, y: 123}
|
||||||
|
m_MaxSize: {x: 4001, y: 4023}
|
||||||
|
m_ActualView: {fileID: 15}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 15}
|
||||||
|
m_Selected: 0
|
||||||
|
m_LastSelected: 0
|
||||||
|
--- !u!114 &4
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 3}
|
||||||
|
m_Position:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 952
|
||||||
|
height: 504.80002
|
||||||
|
m_MinSize: {x: 101, y: 123}
|
||||||
|
m_MaxSize: {x: 4001, y: 4023}
|
||||||
|
vertical: 0
|
||||||
|
controlID: 31648
|
||||||
|
--- !u!114 &5
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -43,13 +111,12 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 3}
|
- {fileID: 6}
|
||||||
- {fileID: 4}
|
- {fileID: 7}
|
||||||
- {fileID: 5}
|
- {fileID: 8}
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
<<<<<<< HEAD
|
|
||||||
y: 0
|
y: 0
|
||||||
width: 1536
|
width: 1536
|
||||||
height: 780.8
|
height: 780.8
|
||||||
|
|
@ -59,16 +126,7 @@ MonoBehaviour:
|
||||||
m_TopViewHeight: 30
|
m_TopViewHeight: 30
|
||||||
m_UseBottomView: 1
|
m_UseBottomView: 1
|
||||||
m_BottomViewHeight: 20
|
m_BottomViewHeight: 20
|
||||||
=======
|
--- !u!114 &6
|
||||||
y: 30
|
|
||||||
width: 1920
|
|
||||||
height: 947
|
|
||||||
m_MinSize: {x: 679, y: 492}
|
|
||||||
m_MaxSize: {x: 14002, y: 14042}
|
|
||||||
vertical: 0
|
|
||||||
controlID: 121
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
--- !u!114 &3
|
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -90,112 +148,9 @@ MonoBehaviour:
|
||||||
m_MinSize: {x: 0, y: 0}
|
m_MinSize: {x: 0, y: 0}
|
||||||
m_MaxSize: {x: 0, y: 0}
|
m_MaxSize: {x: 0, y: 0}
|
||||||
m_LoadedToolbars:
|
m_LoadedToolbars:
|
||||||
- {fileID: 17}
|
- {fileID: 21}
|
||||||
m_MainToolbar: {fileID: 17}
|
m_MainToolbar: {fileID: 21}
|
||||||
m_LastLoadedLayoutName: 2 by 3
|
m_LastLoadedLayoutName: 2 by 3
|
||||||
--- !u!114 &4
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 52
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 0}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 1
|
|
||||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Children:
|
|
||||||
- {fileID: 6}
|
|
||||||
- {fileID: 7}
|
|
||||||
- {fileID: 8}
|
|
||||||
- {fileID: 9}
|
|
||||||
m_Position:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 30
|
|
||||||
width: 1536
|
|
||||||
height: 730.8
|
|
||||||
m_MinSize: {x: 910, y: 442}
|
|
||||||
m_MaxSize: {x: 22005, y: 10021}
|
|
||||||
vertical: 0
|
|
||||||
controlID: 1026
|
|
||||||
--- !u!114 &5
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 52
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 0}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 1
|
|
||||||
<<<<<<< HEAD
|
|
||||||
m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name:
|
|
||||||
=======
|
|
||||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name: ProjectBrowser
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Children: []
|
|
||||||
m_Position:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
<<<<<<< HEAD
|
|
||||||
y: 760.8
|
|
||||||
width: 1536
|
|
||||||
height: 20
|
|
||||||
m_MinSize: {x: 0, y: 0}
|
|
||||||
m_MaxSize: {x: 0, y: 0}
|
|
||||||
=======
|
|
||||||
y: 573
|
|
||||||
width: 1531
|
|
||||||
height: 374
|
|
||||||
m_MinSize: {x: 231, y: 271}
|
|
||||||
m_MaxSize: {x: 10001, y: 10021}
|
|
||||||
m_ActualView: {fileID: 13}
|
|
||||||
m_Panes:
|
|
||||||
- {fileID: 13}
|
|
||||||
- {fileID: 18}
|
|
||||||
m_Selected: 0
|
|
||||||
m_LastSelected: 1
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
--- !u!114 &6
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 52
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 0}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 1
|
|
||||||
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Children:
|
|
||||||
- {fileID: 10}
|
|
||||||
- {fileID: 11}
|
|
||||||
m_Position:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
<<<<<<< HEAD
|
|
||||||
width: 827.2
|
|
||||||
height: 730.8
|
|
||||||
m_MinSize: {x: 201, y: 442}
|
|
||||||
m_MaxSize: {x: 4001, y: 8042}
|
|
||||||
vertical: 1
|
|
||||||
controlID: 1005
|
|
||||||
=======
|
|
||||||
width: 1920
|
|
||||||
height: 997
|
|
||||||
m_MinSize: {x: 875, y: 542}
|
|
||||||
m_MaxSize: {x: 10000, y: 10000}
|
|
||||||
m_UseTopView: 1
|
|
||||||
m_TopViewHeight: 30
|
|
||||||
m_UseBottomView: 1
|
|
||||||
m_BottomViewHeight: 20
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
--- !u!114 &7
|
--- !u!114 &7
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
|
@ -205,23 +160,24 @@ MonoBehaviour:
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 1
|
m_EditorHideFlags: 1
|
||||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children: []
|
m_Children:
|
||||||
|
- {fileID: 9}
|
||||||
|
- {fileID: 10}
|
||||||
|
- {fileID: 11}
|
||||||
|
- {fileID: 12}
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 827.2
|
x: 0
|
||||||
y: 0
|
y: 30
|
||||||
width: 201.6
|
width: 1536
|
||||||
height: 730.8
|
height: 730.8
|
||||||
m_MinSize: {x: 202, y: 221}
|
m_MinSize: {x: 908, y: 442}
|
||||||
m_MaxSize: {x: 4002, y: 4021}
|
m_MaxSize: {x: 22003, y: 10021}
|
||||||
m_ActualView: {fileID: 12}
|
vertical: 0
|
||||||
m_Panes:
|
controlID: 148
|
||||||
- {fileID: 12}
|
|
||||||
m_Selected: 0
|
|
||||||
m_LastSelected: 0
|
|
||||||
--- !u!114 &8
|
--- !u!114 &8
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
|
@ -231,23 +187,18 @@ MonoBehaviour:
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 1
|
m_EditorHideFlags: 1
|
||||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1028.8
|
x: 0
|
||||||
y: 0
|
y: 760.8
|
||||||
width: 232
|
width: 1536
|
||||||
height: 730.8
|
height: 20
|
||||||
m_MinSize: {x: 232, y: 271}
|
m_MinSize: {x: 0, y: 0}
|
||||||
m_MaxSize: {x: 10002, y: 10021}
|
m_MaxSize: {x: 0, y: 0}
|
||||||
m_ActualView: {fileID: 14}
|
|
||||||
m_Panes:
|
|
||||||
- {fileID: 14}
|
|
||||||
m_Selected: 0
|
|
||||||
m_LastSelected: 0
|
|
||||||
--- !u!114 &9
|
--- !u!114 &9
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
|
@ -257,32 +208,22 @@ MonoBehaviour:
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 1
|
m_EditorHideFlags: 1
|
||||||
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_Children: []
|
m_Children:
|
||||||
|
- {fileID: 13}
|
||||||
|
- {fileID: 14}
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1260.8
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
<<<<<<< HEAD
|
width: 710.4
|
||||||
width: 275.19995
|
|
||||||
height: 730.8
|
height: 730.8
|
||||||
m_MinSize: {x: 275, y: 50}
|
m_MinSize: {x: 201, y: 442}
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
m_MaxSize: {x: 4001, y: 8042}
|
||||||
m_ActualView: {fileID: 13}
|
|
||||||
m_Panes:
|
|
||||||
- {fileID: 13}
|
|
||||||
m_Selected: 0
|
|
||||||
m_LastSelected: 0
|
|
||||||
=======
|
|
||||||
width: 1531
|
|
||||||
height: 947
|
|
||||||
m_MinSize: {x: 403, y: 492}
|
|
||||||
m_MaxSize: {x: 10001, y: 14042}
|
|
||||||
vertical: 1
|
vertical: 1
|
||||||
controlID: 99
|
controlID: 242
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
--- !u!114 &10
|
--- !u!114 &10
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
|
@ -298,26 +239,17 @@ MonoBehaviour:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 710.4
|
||||||
y: 0
|
y: 0
|
||||||
<<<<<<< HEAD
|
width: 200.8
|
||||||
width: 827.2
|
height: 730.8
|
||||||
height: 220.8
|
m_MinSize: {x: 200, y: 200}
|
||||||
m_MinSize: {x: 201, y: 221}
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
m_MaxSize: {x: 4001, y: 4021}
|
|
||||||
m_ActualView: {fileID: 16}
|
m_ActualView: {fileID: 16}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 16}
|
- {fileID: 16}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
=======
|
|
||||||
width: 1531
|
|
||||||
height: 573
|
|
||||||
m_MinSize: {x: 403, y: 221}
|
|
||||||
m_MaxSize: {x: 8003, y: 4021}
|
|
||||||
vertical: 0
|
|
||||||
controlID: 100
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
--- !u!114 &11
|
--- !u!114 &11
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
|
|
@ -333,18 +265,121 @@ MonoBehaviour:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Position:
|
m_Position:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 911.2
|
||||||
y: 220.8
|
y: 0
|
||||||
width: 827.2
|
width: 281.6
|
||||||
height: 510
|
height: 730.8
|
||||||
m_MinSize: {x: 201, y: 221}
|
m_MinSize: {x: 232, y: 271}
|
||||||
m_MaxSize: {x: 4001, y: 4021}
|
m_MaxSize: {x: 10002, y: 10021}
|
||||||
m_ActualView: {fileID: 15}
|
m_ActualView: {fileID: 18}
|
||||||
m_Panes:
|
m_Panes:
|
||||||
- {fileID: 15}
|
- {fileID: 18}
|
||||||
m_Selected: 0
|
m_Selected: 0
|
||||||
m_LastSelected: 0
|
m_LastSelected: 0
|
||||||
--- !u!114 &12
|
--- !u!114 &12
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 1
|
||||||
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Children: []
|
||||||
|
m_Position:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 1192.8
|
||||||
|
y: 0
|
||||||
|
width: 343.19995
|
||||||
|
height: 730.8
|
||||||
|
m_MinSize: {x: 275, y: 50}
|
||||||
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
|
m_ActualView: {fileID: 17}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 17}
|
||||||
|
m_Selected: 0
|
||||||
|
m_LastSelected: 0
|
||||||
|
--- !u!114 &13
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 1
|
||||||
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Children: []
|
||||||
|
m_Position:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
width: 710.4
|
||||||
|
height: 200
|
||||||
|
m_MinSize: {x: 200, y: 200}
|
||||||
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
|
m_ActualView: {fileID: 20}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 20}
|
||||||
|
m_Selected: 0
|
||||||
|
m_LastSelected: 0
|
||||||
|
--- !u!114 &14
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 1
|
||||||
|
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Children: []
|
||||||
|
m_Position:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: 0
|
||||||
|
y: 200
|
||||||
|
width: 710.4
|
||||||
|
height: 530.8
|
||||||
|
m_MinSize: {x: 200, y: 200}
|
||||||
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
|
m_ActualView: {fileID: 19}
|
||||||
|
m_Panes:
|
||||||
|
- {fileID: 19}
|
||||||
|
m_Selected: 0
|
||||||
|
m_LastSelected: 0
|
||||||
|
--- !u!114 &15
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 52
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_MinSize: {x: 100, y: 100}
|
||||||
|
m_MaxSize: {x: 4000, y: 4000}
|
||||||
|
m_TitleContent:
|
||||||
|
m_Text: Console
|
||||||
|
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
|
||||||
|
m_Tooltip:
|
||||||
|
m_Pos:
|
||||||
|
serializedVersion: 2
|
||||||
|
x: -469.6
|
||||||
|
y: 328.80002
|
||||||
|
width: 952
|
||||||
|
height: 483.80002
|
||||||
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
|
--- !u!114 &16
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -364,41 +399,41 @@ MonoBehaviour:
|
||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 827.2
|
x: 710.4
|
||||||
y: 73.6
|
y: 73.6
|
||||||
width: 199.6
|
width: 198.8
|
||||||
height: 709.8
|
height: 709.8
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_SceneHierarchy:
|
m_SceneHierarchy:
|
||||||
m_TreeViewState:
|
m_TreeViewState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs: 9a430000
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
m_ExpandedIDs: f8e8ffff04e9ffff38f8ffff3af8ffff9c490000b8490000d4630000
|
m_ExpandedIDs: d000fffff815ffff7a16ffff8816ffffe463ffff186effff2087ffff2e87ffff3087ffff1a8cffff288cffff2a8cffff3892ffff0093ffffaa93ffff5494ffff4a99ffff5899ffff5a99ffffc0aeffffc2aeffffe2b8fffff0b8fffff2b8ffffbcbcffff7ec1ffff02e2ffff98e4ffff02eaffff00efffffeaf0ffffe6faffffe8faffff4445000094450000e0450000f4570000006900009c690000a26b0000347000009c710000bc720000647900008c7900001c7a0000847a0000e87a00001e82000034880000548900005a8d00007a8e0000e28f000002910000e8a50000fab2000096b30000f8c3000046c4000062c4000064c4000068c4000054c9000088c90000d0c9000024ca0000
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name: NextLevelButton
|
||||||
m_OriginalName:
|
m_OriginalName: NextLevelButton
|
||||||
m_EditFieldRect:
|
m_EditFieldRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 0
|
width: 0
|
||||||
height: 0
|
height: 0
|
||||||
m_UserData: 0
|
m_UserData: -65328
|
||||||
m_IsWaitingForDelay: 0
|
m_IsWaitingForDelay: 0
|
||||||
m_IsRenaming: 0
|
m_IsRenaming: 0
|
||||||
m_OriginalEventType: 11
|
m_OriginalEventType: 0
|
||||||
m_IsRenamingFilename: 0
|
m_IsRenamingFilename: 0
|
||||||
m_ClientGUIView: {fileID: 0}
|
m_ClientGUIView: {fileID: 10}
|
||||||
m_SearchString:
|
m_SearchString:
|
||||||
m_ExpandedScenes: []
|
m_ExpandedScenes: []
|
||||||
m_CurrenRootInstanceID: 0
|
m_CurrenRootInstanceID: 0
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_CurrentSortingName: TransformSorting
|
m_CurrentSortingName: TransformSorting
|
||||||
m_WindowGUID: 19e906dd08ae33e4586b122dcf946237
|
m_WindowGUID: 765f837ef53dd184c9a4f532c28a73c2
|
||||||
--- !u!114 &13
|
--- !u!114 &17
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -418,9 +453,9 @@ MonoBehaviour:
|
||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1260.8
|
x: 1192.8
|
||||||
y: 73.6
|
y: 73.6
|
||||||
width: 274.19995
|
width: 342.19995
|
||||||
height: 709.8
|
height: 709.8
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_ObjectsLockedBeforeSerialization: []
|
m_ObjectsLockedBeforeSerialization: []
|
||||||
|
|
@ -435,7 +470,7 @@ MonoBehaviour:
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_PreviewWindow: {fileID: 0}
|
m_PreviewWindow: {fileID: 0}
|
||||||
--- !u!114 &14
|
--- !u!114 &18
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -455,9 +490,9 @@ MonoBehaviour:
|
||||||
m_Tooltip:
|
m_Tooltip:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 1028.8
|
x: 911.2
|
||||||
y: 73.6
|
y: 73.6
|
||||||
width: 230
|
width: 279.6
|
||||||
height: 709.8
|
height: 709.8
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_SearchFilter:
|
m_SearchFilter:
|
||||||
|
|
@ -473,38 +508,22 @@ MonoBehaviour:
|
||||||
m_SkipHidden: 0
|
m_SkipHidden: 0
|
||||||
m_SearchArea: 1
|
m_SearchArea: 1
|
||||||
m_Folders:
|
m_Folders:
|
||||||
<<<<<<< HEAD
|
- Assets/Prefabs/Incidents/Standart
|
||||||
- Assets/Scripts/Configs/EquipmentConfigs
|
|
||||||
=======
|
|
||||||
- Assets/Scripts/Configs
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_Globs: []
|
m_Globs: []
|
||||||
m_OriginalText:
|
m_OriginalText:
|
||||||
m_ViewMode: 1
|
m_ViewMode: 1
|
||||||
m_StartGridSize: 16
|
m_StartGridSize: 16
|
||||||
m_LastFolders:
|
m_LastFolders:
|
||||||
<<<<<<< HEAD
|
- Assets/Prefabs/Incidents/Standart
|
||||||
- Assets/Scripts/Configs/EquipmentConfigs
|
|
||||||
m_LastFoldersGridSize: 16
|
m_LastFoldersGridSize: 16
|
||||||
m_LastProjectPath: C:\Users\Dara\Documents\1\PO
|
m_LastProjectPath: C:\Users\Dara\Documents\1\PO
|
||||||
=======
|
|
||||||
- Assets/Scripts/Configs
|
|
||||||
m_LastFoldersGridSize: -1
|
|
||||||
m_LastProjectPath: "E:\\Projects \u0441#\\Unity\\omega"
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_LockTracker:
|
m_LockTracker:
|
||||||
m_IsLocked: 0
|
m_IsLocked: 0
|
||||||
m_FolderTreeState:
|
m_FolderTreeState:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
<<<<<<< HEAD
|
m_SelectedIDs: 744b0000
|
||||||
m_SelectedIDs: 9a420000
|
m_LastClickedID: 19316
|
||||||
m_LastClickedID: 17050
|
m_ExpandedIDs: 000000002c4300002e430000324300003a430000404300006c4300001e4400001e4b000000ca9a3b
|
||||||
m_ExpandedIDs: 000000006042000062420000664200006c4200007042000000ca9a3b
|
|
||||||
=======
|
|
||||||
m_SelectedIDs: 3c430000
|
|
||||||
m_LastClickedID: 17212
|
|
||||||
m_ExpandedIDs: 0000000036430000384300003a4300003c4300004c43000000ca9a3b
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|
@ -532,11 +551,7 @@ MonoBehaviour:
|
||||||
scrollPos: {x: 0, y: 0}
|
scrollPos: {x: 0, y: 0}
|
||||||
m_SelectedIDs:
|
m_SelectedIDs:
|
||||||
m_LastClickedID: 0
|
m_LastClickedID: 0
|
||||||
<<<<<<< HEAD
|
m_ExpandedIDs: 000000002c4300002e43000000ca9a3b
|
||||||
m_ExpandedIDs: 00000000604200006c42000000ca9a3b
|
|
||||||
=======
|
|
||||||
m_ExpandedIDs: 0000000036430000384300003a4300003c430000
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|
@ -567,20 +582,20 @@ MonoBehaviour:
|
||||||
m_ExpandedInstanceIDs:
|
m_ExpandedInstanceIDs:
|
||||||
m_RenameOverlay:
|
m_RenameOverlay:
|
||||||
m_UserAcceptedRename: 0
|
m_UserAcceptedRename: 0
|
||||||
m_Name: Prefabs
|
m_Name:
|
||||||
m_OriginalName: Prefabs
|
m_OriginalName:
|
||||||
m_EditFieldRect:
|
m_EditFieldRect:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 0
|
y: 0
|
||||||
width: 0
|
width: 0
|
||||||
height: 0
|
height: 0
|
||||||
m_UserData: 17004
|
m_UserData: 0
|
||||||
m_IsWaitingForDelay: 0
|
m_IsWaitingForDelay: 0
|
||||||
m_IsRenaming: 0
|
m_IsRenaming: 0
|
||||||
m_OriginalEventType: 0
|
m_OriginalEventType: 11
|
||||||
m_IsRenamingFilename: 1
|
m_IsRenamingFilename: 1
|
||||||
m_ClientGUIView: {fileID: 8}
|
m_ClientGUIView: {fileID: 11}
|
||||||
m_CreateAssetUtility:
|
m_CreateAssetUtility:
|
||||||
m_EndAction: {fileID: 0}
|
m_EndAction: {fileID: 0}
|
||||||
m_InstanceID: 0
|
m_InstanceID: 0
|
||||||
|
|
@ -591,8 +606,8 @@ MonoBehaviour:
|
||||||
m_ScrollPosition: {x: 0, y: 0}
|
m_ScrollPosition: {x: 0, y: 0}
|
||||||
m_GridSize: 16
|
m_GridSize: 16
|
||||||
m_SkipHiddenPackages: 0
|
m_SkipHiddenPackages: 0
|
||||||
m_DirectoriesAreaWidth: 110
|
m_DirectoriesAreaWidth: 159.6
|
||||||
--- !u!114 &15
|
--- !u!114 &19
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -613,11 +628,10 @@ MonoBehaviour:
|
||||||
m_Pos:
|
m_Pos:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 294.4
|
y: 273.6
|
||||||
width: 826.2
|
width: 709.4
|
||||||
height: 489
|
height: 509.8
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
<<<<<<< HEAD
|
|
||||||
m_SerializedViewNames: []
|
m_SerializedViewNames: []
|
||||||
m_SerializedViewValues: []
|
m_SerializedViewValues: []
|
||||||
m_PlayModeViewName: GameView
|
m_PlayModeViewName: GameView
|
||||||
|
|
@ -660,10 +674,10 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 21
|
y: 21
|
||||||
width: 826.2
|
width: 709.4
|
||||||
height: 468
|
height: 488.8
|
||||||
m_Scale: {x: 0.5378906, y: 0.5378906}
|
m_Scale: {x: 0.46184897, y: 0.46184897}
|
||||||
m_Translation: {x: 413.09998, y: 234}
|
m_Translation: {x: 354.7, y: 244.4}
|
||||||
m_MarginLeft: 0
|
m_MarginLeft: 0
|
||||||
m_MarginRight: 0
|
m_MarginRight: 0
|
||||||
m_MarginTop: 0
|
m_MarginTop: 0
|
||||||
|
|
@ -671,49 +685,18 @@ MonoBehaviour:
|
||||||
m_LastShownAreaInsideMargins:
|
m_LastShownAreaInsideMargins:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: -768
|
x: -768
|
||||||
y: -435.03268
|
y: -529.1773
|
||||||
width: 1536
|
width: 1536
|
||||||
height: 870.06537
|
height: 1058.3546
|
||||||
m_MinimalGUI: 1
|
m_MinimalGUI: 1
|
||||||
m_defaultScale: 0.5378906
|
m_defaultScale: 0.46184897
|
||||||
m_LastWindowPixelSize: {x: 1032.75, y: 611.25}
|
m_LastWindowPixelSize: {x: 886.75, y: 637.25}
|
||||||
m_ClearInEditMode: 1
|
m_ClearInEditMode: 1
|
||||||
m_NoCameraWarning: 1
|
m_NoCameraWarning: 1
|
||||||
m_LowResolutionForAspectRatios: 00000000000000000000
|
m_LowResolutionForAspectRatios: 00000000000000000000
|
||||||
m_XRRenderMode: 0
|
m_XRRenderMode: 0
|
||||||
m_RenderTexture: {fileID: 0}
|
m_RenderTexture: {fileID: 0}
|
||||||
=======
|
--- !u!114 &20
|
||||||
m_SceneHierarchy:
|
|
||||||
m_TreeViewState:
|
|
||||||
scrollPos: {x: 0, y: 0}
|
|
||||||
m_SelectedIDs: 7e150000
|
|
||||||
m_LastClickedID: 0
|
|
||||||
m_ExpandedIDs:
|
|
||||||
m_RenameOverlay:
|
|
||||||
m_UserAcceptedRename: 0
|
|
||||||
m_Name:
|
|
||||||
m_OriginalName:
|
|
||||||
m_EditFieldRect:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
width: 0
|
|
||||||
height: 0
|
|
||||||
m_UserData: 0
|
|
||||||
m_IsWaitingForDelay: 0
|
|
||||||
m_IsRenaming: 0
|
|
||||||
m_OriginalEventType: 11
|
|
||||||
m_IsRenamingFilename: 0
|
|
||||||
m_ClientGUIView: {fileID: 4}
|
|
||||||
m_SearchString:
|
|
||||||
m_ExpandedScenes: []
|
|
||||||
m_CurrenRootInstanceID: 0
|
|
||||||
m_LockTracker:
|
|
||||||
m_IsLocked: 0
|
|
||||||
m_CurrentSortingName: TransformSorting
|
|
||||||
m_WindowGUID: 7ddebfce81a55de4fa6d80ec2c90ba37
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
--- !u!114 &16
|
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 52
|
m_ObjectHideFlags: 52
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|
@ -735,11 +718,11 @@ MonoBehaviour:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
x: 0
|
x: 0
|
||||||
y: 73.6
|
y: 73.6
|
||||||
width: 826.2
|
width: 709.4
|
||||||
height: 199.8
|
height: 179
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
m_ViewDataDictionary: {fileID: 0}
|
||||||
m_ShowContextualTools: 0
|
m_ShowContextualTools: 0
|
||||||
m_WindowGUID: 55153e7b2f8e03e43b1c7a7f07dfbb06
|
m_WindowGUID: 9b8a427b73aeef64f8bdbfa4af791c50
|
||||||
m_Gizmos: 1
|
m_Gizmos: 1
|
||||||
m_OverrideSceneCullingMask: 6917529027641081856
|
m_OverrideSceneCullingMask: 6917529027641081856
|
||||||
m_SceneIsLit: 1
|
m_SceneIsLit: 1
|
||||||
|
|
@ -749,9 +732,9 @@ MonoBehaviour:
|
||||||
m_PlayAudio: 0
|
m_PlayAudio: 0
|
||||||
m_AudioPlay: 0
|
m_AudioPlay: 0
|
||||||
m_Position:
|
m_Position:
|
||||||
m_Target: {x: 491.90097, y: 246.7495, z: -100.333046}
|
m_Target: {x: 413.4117, y: 306.0644, z: 0}
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: 491.90097, y: 246.7495, z: -100.333046}
|
m_Value: {x: 413.4117, y: 306.0644, z: 0}
|
||||||
m_RenderMode: 0
|
m_RenderMode: 0
|
||||||
m_CameraMode:
|
m_CameraMode:
|
||||||
drawMode: 0
|
drawMode: 0
|
||||||
|
|
@ -802,9 +785,9 @@ MonoBehaviour:
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
m_Value: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_Size:
|
m_Size:
|
||||||
m_Target: 247.38484
|
m_Target: 321.09973
|
||||||
speed: 2
|
speed: 2
|
||||||
m_Value: 247.38484
|
m_Value: 321.09973
|
||||||
m_Ortho:
|
m_Ortho:
|
||||||
m_Target: 1
|
m_Target: 1
|
||||||
speed: 2
|
speed: 2
|
||||||
|
|
@ -829,125 +812,8 @@ MonoBehaviour:
|
||||||
m_SceneVisActive: 1
|
m_SceneVisActive: 1
|
||||||
m_LastLockedObject: {fileID: 0}
|
m_LastLockedObject: {fileID: 0}
|
||||||
m_ViewIsLockedToObject: 0
|
m_ViewIsLockedToObject: 0
|
||||||
--- !u!114 &17
|
--- !u!114 &21
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
m_ObjectHideFlags: 52
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 0}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 1
|
|
||||||
m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_MinSize: {x: 200, y: 200}
|
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
|
||||||
m_TitleContent:
|
|
||||||
m_Text: Game
|
|
||||||
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
|
|
||||||
m_Tooltip:
|
|
||||||
m_Pos:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 379
|
|
||||||
y: 73
|
|
||||||
width: 1150
|
|
||||||
height: 552
|
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
|
||||||
m_SerializedViewNames: []
|
|
||||||
m_SerializedViewValues: []
|
|
||||||
m_PlayModeViewName: GameView
|
|
||||||
m_ShowGizmos: 0
|
|
||||||
m_TargetDisplay: 0
|
|
||||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
|
||||||
m_TargetSize: {x: 1920, y: 1080}
|
|
||||||
m_TextureFilterMode: 0
|
|
||||||
m_TextureHideFlags: 61
|
|
||||||
m_RenderIMGUI: 1
|
|
||||||
m_MaximizeOnPlay: 0
|
|
||||||
m_UseMipMap: 0
|
|
||||||
m_VSyncEnabled: 0
|
|
||||||
m_Gizmos: 0
|
|
||||||
m_Stats: 0
|
|
||||||
m_SelectedSizes: 00000000000000000000000006000000000000000000000000000000000000000000000000000000
|
|
||||||
m_ZoomArea:
|
|
||||||
m_HRangeLocked: 0
|
|
||||||
m_VRangeLocked: 0
|
|
||||||
hZoomLockedByDefault: 0
|
|
||||||
vZoomLockedByDefault: 0
|
|
||||||
m_HBaseRangeMin: -960
|
|
||||||
m_HBaseRangeMax: 960
|
|
||||||
m_VBaseRangeMin: -540
|
|
||||||
m_VBaseRangeMax: 540
|
|
||||||
m_HAllowExceedBaseRangeMin: 1
|
|
||||||
m_HAllowExceedBaseRangeMax: 1
|
|
||||||
m_VAllowExceedBaseRangeMin: 1
|
|
||||||
m_VAllowExceedBaseRangeMax: 1
|
|
||||||
m_ScaleWithWindow: 0
|
|
||||||
m_HSlider: 0
|
|
||||||
m_VSlider: 1
|
|
||||||
m_IgnoreScrollWheelUntilClicked: 0
|
|
||||||
m_EnableMouseInput: 1
|
|
||||||
m_EnableSliderZoomHorizontal: 0
|
|
||||||
m_EnableSliderZoomVertical: 0
|
|
||||||
m_UniformScale: 1
|
|
||||||
m_UpDirection: 1
|
|
||||||
m_DrawArea:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 21
|
|
||||||
width: 1150
|
|
||||||
height: 531
|
|
||||||
m_Scale: {x: 0.51111114, y: 0.51111114}
|
|
||||||
m_Translation: {x: 575, y: 265.49994}
|
|
||||||
m_MarginLeft: 0
|
|
||||||
m_MarginRight: 0
|
|
||||||
m_MarginTop: 0
|
|
||||||
m_MarginBottom: 0
|
|
||||||
m_LastShownAreaInsideMargins:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: -1124.9999
|
|
||||||
y: -519.45636
|
|
||||||
width: 2249.9998
|
|
||||||
height: 1038.913
|
|
||||||
m_MinimalGUI: 1
|
|
||||||
m_defaultScale: 0.51111114
|
|
||||||
m_LastWindowPixelSize: {x: 1150, y: 552}
|
|
||||||
m_ClearInEditMode: 1
|
|
||||||
m_NoCameraWarning: 1
|
|
||||||
m_LowResolutionForAspectRatios: 01000001000000000000
|
|
||||||
m_XRRenderMode: 0
|
|
||||||
m_RenderTexture: {fileID: 0}
|
|
||||||
--- !u!114 &18
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 52
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 0}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 1
|
|
||||||
m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_MinSize: {x: 100, y: 100}
|
|
||||||
m_MaxSize: {x: 4000, y: 4000}
|
|
||||||
m_TitleContent:
|
|
||||||
m_Text: Console
|
|
||||||
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
|
|
||||||
m_Tooltip:
|
|
||||||
m_Pos:
|
|
||||||
serializedVersion: 2
|
|
||||||
x: 0
|
|
||||||
y: 646
|
|
||||||
width: 1530
|
|
||||||
height: 353
|
|
||||||
m_ViewDataDictionary: {fileID: 0}
|
|
||||||
--- !u!114 &19
|
|
||||||
MonoBehaviour:
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -7,3 +7,7 @@ sceneSetups:
|
||||||
isLoaded: 1
|
isLoaded: 1
|
||||||
isActive: 0
|
isActive: 0
|
||||||
isSubScene: 0
|
isSubScene: 0
|
||||||
|
- path: Assets/Prefabs/BattleScene.unity
|
||||||
|
isLoaded: 1
|
||||||
|
isActive: 0
|
||||||
|
isSubScene: 0
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -799,3 +799,23 @@ C# parse time : 189ms
|
||||||
candidates check time : 25ms
|
candidates check time : 25ms
|
||||||
console write time : 0ms
|
console write time : 0ms
|
||||||
|
|
||||||
|
[api-updater (non-obsolete-error-filter)] 20.01.2022 0:10:59 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
|
||||||
|
[api-updater (non-obsolete-error-filter)]
|
||||||
|
----------------------------------
|
||||||
|
jit/startup time : 589,4153ms
|
||||||
|
moved types parse time: 44ms
|
||||||
|
candidates parse time : 1ms
|
||||||
|
C# parse time : 169ms
|
||||||
|
candidates check time : 36ms
|
||||||
|
console write time : 0ms
|
||||||
|
|
||||||
|
[api-updater (non-obsolete-error-filter)] 20.01.2022 2:34:56 : Starting C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
|
||||||
|
[api-updater (non-obsolete-error-filter)]
|
||||||
|
----------------------------------
|
||||||
|
jit/startup time : 458,3015ms
|
||||||
|
moved types parse time: 45ms
|
||||||
|
candidates parse time : 1ms
|
||||||
|
C# parse time : 237ms
|
||||||
|
candidates check time : 40ms
|
||||||
|
console write time : 0ms
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
Cmd: shutdown
|
Unhandled exception: Protocol error - failed to read magic number (error -2147483644, transferred 0/4)
|
||||||
|
|
||||||
Quitting shader compiler process
|
Quitting shader compiler process
|
||||||
|
|
@ -1,46 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=7643 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2454
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=3499 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1246
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=12000 file=Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=4583
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=3524 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2639
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=4355 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=3656
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=3497 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1293
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=10600 file=Assets/TextMesh Pro/Shaders/TMP_SDF.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=3936
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=3071 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2724
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=7822 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2720
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=10585 file=Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=3927
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=3549 file=Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1653
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=7674 file=Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=2466
|
|
||||||
|
|
||||||
Cmd: preprocess
|
|
||||||
insize=2354 file=Assets/TextMesh Pro/Shaders/TMP_Sprite.shader surfaceOnly=0 cachingPP=1 buildPlatform=13 pKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_NO_CUBEMAP_ARRAY UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_COLORSPACE_GAMMA UNITY_LIGHTMAP_DLDR_ENCODING dKW=UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=1124
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
|
||||||
Cmd: initializeCompiler
|
|
||||||
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
|
|
@ -1,7 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,3 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
||||||
Cmd: initializeCompiler
|
Cmd: initializeCompiler
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
=======
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
>>>>>>> 1e2d39e0ddecc763eb0077b17026e3c0bccc57c3
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
|
||||||
Cmd: initializeCompiler
|
|
||||||
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.19f1/Editor/Data/PlaybackEngines'
|
|
||||||
Cmd: initializeCompiler
|
|
||||||
|
|
||||||
Cmd: shutdown
|
|
||||||
|
|
||||||
Quitting shader compiler process
|
|
||||||
|
|
@ -9,6 +9,6 @@ EditorBuildSettings:
|
||||||
path: Assets/Scenes/MainMenu.unity
|
path: Assets/Scenes/MainMenu.unity
|
||||||
guid: ae36a43ecda2f5645878559e1b6f717a
|
guid: ae36a43ecda2f5645878559e1b6f717a
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/BattleScene.unity
|
path: Assets/Prefabs/BattleScene.unity
|
||||||
guid: 2cda990e2423bbf4892e6590ba056729
|
guid: 2cda990e2423bbf4892e6590ba056729
|
||||||
m_configObjects: {}
|
m_configObjects: {}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue