【Bug】修复部分Bug
parent
653859a162
commit
50940c9f0e
|
|
@ -3293,7 +3293,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 780044542}
|
||||
- component: {fileID: 780044541}
|
||||
- component: {fileID: 780044540}
|
||||
- component: {fileID: 780044539}
|
||||
- component: {fileID: 780044543}
|
||||
m_Layer: 0
|
||||
|
|
@ -3347,14 +3346,6 @@ MonoBehaviour:
|
|||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!81 &780044540
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 780044538}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &780044541
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -3448,7 +3448,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1351360607}
|
||||
- component: {fileID: 1351360611}
|
||||
- component: {fileID: 1351360610}
|
||||
- component: {fileID: 1351360609}
|
||||
m_Layer: 0
|
||||
m_Name: Camera
|
||||
|
|
@ -3516,14 +3515,6 @@ MonoBehaviour:
|
|||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!81 &1351360610
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1351360606}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &1351360611
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.24895254, g: 0.46394107, b: 0.57838154, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -8244,7 +8243,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1456177706}
|
||||
- component: {fileID: 1456177705}
|
||||
- component: {fileID: 1456177704}
|
||||
- component: {fileID: 1456177703}
|
||||
m_Layer: 0
|
||||
m_Name: Camera
|
||||
|
|
@ -8291,20 +8289,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
--- !u!81 &1456177704
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1456177702}
|
||||
m_Enabled: 1
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!20 &1456177705
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9089,6 +9079,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a12e0c357618e41119174f3503c902dd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsEnable: 0
|
||||
--- !u!4 &1747868970
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -652,7 +651,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 465838073}
|
||||
- component: {fileID: 465838072}
|
||||
- component: {fileID: 465838071}
|
||||
- component: {fileID: 465838074}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
|
|
@ -661,14 +659,6 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &465838071
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 465838070}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &465838072
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -773,12 +763,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!4 &472635455 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 670024087047279685, guid: 7d61f271c0b44154e9fb22af83bcb8da,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.24895254, g: 0.46394107, b: 0.57838154, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -241,158 +240,6 @@ MonoBehaviour:
|
|||
m_LightCookieSize: {x: 1, y: 1}
|
||||
m_LightCookieOffset: {x: 0, y: 0}
|
||||
m_SoftShadowQuality: 0
|
||||
--- !u!1 &76225899
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 76225900}
|
||||
- component: {fileID: 76225902}
|
||||
m_Layer: 0
|
||||
m_Name: CriWareLibraryInitializer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &76225900
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 76225899}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &76225902
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 76225899}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5e49f339aff054453b2d8287aec75bf2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
initializesFileSystem: 1
|
||||
fileSystemConfig:
|
||||
numberOfLoaders: 16
|
||||
numberOfBinders: 8
|
||||
numberOfInstallers: 2
|
||||
installBufferSize: 4096
|
||||
maxPath: 256
|
||||
userAgentString:
|
||||
minimizeFileDescriptorUsage: 0
|
||||
enableCrcCheck: 0
|
||||
androidDeviceReadBitrate: 50000000
|
||||
initializesAtom: 1
|
||||
atomConfig:
|
||||
acfFileName:
|
||||
maxVirtualVoices: 32
|
||||
maxVoiceLimitGroups: 32
|
||||
maxCategories: 32
|
||||
maxAisacs: 8
|
||||
maxBusSends: 8
|
||||
maxSequenceEventsPerFrame: 2
|
||||
maxBeatSyncCallbacksPerFrame: 1
|
||||
maxCueLinkCallbacksPerFrame: 1
|
||||
standardVoicePoolConfig:
|
||||
memoryVoices: 16
|
||||
streamingVoices: 8
|
||||
hcaMxVoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
outputSamplingRate: 0
|
||||
usesInGamePreview: 0
|
||||
inGamePreviewMode: 0
|
||||
switchInitializeSocket: 0
|
||||
inGamePreviewConfig:
|
||||
maxPreviewObjects: 200
|
||||
communicationBufferSize: 2048
|
||||
playbackPositionUpdateInterval: 8
|
||||
serverFrequency: 60
|
||||
asrOutputChannels: 0
|
||||
useRandomSeedWithTime: 1
|
||||
categoriesPerPlayback: 4
|
||||
maxFaders: 4
|
||||
maxBuses: 8
|
||||
maxParameterBlocks: 1024
|
||||
vrMode: 0
|
||||
keepPlayingSoundOnPause: 1
|
||||
editorPcmOutputConfig:
|
||||
enable: 0
|
||||
bufferLength: 4096
|
||||
pcBufferingTime: 0
|
||||
linuxOutput: 0
|
||||
linuxPulseLatencyUsec: 60000
|
||||
iosEnableSonicSync: 1
|
||||
iosBufferingTime: 50
|
||||
iosOverrideIPodMusic: 0
|
||||
androidEnableSonicSync: 1
|
||||
androidBufferingTime: 133
|
||||
androidStartBufferingTime: 100
|
||||
androidLowLatencyStandardVoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
androidUsesAndroidFastMixer: 1
|
||||
androidForceToUseAsrForDefaultPlayback: 1
|
||||
androidUsesAAudio: 0
|
||||
androidStreamType: 0
|
||||
vitaManaVoicePoolConfig:
|
||||
numberOfManaDecoders: 8
|
||||
vitaAtrac9VoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
ps4Atrac9VoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
ps5PortConfig:
|
||||
maxChannelPorts: 1
|
||||
maxObjectPorts: 0
|
||||
switchEnableSonicSync: 1
|
||||
switchOpusVoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
ps4Audio3dConfig:
|
||||
useAudio3D: 0
|
||||
voicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
webglWebAudioVoicePoolConfig:
|
||||
voices: 16
|
||||
initializesMana: 1
|
||||
manaConfig:
|
||||
numberOfDecoders: 8
|
||||
numberOfMaxEntries: 4
|
||||
pcH264PlaybackConfig:
|
||||
useH264Playback: 1
|
||||
vitaH264PlaybackConfig:
|
||||
useH264Playback: 0
|
||||
maxWidth: 960
|
||||
maxHeight: 544
|
||||
getMemoryFromTexture: 0
|
||||
webglConfig:
|
||||
webworkerPath: StreamingAssets
|
||||
heapSize: 32
|
||||
useDecrypter: 0
|
||||
decrypterConfig:
|
||||
key:
|
||||
authenticationFile:
|
||||
enableAtomDecryption: 1
|
||||
enableManaDecryption: 1
|
||||
dontInitializeOnAwake: 0
|
||||
dontDestroyOnLoad: 0
|
||||
--- !u!1 &79047718
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1278,7 +1125,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1438278553}
|
||||
- component: {fileID: 1438278552}
|
||||
- component: {fileID: 1438278551}
|
||||
- component: {fileID: 1438278554}
|
||||
m_Layer: 0
|
||||
m_Name: camera
|
||||
|
|
@ -1287,14 +1133,6 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &1438278551
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1438278550}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &1438278552
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1399,12 +1237,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!1001 &1503418459
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2212,6 +2050,5 @@ SceneRoots:
|
|||
- {fileID: 1826216063}
|
||||
- {fileID: 2109473881}
|
||||
- {fileID: 861504193}
|
||||
- {fileID: 76225900}
|
||||
- {fileID: 1972426892}
|
||||
- {fileID: 1940804980}
|
||||
|
|
|
|||
|
|
@ -320,8 +320,11 @@ public class AudioManager: Singlenton<AudioManager>, IStart, IInitable, IUpdatab
|
|||
AudioMgrObj.InitLimit(c0, c1, c2);
|
||||
}
|
||||
|
||||
public void SetGlobalListenerActive(bool isActive)
|
||||
public void SetGlobalListenerFollow(bool isActive)
|
||||
{
|
||||
AudioMgrObj.GlobalListener.enabled = isActive;
|
||||
if(isActive)
|
||||
AudioMgrObj.EnterFollowState();
|
||||
else
|
||||
AudioMgrObj.ExitFollowState();
|
||||
}
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@ using System.Linq;
|
|||
using Cysharp.Threading.Tasks;
|
||||
using Framework;
|
||||
using PhxhSDK;
|
||||
using UnityEditor.SceneManagement;
|
||||
using UnityEngine;
|
||||
using Object = UnityEngine.Object;
|
||||
using EPlayType = AudioCriManager.EPlayType;
|
||||
|
|
@ -68,7 +69,8 @@ public class AudioUnityManager: Singlenton<AudioUnityManager>, IStart, IInitable
|
|||
private const int SOUND_MAX_NUM = 20;
|
||||
private const int MUSIC_MAX_NUM = 2;
|
||||
|
||||
public AudioListener GlobalListener; //全局耳朵
|
||||
public AudioListener GlobalListener; //全局监听
|
||||
private bool _isFollowCamera = false; //是否跟随相机
|
||||
|
||||
#region Property
|
||||
|
||||
|
|
@ -159,6 +161,7 @@ public class AudioUnityManager: Singlenton<AudioUnityManager>, IStart, IInitable
|
|||
AudioRoot.name = "Audio(Singleton)";
|
||||
Object.DontDestroyOnLoad(AudioRoot);
|
||||
GlobalListener = AudioRoot.AddComponent<AudioListener>();
|
||||
_InitListenerPos();
|
||||
|
||||
// if (curClipType == ClipType.CriwareClip)
|
||||
// {
|
||||
|
|
@ -1261,10 +1264,11 @@ public class AudioUnityManager: Singlenton<AudioUnityManager>, IStart, IInitable
|
|||
|
||||
public void AfterSwitchMainCamera(Camera camera)
|
||||
{
|
||||
//if(AudioManager.Instance.GlobalIsSpeakOpen)
|
||||
var listener = camera.GetComponent<AudioListener>();
|
||||
if (!listener)
|
||||
if (listener)
|
||||
{
|
||||
camera.gameObject.AddComponent<AudioListener>();
|
||||
Object.DestroyImmediate(listener);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1469,6 +1473,34 @@ public class AudioUnityManager: Singlenton<AudioUnityManager>, IStart, IInitable
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region Listener
|
||||
|
||||
private void _SetListenerPos()
|
||||
{
|
||||
if (AudioRoot && _isFollowCamera)
|
||||
{
|
||||
var camera = CameraManager.Instance.MainCamera;
|
||||
AudioRoot.transform.position = camera.transform.position;
|
||||
}
|
||||
}
|
||||
|
||||
private void _InitListenerPos()
|
||||
{
|
||||
AudioRoot.transform.position = new Vector3(0, 0, 0);
|
||||
}
|
||||
|
||||
public void EnterFollowState()
|
||||
{
|
||||
_isFollowCamera = true;
|
||||
}
|
||||
|
||||
public void ExitFollowState()
|
||||
{
|
||||
_isFollowCamera = false;
|
||||
_InitListenerPos();
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
public struct AudioInfo
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ namespace Gameplay.Level
|
|||
public async UniTask<E_LoadingResult> LoadLevel(int leveId)
|
||||
{
|
||||
CurrentLevel = new Level(leveId, _levelParam);
|
||||
AudioManager.Instance.SetGlobalListenerActive(false);
|
||||
AudioManager.Instance.SetGlobalListenerFollow(true);
|
||||
await CurrentLevel.Load();
|
||||
await UniTask.NextFrame();
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ namespace Gameplay.Level
|
|||
|
||||
public async void UnloadLevel()
|
||||
{
|
||||
AudioManager.Instance.SetGlobalListenerActive(true);
|
||||
AudioManager.Instance.SetGlobalListenerFollow(false);
|
||||
await CurrentLevel.Unload();
|
||||
if (CurrentLevel != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -424,12 +424,10 @@ public class UIHerosHeadItemNode : UIHeadItemNodeBase
|
|||
var characterCfg = unitInfo.GetConfigInfo();
|
||||
if (characterCfg != null)
|
||||
{
|
||||
var hp = characterCfg.Cfg.Hp[(int)characterCfg.Level - 1];
|
||||
var shield = characterCfg.Cfg.Shield;
|
||||
var hp = characterCfg.HP();
|
||||
var shield = characterCfg.Armor();
|
||||
var total = hp + shield;
|
||||
|
||||
DebugUtil.LogError($"ID:{characterCfg.Cfg.RoleID}, hp:{hp}, shield:{shield}");
|
||||
|
||||
|
||||
if (Image_HP_BG)
|
||||
{
|
||||
var hpRatio = (float)hp / total;
|
||||
|
|
|
|||
|
|
@ -12822,7 +12822,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 780044542}
|
||||
- component: {fileID: 780044541}
|
||||
- component: {fileID: 780044540}
|
||||
- component: {fileID: 780044539}
|
||||
- component: {fileID: 780044543}
|
||||
m_Layer: 0
|
||||
|
|
@ -12876,14 +12875,6 @@ MonoBehaviour:
|
|||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!81 &780044540
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 780044538}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &780044541
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -32104,6 +32095,8 @@ MonoBehaviour:
|
|||
processPrefab: 0
|
||||
postProcessTextureUnitSize: 512
|
||||
sampleMaterials: []
|
||||
enableBatchGrouping: 0
|
||||
batchGroupDistance: 8
|
||||
--- !u!1001 &1947013275
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.24895254, g: 0.46394107, b: 0.57838154, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -3682,6 +3681,9 @@ MonoBehaviour:
|
|||
fog: {fileID: 0}
|
||||
processPrefab: 0
|
||||
postProcessTextureUnitSize: 512
|
||||
sampleMaterials: []
|
||||
enableBatchGrouping: 0
|
||||
batchGroupDistance: 8
|
||||
--- !u!1 &932839240
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4788,12 +4790,13 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
showSceneType: 1
|
||||
tsCharacterRoot: {fileID: 54667940}
|
||||
tsItemRoot: {fileID: 0}
|
||||
tsCollectRoot: {fileID: 757801612}
|
||||
tsCharacterShowPointRoot: {fileID: 1753177013}
|
||||
tsItemShowPointRoot: {fileID: 587623653}
|
||||
characterMaxCount: 6
|
||||
IsIgnoreKanbanban: 1
|
||||
cameraAnimator: {fileID: 759502492}
|
||||
cameraPlayable: {fileID: 0}
|
||||
listExtractRecord: []
|
||||
--- !u!1001 &1076410784
|
||||
PrefabInstance:
|
||||
|
|
@ -5369,7 +5372,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1351360607}
|
||||
- component: {fileID: 1351360611}
|
||||
- component: {fileID: 1351360610}
|
||||
- component: {fileID: 1351360609}
|
||||
- component: {fileID: 1351360608}
|
||||
m_Layer: 0
|
||||
|
|
@ -5453,20 +5455,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
--- !u!81 &1351360610
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1351360606}
|
||||
m_Enabled: 1
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!20 &1351360611
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -9786,7 +9785,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1456177706}
|
||||
- component: {fileID: 1456177705}
|
||||
- component: {fileID: 1456177704}
|
||||
- component: {fileID: 1456177703}
|
||||
m_Layer: 0
|
||||
m_Name: Camera
|
||||
|
|
@ -9833,20 +9831,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
--- !u!81 &1456177704
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1456177702}
|
||||
m_Enabled: 1
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!20 &1456177705
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10984,6 +10974,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: a12e0c357618e41119174f3503c902dd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
IsEnable: 0
|
||||
--- !u!4 &1747868970
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
|
|||
|
|
@ -1110,7 +1110,7 @@ AudioListener:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1748468551}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
--- !u!1 &1997837144
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -985,7 +984,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 465838073}
|
||||
- component: {fileID: 465838072}
|
||||
- component: {fileID: 465838071}
|
||||
- component: {fileID: 465838074}
|
||||
m_Layer: 0
|
||||
m_Name: Main Camera
|
||||
|
|
@ -994,14 +992,6 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &465838071
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 465838070}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &465838072
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1106,12 +1096,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!4 &467799648 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 7578871759844621717, guid: ef4ab83b778f78040b27f3f0ff7d1f24,
|
||||
|
|
@ -1926,6 +1916,9 @@ MonoBehaviour:
|
|||
fog: {fileID: 1937021074}
|
||||
processPrefab: 0
|
||||
postProcessTextureUnitSize: 256
|
||||
sampleMaterials: []
|
||||
enableBatchGrouping: 0
|
||||
batchGroupDistance: 8
|
||||
--- !u!4 &950438744 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1079799431308027277, guid: 7552226efe8dfdb4b90c945cdd98e312,
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.24895254, g: 0.46394107, b: 0.57838154, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -330,158 +329,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 64998218}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &76225899
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 76225900}
|
||||
- component: {fileID: 76225902}
|
||||
m_Layer: 0
|
||||
m_Name: CriWareLibraryInitializer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &76225900
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 76225899}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &76225902
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 76225899}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5e49f339aff054453b2d8287aec75bf2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
initializesFileSystem: 1
|
||||
fileSystemConfig:
|
||||
numberOfLoaders: 16
|
||||
numberOfBinders: 8
|
||||
numberOfInstallers: 2
|
||||
installBufferSize: 4096
|
||||
maxPath: 256
|
||||
userAgentString:
|
||||
minimizeFileDescriptorUsage: 0
|
||||
enableCrcCheck: 0
|
||||
androidDeviceReadBitrate: 50000000
|
||||
initializesAtom: 1
|
||||
atomConfig:
|
||||
acfFileName:
|
||||
maxVirtualVoices: 32
|
||||
maxVoiceLimitGroups: 32
|
||||
maxCategories: 32
|
||||
maxAisacs: 8
|
||||
maxBusSends: 8
|
||||
maxSequenceEventsPerFrame: 2
|
||||
maxBeatSyncCallbacksPerFrame: 1
|
||||
maxCueLinkCallbacksPerFrame: 1
|
||||
standardVoicePoolConfig:
|
||||
memoryVoices: 16
|
||||
streamingVoices: 8
|
||||
hcaMxVoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
outputSamplingRate: 0
|
||||
usesInGamePreview: 0
|
||||
inGamePreviewMode: 0
|
||||
switchInitializeSocket: 0
|
||||
inGamePreviewConfig:
|
||||
maxPreviewObjects: 200
|
||||
communicationBufferSize: 2048
|
||||
playbackPositionUpdateInterval: 8
|
||||
serverFrequency: 60
|
||||
asrOutputChannels: 0
|
||||
useRandomSeedWithTime: 1
|
||||
categoriesPerPlayback: 4
|
||||
maxFaders: 4
|
||||
maxBuses: 8
|
||||
maxParameterBlocks: 1024
|
||||
vrMode: 0
|
||||
keepPlayingSoundOnPause: 1
|
||||
editorPcmOutputConfig:
|
||||
enable: 0
|
||||
bufferLength: 4096
|
||||
pcBufferingTime: 0
|
||||
linuxOutput: 0
|
||||
linuxPulseLatencyUsec: 60000
|
||||
iosEnableSonicSync: 1
|
||||
iosBufferingTime: 50
|
||||
iosOverrideIPodMusic: 0
|
||||
androidEnableSonicSync: 1
|
||||
androidBufferingTime: 133
|
||||
androidStartBufferingTime: 100
|
||||
androidLowLatencyStandardVoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
androidUsesAndroidFastMixer: 1
|
||||
androidForceToUseAsrForDefaultPlayback: 1
|
||||
androidUsesAAudio: 0
|
||||
androidStreamType: 0
|
||||
vitaManaVoicePoolConfig:
|
||||
numberOfManaDecoders: 8
|
||||
vitaAtrac9VoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
ps4Atrac9VoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
ps5PortConfig:
|
||||
maxChannelPorts: 1
|
||||
maxObjectPorts: 0
|
||||
switchEnableSonicSync: 1
|
||||
switchOpusVoicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
ps4Audio3dConfig:
|
||||
useAudio3D: 0
|
||||
voicePoolConfig:
|
||||
memoryVoices: 0
|
||||
streamingVoices: 0
|
||||
webglWebAudioVoicePoolConfig:
|
||||
voices: 16
|
||||
initializesMana: 1
|
||||
manaConfig:
|
||||
numberOfDecoders: 8
|
||||
numberOfMaxEntries: 4
|
||||
pcH264PlaybackConfig:
|
||||
useH264Playback: 1
|
||||
vitaH264PlaybackConfig:
|
||||
useH264Playback: 0
|
||||
maxWidth: 960
|
||||
maxHeight: 544
|
||||
getMemoryFromTexture: 0
|
||||
webglConfig:
|
||||
webworkerPath: StreamingAssets
|
||||
heapSize: 32
|
||||
useDecrypter: 0
|
||||
decrypterConfig:
|
||||
key:
|
||||
authenticationFile:
|
||||
enableAtomDecryption: 1
|
||||
enableManaDecryption: 1
|
||||
dontInitializeOnAwake: 0
|
||||
dontDestroyOnLoad: 0
|
||||
--- !u!1 &83489823
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 1
|
||||
|
|
@ -2377,7 +2224,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1438278553}
|
||||
- component: {fileID: 1438278552}
|
||||
- component: {fileID: 1438278551}
|
||||
- component: {fileID: 1438278554}
|
||||
m_Layer: 0
|
||||
m_Name: camera
|
||||
|
|
@ -2386,14 +2232,6 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!81 &1438278551
|
||||
AudioListener:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1438278550}
|
||||
m_Enabled: 1
|
||||
--- !u!20 &1438278552
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2498,12 +2336,12 @@ MonoBehaviour:
|
|||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
quality: 3
|
||||
frameInfluence: 0.1
|
||||
jitterScale: 1
|
||||
mipBias: 0
|
||||
varianceClampScale: 0.9
|
||||
contrastAdaptiveSharpening: 0
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!1001 &1455631456
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3645,6 +3483,9 @@ MonoBehaviour:
|
|||
fog: {fileID: 0}
|
||||
processPrefab: 0
|
||||
postProcessTextureUnitSize: 512
|
||||
sampleMaterials: []
|
||||
enableBatchGrouping: 0
|
||||
batchGroupDistance: 8
|
||||
--- !u!1001 &1886435657
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -4436,6 +4277,5 @@ SceneRoots:
|
|||
- {fileID: 1826216063}
|
||||
- {fileID: 2109473881}
|
||||
- {fileID: 861504193}
|
||||
- {fileID: 76225900}
|
||||
- {fileID: 1972426892}
|
||||
- {fileID: 1940804980}
|
||||
|
|
|
|||
Loading…
Reference in New Issue