Commit 04e91b0f authored by SherryChaos's avatar SherryChaos

fix ReadParams bug

parent d25d31ef
...@@ -15,7 +15,7 @@ MonoBehaviour: ...@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: ca8b8e6916019834fb0ec5578fa0be37 m_DefaultGroup: ca8b8e6916019834fb0ec5578fa0be37
m_currentHash: m_currentHash:
serializedVersion: 2 serializedVersion: 2
Hash: a7787d5667f17613de3b1b0e88584bac Hash: 00000000000000000000000000000000
m_OptimizeCatalogSize: 0 m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0 m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0 m_CatalogRequestsTimeout: 0
...@@ -56,7 +56,7 @@ MonoBehaviour: ...@@ -56,7 +56,7 @@ MonoBehaviour:
m_ContentStateBuildPathProfileVariableName: <default settings path> m_ContentStateBuildPathProfileVariableName: <default settings path>
m_CustomContentStateBuildPath: m_CustomContentStateBuildPath:
m_ContentStateBuildPath: m_ContentStateBuildPath:
m_BuildAddressablesWithPlayerBuild: 2 m_BuildAddressablesWithPlayerBuild: 1
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]' m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
m_GroupAssets: m_GroupAssets:
- {fileID: 11400000, guid: 00d23bf82261d794b8ad80777f3da3ae, type: 2} - {fileID: 11400000, guid: 00d23bf82261d794b8ad80777f3da3ae, type: 2}
......
%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: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: DefaultVolumeProfile
m_EditorClassIdentifier:
components: []
fileFormatVersion: 2
guid: 408925b80137a284f8f37fb36e5f996e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -536,6 +536,10 @@ MonoBehaviour: ...@@ -536,6 +536,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
text: {fileID: 1398959084} text: {fileID: 1398959084}
input: {fileID: 1775272994} input: {fileID: 1775272994}
mode_Window: 0
mode_Android: 0
mode_IOS: 1
fullCopy: 0
--- !u!114 &916768208 --- !u!114 &916768208
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -95,10 +95,11 @@ namespace MDPro3 ...@@ -95,10 +95,11 @@ namespace MDPro3
public static Program instance; public static Program instance;
public static Items items; public static Items items;
List<Manager> managers = new List<Manager>(); private readonly List<Manager> managers = new();
List<Servant.Servant> servants = new List<Servant.Servant>(); private readonly List<Servant.Servant> servants = new();
public static bool exitOnReturn = false;
void Initialize() private void Initialize()
{ {
if (!Directory.Exists(PATH_DATA)) if (!Directory.Exists(PATH_DATA))
Directory.CreateDirectory(PATH_DATA); Directory.CreateDirectory(PATH_DATA);
...@@ -125,7 +126,6 @@ namespace MDPro3 ...@@ -125,7 +126,6 @@ namespace MDPro3
BanlistManager.Initialize(); BanlistManager.Initialize();
InitializeAllManagers(); InitializeAllManagers();
InitializeAllServants(); InitializeAllServants();
ReadParams();
var handle = Addressables.InstantiateAsync("Prefab/CardRenderer.prefab"); var handle = Addressables.InstantiateAsync("Prefab/CardRenderer.prefab");
handle.Completed += (result) => handle.Completed += (result) =>
...@@ -135,31 +135,30 @@ namespace MDPro3 ...@@ -135,31 +135,30 @@ namespace MDPro3
}; };
} }
public static bool exitOnReturn = false; public void ReadParams()
void ReadParams()
{ {
var args = Environment.GetCommandLineArgs(); var args = Environment.GetCommandLineArgs();
//args = new string[2] //args = new string[11]
//{ //{
// //"-r", //"-r",
// //"TURN023" //"TURN023"
// //"-s", //"-s",
// //"6ace for win!" //"6ace for win!"
// "-d", // "-d",
// "LL铁兽", // "LL铁兽",
// //"-n", // "-n",
// //"赤子奈落", // "赤子奈落",
// //"-h", // "-h",
// //"mygo.superpre.pro", // "mygo.superpre.pro",
// //"-p", // "-p",
// //"888", // "888",
// //"-w", // "-w",
// //"M#1008611", // "M#1008611",
// //"-j" // "-j"
//}; //};
string nick = null; string nick = null;
...@@ -245,6 +244,7 @@ namespace MDPro3 ...@@ -245,6 +244,7 @@ namespace MDPro3
foreach (Manager manager in managers) foreach (Manager manager in managers)
manager.Initialize(); manager.Initialize();
} }
private void InitializeAllServants() private void InitializeAllServants()
{ {
servants.Add(setting); servants.Add(setting);
...@@ -280,7 +280,7 @@ namespace MDPro3 ...@@ -280,7 +280,7 @@ namespace MDPro3
public const string PATH_TEMP_FOLDER = "TempFolder/"; public const string PATH_TEMP_FOLDER = "TempFolder/";
public static string root = PATH_ROOT_WINDOWS64; public static string root = PATH_ROOT_WINDOWS64;
void Awake() private void Awake()
{ {
#if UNITY_ANDROID #if UNITY_ANDROID
root = PATH_ROOT_ANDROID; root = PATH_ROOT_ANDROID;
...@@ -311,12 +311,12 @@ namespace MDPro3 ...@@ -311,12 +311,12 @@ namespace MDPro3
Time.timeScale = value; Time.timeScale = value;
} }
} }
float m_TimeScale = 1f; private float m_TimeScale = 1f;
#if UNITY_EDITOR #if UNITY_EDITOR
public float timeScaleForEditor = 1; public float timeScaleForEditor = 1;
#endif #endif
void Update() private void Update()
{ {
TcpHelper.PerFrameFunction(); TcpHelper.PerFrameFunction();
foreach (Manager manager in managers) foreach (Manager manager in managers)
...@@ -337,8 +337,10 @@ namespace MDPro3 ...@@ -337,8 +337,10 @@ namespace MDPro3
StartCoroutine(gc); StartCoroutine(gc);
} }
} }
IEnumerator gc;
IEnumerator UnloadUnusedAssetsAsync() private IEnumerator gc;
private IEnumerator UnloadUnusedAssetsAsync()
{ {
var unload = Resources.UnloadUnusedAssets(); var unload = Resources.UnloadUnusedAssets();
while (!unload.isDone) while (!unload.isDone)
......
...@@ -484,6 +484,9 @@ namespace MDPro3.Servant ...@@ -484,6 +484,9 @@ namespace MDPro3.Servant
#endregion #endregion
loaded = true; loaded = true;
if(Program.instance.currentServant == Program.instance.room)
Program.instance.room.Realize();
} }
......
using MDPro3.Net;
using MDPro3.UI;
using MDPro3.UI.ServantUI;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
using System.IO;
using MDPro3.Net;
using MDPro3.UI;
using UnityEngine.EventSystems;
using MDPro3.UI.ServantUI;
namespace MDPro3.Servant namespace MDPro3.Servant
{ {
...@@ -53,6 +52,8 @@ namespace MDPro3.Servant ...@@ -53,6 +52,8 @@ namespace MDPro3.Servant
base.FirstLoadEvent(); base.FirstLoadEvent();
servantUI.ResetUI(); servantUI.ResetUI();
StartCoroutine(LoadMyCardNewsAsync()); StartCoroutine(LoadMyCardNewsAsync());
Program.instance.ReadParams();
} }
protected override void ApplyShowArrangement(int preDepth) protected override void ApplyShowArrangement(int preDepth)
......
...@@ -66,7 +66,7 @@ namespace MDPro3.Servant ...@@ -66,7 +66,7 @@ namespace MDPro3.Servant
if (servantUI == null) if (servantUI == null)
{ {
this.replayName = replayName; this.replayName = replayName;
LoadUI(); Program.instance.ShiftToServant(this);
} }
else else
GetUI<ReplaySelectorUI>().KF_Replay(replayName); GetUI<ReplaySelectorUI>().KF_Replay(replayName);
......
...@@ -203,7 +203,7 @@ namespace MDPro3.Servant ...@@ -203,7 +203,7 @@ namespace MDPro3.Servant
Program.instance.ShiftToServant(Program.instance.ocgcore); Program.instance.ShiftToServant(Program.instance.ocgcore);
} }
private void Realize() public void Realize()
{ {
if (servantUI == null) if (servantUI == null)
return; return;
...@@ -304,7 +304,6 @@ namespace MDPro3.Servant ...@@ -304,7 +304,6 @@ namespace MDPro3.Servant
break; break;
} }
tasks.Add(task); tasks.Add(task);
Debug.Log("add");
UIManager.ShowPopupConfirm(tasks); UIManager.ShowPopupConfirm(tasks);
break; break;
case 3: case 3:
...@@ -410,6 +409,7 @@ namespace MDPro3.Servant ...@@ -410,6 +409,7 @@ namespace MDPro3.Servant
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
players[i] = null; players[i] = null;
Program.instance.ShiftToServant(Program.instance.room); Program.instance.ShiftToServant(Program.instance.room);
} }
......
...@@ -148,7 +148,11 @@ namespace MDPro3.UI.ServantUI ...@@ -148,7 +148,11 @@ namespace MDPro3.UI.ServantUI
TextRoomInfo.text = roomInfo; TextRoomInfo.text = roomInfo;
if (!Appearance.loaded) if (!Appearance.loaded)
{
foreach(var rp in roomPlayers)
rp.gameObject.SetActive(false);
return; return;
}
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
......
...@@ -18,6 +18,12 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -18,6 +18,12 @@ public class AssetBundleRobber : MonoBehaviour
private static Text sText; private static Text sText;
public TMP_InputField input; public TMP_InputField input;
public bool mode_Window = true;
public bool mode_Android = false;
public bool mode_IOS = false;
public bool fullCopy;
private string pathAB; private string pathAB;
private string pathStore; private string pathStore;
...@@ -37,7 +43,6 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -37,7 +43,6 @@ public class AssetBundleRobber : MonoBehaviour
private int count = 0; private int count = 0;
private AssetStudio.AssetsManager assetManager; private AssetStudio.AssetsManager assetManager;
private bool fullCopy;
private readonly int threads = 32; private readonly int threads = 32;
private AssetType copyAssetType = AssetType.All; private AssetType copyAssetType = AssetType.All;
...@@ -65,17 +70,21 @@ public class AssetBundleRobber : MonoBehaviour ...@@ -65,17 +70,21 @@ public class AssetBundleRobber : MonoBehaviour
Application.targetFrameRate = 0; Application.targetFrameRate = 0;
pathAB = PATH_AB_WINDOWS; if (mode_Android)
pathStore = PATH_STORE_WINDOWS; {
pathAB = PATH_AB_ANDROID;
pathAB = PATH_AB_ANDROID; pathStore = PATH_STORE_ANDROID;
pathStore = PATH_STORE_ANDROID; }
else if (mode_IOS)
//pathAB = PATH_AB_IOS; {
//pathStore = PATH_STORE_IOS; pathAB = PATH_AB_IOS;
pathStore = PATH_STORE_IOS;
//fullCopy = true; }
fullCopy = false; else
{
pathAB = PATH_AB_WINDOWS;
pathStore = PATH_STORE_WINDOWS;
}
copyAssetType = AssetType.All; copyAssetType = AssetType.All;
......
fileFormatVersion: 2
guid: 138cc67ebafd7a74face7773ba172dbc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%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: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
m_Name: UniversalRenderPipelineGlobalSettings
m_EditorClassIdentifier:
m_ShaderStrippingSetting:
m_Version: 0
m_ExportShaderVariants: 1
m_ShaderVariantLogLevel: 0
m_StripRuntimeDebugShaders: 1
m_URPShaderStrippingSetting:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
m_ShaderVariantLogLevel: 0
m_ExportShaderVariants: 1
m_StripDebugVariants: 1
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
supportRuntimeDebugDisplay: 0
m_EnableRenderGraph: 0
m_Settings:
m_SettingsList:
m_List:
- rid: 3374010055753728000
- rid: 3374010055753728001
- rid: 3374010055753728002
- rid: 3374010055753728003
- rid: 3374010055753728004
- rid: 3374010055753728005
- rid: 3374010055753728006
- rid: 3374010055753728007
- rid: 3374010055753728008
- rid: 3374010055753728009
- rid: 3374010055753728010
- rid: 3374010055753728011
- rid: 3374010055753728012
- rid: 3374010055753728013
- rid: 3374010055753728014
- rid: 3374010055753728015
- rid: 3374010055753728016
- rid: 3374010055753728017
- rid: 3374010055753728018
- rid: 3374010055753728019
- rid: 3374010055753728020
m_RuntimeSettings:
m_List: []
m_AssetVersion: 8
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames:
- Default
m_ValidRenderingLayers: 0
lightLayerName0:
lightLayerName1:
lightLayerName2:
lightLayerName3:
lightLayerName4:
lightLayerName5:
lightLayerName6:
lightLayerName7:
apvScenesData:
obsoleteSceneBounds:
m_Keys: []
m_Values: []
obsoleteHasProbeVolumes:
m_Keys: []
m_Values:
references:
version: 2
RefIds:
- rid: 3374010055753728000
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3}
m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3}
m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3}
m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3}
m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3}
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 3374010055753728001
type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
- rid: 3374010055753728002
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3}
m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3}
m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3}
m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3}
m_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, type: 3}
m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3}
m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3}
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 3374010055753728003
type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_VolumeProfile: {fileID: 11400000, guid: 408925b80137a284f8f37fb36e5f996e, type: 2}
- rid: 3374010055753728004
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
- rid: 3374010055753728005
type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_xrOcclusionMeshPS: {fileID: 4800000, guid: 4431b1f1f743fbf4eb310a967890cbea, type: 3}
m_xrMirrorViewPS: {fileID: 4800000, guid: d5a307c014552314b9f560906d708772, type: 3}
m_xrMotionVector: {fileID: 4800000, guid: f89aac1e4f84468418fe30e611dff395, type: 3}
- rid: 3374010055753728006
type: {class: UniversalRenderPipelineRuntimeTextures, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 1
m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3}
- rid: 3374010055753728007
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 3374010055753728008
type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DebugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
m_HdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
m_ProbeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
- rid: 3374010055753728009
type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_EnableRenderCompatibilityMode: 0
- rid: 3374010055753728010
type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3}
- rid: 3374010055753728011
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3}
m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3}
m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3}
m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3}
m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3}
m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3}
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 3374010055753728012
type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1
- rid: 3374010055753728013
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 3374010055753728014
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 3374010055753728015
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3}
subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3}
voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3}
traceVirtualOffsetCS: {fileID: -6772857160820960102, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3}
traceVirtualOffsetRT: {fileID: -5126288278712620388, guid: ff2cbab5da58bf04d82c5f34037ed123, type: 3}
skyOcclusionCS: {fileID: -6772857160820960102, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 3374010055753728016
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 3374010055753728017
type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 0
m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3}
- rid: 3374010055753728018
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeDebugShader: {fileID: 4800000, guid: 3b21275fd12d65f49babb5286f040f2d, type: 3}
probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 3a80877c579b9144ebdcc6d923bca303, type: 3}
probeVolumeSamplingDebugShader: {fileID: 4800000, guid: bf54e6528c79a224e96346799064c393, type: 3}
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 3374010055753728019
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 0
- rid: 3374010055753728020
type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 0
m_ExportShaderVariants: 1
m_ShaderVariantLogLevel: 0
m_StripRuntimeDebugShaders: 1
fileFormatVersion: 2
guid: 0f8e2b9e397a0484d80e2a712e82b4ab
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
...@@ -58,7 +58,7 @@ GraphicsSettings: ...@@ -58,7 +58,7 @@ GraphicsSettings:
m_FogKeepExp2: 1 m_FogKeepExp2: 1
m_AlbedoSwatchInfos: [] m_AlbedoSwatchInfos: []
m_RenderPipelineGlobalSettingsMap: m_RenderPipelineGlobalSettingsMap:
UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 69e955d6c02fa954ea8deabaf466ae56, type: 2} UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 0f8e2b9e397a0484d80e2a712e82b4ab, type: 2}
m_LightsUseLinearIntensity: 0 m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 1 m_LightsUseColorTemperature: 1
m_LogWhenShaderIsCompiled: 0 m_LogWhenShaderIsCompiled: 0
......
...@@ -551,7 +551,7 @@ PlayerSettings: ...@@ -551,7 +551,7 @@ PlayerSettings:
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport - m_BuildTarget: WindowsStandaloneSupport
m_APIs: 0b00000002000000 m_APIs: 02000000
m_Automatic: 0 m_Automatic: 0
- m_BuildTarget: LinuxStandaloneSupport - m_BuildTarget: LinuxStandaloneSupport
m_APIs: 1500000011000000 m_APIs: 1500000011000000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment