engine: sync editor rendering and ui changes
This commit is contained in:
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 9b99cbc7c30f5a7bbf6e5cc49690e2e7
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 7ad7534fed3a73dfeb84739d0d3aef92
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: ea210ba93a7a93260ae13bc84508bbe3
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 7eedc507fd8709abb2b19af32a52ab21
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 5efa3f1aa5ce5981cbbefe56c8f97128
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 17cce01b8a084a5cdf1c79382a46c31f
|
||||
folderAsset: false
|
||||
importer: ModelImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 003ee132378579f4bfc59b39cf8e8d51
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: e94d89b26d6e920e2e73cb96d3beddbd
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: c98fc6424b69b1a41adc91eabc2e82bd
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 26aa3d5b0d4e0320a5286c0cc5a76c46
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: bac31a87fc5da61d66e2de6841990bb1
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"shader": "builtin://shaders/unlit",
|
||||
"renderQueue": "geometry",
|
||||
"properties": {
|
||||
"_BaseColor": [1, 1, 1, 1]
|
||||
"_BaseColor": [0.850877, 0.365728, 0.365728, 1]
|
||||
},
|
||||
"textures": {
|
||||
"_MainTex": "Assets/Models/backpack/diffuse.jpg"
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 9a608ceb121dae614903368e56e8e049
|
||||
folderAsset: false
|
||||
importer: MaterialImporter
|
||||
importerVersion: 5
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 95bf8c50b9011ec0375cd185053068c9
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -6,30 +6,23 @@ gameobject_begin
|
||||
id=1
|
||||
uuid=11806343893082442755
|
||||
name=Main Camera
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=1.24194,0,-5.54416;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=Camera;projection=0;fov=60.7089;orthoSize=5;near=0.001;far=102.9;depth=1.6;primary=1;clearMode=0;stackType=0;cullingMask=4294967295;viewportRect=0,0,1,1;clearColor=0,0,0,1;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=20
|
||||
uuid=8649195733451829943
|
||||
name=GameObject
|
||||
active=1
|
||||
parent=0
|
||||
transform=position=-3.68003,0.160159,0.360709;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=17cce01b8a084a5cdf1c79382a46c31f,1,2;
|
||||
component=MeshRenderer;materialPaths=;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
component=Camera;projection=0;fov=60.7089;orthoSize=5;near=0.001;far=102.9;depth=1.6;primary=1;clearMode=0;stackType=0;cullingMask=4294967295;viewportRect=0,0,1,1;clearColor=0,0,0,1;skyboxEnabled=0;skyboxMaterialPath=;skyboxMaterialRef=;skyboxTopColor=0.18,0.36,0.74,1;skyboxHorizonColor=0.78,0.84,0.92,1;skyboxBottomColor=0.92,0.93,0.95,1;finalColorOverrideOutputTransferEnabled=0;finalColorOverrideOutputTransferMode=0;finalColorOverrideExposureModeEnabled=0;finalColorOverrideExposureMode=0;finalColorOverrideExposureValueEnabled=0;finalColorOverrideExposureValue=1;finalColorOverrideToneMappingModeEnabled=0;finalColorOverrideToneMappingMode=0;finalColorOverrideScaleEnabled=0;finalColorOverrideScale=1,1,1,1;postProcessPassCount=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=29
|
||||
uuid=16627428025886468363
|
||||
name=Light
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,3.00762,3.94704;rotation=0.394142,-0.000640735,-0.0613786,0.916998;scale=1,1,1;
|
||||
transform=position=0,3.00762,4.6342;rotation=0.930636,0.196101,-0.052872,0.304409;scale=1,1,1;
|
||||
component=Light;type=0;color=1,1,1,1;intensity=1;range=10;spotAngle=30;shadows=0;
|
||||
gameobject_end
|
||||
|
||||
@@ -37,7 +30,9 @@ gameobject_begin
|
||||
id=75
|
||||
uuid=5125863825480013902
|
||||
name=Cube
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=5.97411,0,0;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/cube;
|
||||
@@ -45,12 +40,39 @@ component=MeshRenderer;materialPaths=builtin://materials/default-primitive;mater
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=79
|
||||
uuid=14087659263782399666
|
||||
name=GameObject
|
||||
id=128
|
||||
uuid=9183622432480476442
|
||||
name=Light
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=2.32896,0,-0.076026;rotation=0,0,0,1;scale=1,1,1;
|
||||
transform=position=1.04812,1.32087,6.70265;rotation=0.295208,0,0,0.955433;scale=1,1,1;
|
||||
component=Light;type=1;color=1,0.614035,0.991319,1;intensity=11.5;range=10;spotAngle=30;shadows=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=129
|
||||
uuid=2162319538989844123
|
||||
name=Plane
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,-2.16998,0;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/plane;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=141
|
||||
uuid=11103014809698991785
|
||||
name=GameObject
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,0,-1.77895;rotation=0,0,0,1;scale=1,1,-1.7;
|
||||
component=MeshFilter;meshRef=17cce01b8a084a5cdf1c79382a46c31f,1,2;
|
||||
component=MeshRenderer;materialPaths=;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 97d8a1008ece4eab2930a9caf3c11f54
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -6,50 +6,157 @@ gameobject_begin
|
||||
id=64
|
||||
uuid=5744812053316050663
|
||||
name=Camera
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=-0.352908,0,-3.0611;rotation=0.111657,0.15678,0.890189,-0.412937;scale=1,1,1;
|
||||
component=Camera;projection=0;fov=60;orthoSize=5;near=1.43;far=1000;depth=0;primary=1;clearMode=0;stackType=0;cullingMask=4294967295;viewportRect=0,0,1,1;clearColor=0,0,0,0.552941;
|
||||
transform=position=1.40968,2.17144,-6.14578;rotation=0.0850599,0,0,0.996376;scale=1,1,1;
|
||||
component=Camera;projection=0;fov=60;orthoSize=5;near=1.43;far=1000;depth=0;primary=1;clearMode=0;stackType=0;cullingMask=4294967295;viewportRect=0,0,1,1;clearColor=0,0,0,0.552941;skyboxEnabled=1;skyboxMaterialPath=;skyboxMaterialRef=;skyboxTopColor=0.269544,0.501514,0.991228,1;skyboxHorizonColor=0.570175,0.570175,0.570175,1;skyboxBottomColor=0.141582,0.228891,0.403509,1;finalColorOverrideOutputTransferEnabled=0;finalColorOverrideOutputTransferMode=0;finalColorOverrideExposureModeEnabled=0;finalColorOverrideExposureMode=0;finalColorOverrideExposureValueEnabled=0;finalColorOverrideExposureValue=1;finalColorOverrideToneMappingModeEnabled=0;finalColorOverrideToneMappingMode=0;finalColorOverrideScaleEnabled=0;finalColorOverrideScale=1,1,1,1;postProcessPassCount=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=66
|
||||
uuid=18270436544925411184
|
||||
name=Light
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,3.3245,0;rotation=-0.12466,0.596834,-0.0945426,0.786963;scale=1,1,1;
|
||||
component=Light;type=0;color=1,1,1,1;intensity=1;range=10;spotAngle=30;shadows=0;
|
||||
transform=position=5.87107,3.04462,0.305848;rotation=0.717254,0.587471,-0.0433283,0.372219;scale=1,1,1;
|
||||
component=Light;type=0;color=1,1,1,1;intensity=0.2;range=10;spotAngle=30;shadows=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=87
|
||||
uuid=9751737136539126565
|
||||
name=GameObject
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,0,0;rotation=-0.345665,0.580459,-0.0801843,-0.732908;scale=1,1,1;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=89
|
||||
uuid=3783751572903533469
|
||||
name=Sphere
|
||||
active=1
|
||||
parent=0
|
||||
transform=position=-0.0171053,0,-0.2493;rotation=0.514887,0.648149,-0.409349,0.383703;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/sphere;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
component=ScriptComponent;scriptComponentUUID=14953097718051232299;assembly=GameScripts;namespace=ProjectScripts;class=TickLogProbe;fields=;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=91
|
||||
uuid=12782062714694956708
|
||||
name=GameObject
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,0,0;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=ScriptComponent;scriptComponentUUID=13495247810881627157;assembly=GameScripts;namespace=;class=;fields=;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=113
|
||||
uuid=15803379621740129390
|
||||
name=Plane
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0,0,0;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/plane;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
gameobject_begin
|
||||
id=126
|
||||
uuid=12456668029646601964
|
||||
name=Cube
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=113
|
||||
transform=position=2.91271,0.679955,2.94568;rotation=-0.288105,0,0,0.957599;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/cube;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
gameobject_begin
|
||||
id=115
|
||||
uuid=6890014658586654960
|
||||
name=Cube
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=113
|
||||
transform=position=-1.28823,0.525337,1.45296;rotation=-0.0763061,0.299091,-0.0189699,0.95098;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/cube;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
gameobject_begin
|
||||
id=130
|
||||
uuid=16092524035934325911
|
||||
name=Cube
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=113
|
||||
transform=position=2.6382,0.525337,-3.07507;rotation=-0.0763061,0.299091,-0.0189699,0.95098;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/cube;
|
||||
component=MeshRenderer;materialPaths=;materialRefs=9a608ceb121dae614903368e56e8e049,1,3;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=117
|
||||
uuid=6470155182778634572
|
||||
name=Light
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=0.484716,0.961334,2.89361;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=Light;type=1;color=1,0,0.0287113,1;intensity=1;range=10;spotAngle=30;shadows=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=119
|
||||
uuid=11541908339887058565
|
||||
name=Light
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=2.94791,0.869651,-2.61555;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=Light;type=1;color=0,1,0.318094,1;intensity=1;range=10;spotAngle=30;shadows=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=120
|
||||
uuid=6386081964352732701
|
||||
name=Light
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=-1.55514,1.18028,-0.698302;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=Light;type=1;color=0,0.141337,1,1;intensity=1;range=10;spotAngle=30;shadows=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=132
|
||||
uuid=4498534432540015846
|
||||
name=Cube
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=-1.08156,0.874702,-3.56394;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/cube;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
|
||||
gameobject_begin
|
||||
id=133
|
||||
uuid=17783067283336270389
|
||||
name=Capsule
|
||||
tag=Untagged
|
||||
active=1
|
||||
layer=0
|
||||
parent=0
|
||||
transform=position=2.8096,1.4917,0;rotation=0,0,0,1;scale=1,1,1;
|
||||
component=MeshFilter;meshRef=;meshPath=builtin://meshes/capsule;
|
||||
component=MeshRenderer;materialPaths=builtin://materials/default-primitive;materialRefs=;castShadows=1;receiveShadows=1;renderLayer=0;
|
||||
gameobject_end
|
||||
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: d291a8a36c1395b2199e6e32abfa7b84
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: f8af940001366ccd64b1b8bb5e071cdb
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: e63714c47b794207e7310ca83f50537b
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 6607cf0bad154aa86768fd90d630d84f
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: ec851a44fdf97e9e2d7464b259d4e5b8
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 09908ff9ea86f69e5951b763ec5a65e4
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 907d8d9c76e51c3ff41daf2c272bbc2e
|
||||
folderAsset: true
|
||||
importer: FolderImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 3292abd66fd3c24f29b432371a671609
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: 4ebde4198801fc49d0d13e3ef7f65633
|
||||
folderAsset: false
|
||||
importer: TextureImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
@@ -2,4 +2,4 @@ fileFormatVersion: 1
|
||||
guid: b5bf687835df60784ce27f81737e95c4
|
||||
folderAsset: false
|
||||
importer: DefaultImporter
|
||||
importerVersion: 3
|
||||
importerVersion: 7
|
||||
|
||||
Reference in New Issue
Block a user