From 6169e2382951fa150f170de73828303ae2acba97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Fri, 9 Sep 2022 16:02:04 +0800 Subject: [PATCH] bug fix --- Assets/Scenes/Version2.unity | 545 ++++++++++++++++++++- Assets/Scripts/CRIMW/CriScript.meta | 8 + Assets/Scripts/UmaViewerBuilder.cs | 22 +- Assets/StreamingAssets.meta | 8 + Assets/StreamingAssets/cri_auth | Bin 0 -> 256 bytes Assets/StreamingAssets/cri_auth.meta | 7 + Assets/StreamingAssets/sound_proj.acf | Bin 0 -> 10240 bytes Assets/StreamingAssets/sound_proj.acf.meta | 7 + 8 files changed, 589 insertions(+), 8 deletions(-) create mode 100644 Assets/Scripts/CRIMW/CriScript.meta create mode 100644 Assets/StreamingAssets.meta create mode 100644 Assets/StreamingAssets/cri_auth create mode 100644 Assets/StreamingAssets/cri_auth.meta create mode 100644 Assets/StreamingAssets/sound_proj.acf create mode 100644 Assets/StreamingAssets/sound_proj.acf.meta diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index a85fda2..50cb230 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -7178,6 +7178,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1564959568} + m_TargetAssemblyTypeName: UmaViewerBuilder, umamusume + m_MethodName: SetCriWare + 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 --- !u!114 &695996367 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9188,7 +9200,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &859804981 GameObject: @@ -10191,6 +10203,151 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 975378972} m_CullTransparentMesh: 1 +--- !u!1 &981343931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981343935} + - component: {fileID: 981343934} + - component: {fileID: 981343933} + - component: {fileID: 981343932} + m_Layer: 5 + m_Name: LiveSoundsCri + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &981343932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981343931} + 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: 981343933} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1564959567} + m_TargetAssemblyTypeName: UmaViewerUI, umamusume + m_MethodName: ToggleUIPanel + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 829429199} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1564959568} + m_TargetAssemblyTypeName: UmaViewerBuilder, umamusume + m_MethodName: SetCriWare + m_Mode: 6 + 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!114 &981343933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981343931} + 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 &981343934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981343931} + m_CullTransparentMesh: 1 +--- !u!224 &981343935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981343931} + 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: 1536013279} + m_Father: {fileID: 1200264883} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &991135999 GameObject: m_ObjectHideFlags: 0 @@ -10438,6 +10595,153 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1038441053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1038441054} + - component: {fileID: 1038441055} + m_Layer: 0 + m_Name: CriWareLibraryInitializer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1038441054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038441053} + 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: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1038441055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038441053} + 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: 32 + 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 + vitaManaVoicePoolConfig: + numberOfManaDecoders: 8 + vitaAtrac9VoicePoolConfig: + memoryVoices: 0 + streamingVoices: 0 + ps4Atrac9VoicePoolConfig: + memoryVoices: 0 + streamingVoices: 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: 1 + decrypterConfig: + key: 75923756697503 + authenticationFile: cri_auth + enableAtomDecryption: 1 + enableManaDecryption: 1 + dontInitializeOnAwake: 0 + dontDestroyOnLoad: 0 --- !u!1 &1040294590 GameObject: m_ObjectHideFlags: 0 @@ -11581,7 +11885,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1177175081 GameObject: @@ -11823,6 +12127,7 @@ RectTransform: - {fileID: 1259881231} - {fileID: 886856742} - {fileID: 695996365} + - {fileID: 981343935} m_Father: {fileID: 733646225} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12076,6 +12381,101 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1210994109} m_CullTransparentMesh: 1 +--- !u!1 &1228994481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1228994483} + - component: {fileID: 1228994482} + m_Layer: 0 + m_Name: CriWare + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1228994482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228994481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 91f529aa944b914449d62b8c40f188fe, type: 3} + m_Name: + m_EditorClassIdentifier: + acfFile: sound_proj.acf + cueSheets: [] + dspBusSetting: + dontDestroyOnLoad: 0 + dontRemoveExistsCueSheet: 0 +--- !u!4 &1228994483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1228994481} + 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: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1229377110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1229377111} + - component: {fileID: 1229377112} + m_Layer: 0 + m_Name: CriWareErrorHandler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1229377111 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229377110} + 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: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1229377112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229377110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f154ff0ac54c142928b46e94a4ee0790, type: 3} + m_Name: + m_EditorClassIdentifier: + enableDebugPrintOnTerminal: 0 + enableForceCrashOnError: 0 + dontDestroyOnLoad: 1 + messageBufferCounts: 8 --- !u!1 &1240401725 GameObject: m_ObjectHideFlags: 0 @@ -14352,6 +14752,140 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &1536013278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1536013279} + - component: {fileID: 1536013281} + - component: {fileID: 1536013280} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1536013279 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1536013278} + 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: 981343935} + 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, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1536013280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1536013278} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: LiveSounds(CRI) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1536013281 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1536013278} + m_CullTransparentMesh: 1 --- !u!1 &1537165046 GameObject: m_ObjectHideFlags: 0 @@ -14672,6 +15206,7 @@ MonoBehaviour: CurrentLiveContainer: {fileID: 0} CurrentOtherContainer: {fileID: 0} CurrentAudioSources: [] + isCirware: 0 OverrideController: {fileID: 22100000, guid: 130057757529b0f40a4fdc08bf0861ef, type: 2} --- !u!1 &1566898429 GameObject: @@ -18880,7 +19415,7 @@ RectTransform: - {fileID: 1300114664} - {fileID: 1210994110} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19224,7 +19759,7 @@ Transform: m_LocalScale: {x: 10, y: 2, z: 10} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2043122521 GameObject: @@ -26827,5 +27362,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} diff --git a/Assets/Scripts/CRIMW/CriScript.meta b/Assets/Scripts/CRIMW/CriScript.meta new file mode 100644 index 0000000..5747bae --- /dev/null +++ b/Assets/Scripts/CRIMW/CriScript.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 563cc63bc4fc0504aa33590e2d263881 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UmaViewerBuilder.cs b/Assets/Scripts/UmaViewerBuilder.cs index d2a7da4..8d12190 100644 --- a/Assets/Scripts/UmaViewerBuilder.cs +++ b/Assets/Scripts/UmaViewerBuilder.cs @@ -30,6 +30,8 @@ public class UmaViewerBuilder : MonoBehaviour public List CurrentAudioSources = new List(); public List CurrentLyrics = new List(); + public bool isCirware = false; + public AnimatorOverrideController OverrideController; @@ -356,6 +358,11 @@ public class UmaViewerBuilder : MonoBehaviour } + public void SetCriWare(bool value) + { + isCirware = value; + } + public void LoadLiveSound(int songid, UmaDatabaseEntry SongAwb) { if (CurrentAudioSources.Count > 0) @@ -447,9 +454,18 @@ public class UmaViewerBuilder : MonoBehaviour string filePath = GetABPath(lyricsAsset); if (File.Exists(filePath)) { - UI.LoadedAssetsAdd(lyricsAsset); - AssetBundle bundle = AssetBundle.LoadFromFile(filePath); - Main.LoadedBundles.Add(lyricsAsset.Name, bundle); + AssetBundle bundle; + if (Main.LoadedBundles.ContainsKey(lyricsAsset.Name)) + { + bundle = Main.LoadedBundles[lyricsAsset.Name]; + } + else + { + UI.LoadedAssetsAdd(lyricsAsset); + bundle = AssetBundle.LoadFromFile(filePath); + Main.LoadedBundles.Add(lyricsAsset.Name, bundle); + } + TextAsset asset = bundle.LoadAsset(Path.GetFileNameWithoutExtension(lyricsVar)); string[] lines = asset.text.Split("\n"[0]); for (int i = 1; i < lines.Length; i++) diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..9f2ed4a --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed51347167c9f1142a8654197f7b1763 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/cri_auth b/Assets/StreamingAssets/cri_auth new file mode 100644 index 0000000000000000000000000000000000000000..da5aa2f548d63238031d0ca4d311eb485bac7c3c GIT binary patch literal 256 zcmV+b0ssD+sl&rlu;(-cTK?|y5$8^GuzxZ7R!sxikSgRj7FQ?&bteT!DhBk3d=)!FrFT%J-xC~sXurRd;$+$EFdH}Ft{YnuYESH?FE?u7vvt#FzH8>f=fP0dx>U-Uh8A=p13oeXEUE G9mm5F3we_O literal 0 HcmV?d00001 diff --git a/Assets/StreamingAssets/cri_auth.meta b/Assets/StreamingAssets/cri_auth.meta new file mode 100644 index 0000000..610197f --- /dev/null +++ b/Assets/StreamingAssets/cri_auth.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8c7023d3f3266c54a93b1adaef514c53 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/sound_proj.acf b/Assets/StreamingAssets/sound_proj.acf new file mode 100644 index 0000000000000000000000000000000000000000..183531d76c1967827705be94192c584f81b86a72 GIT binary patch literal 10240 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 Oa{d>;&+AGq0{;Ve7RPA- literal 0 HcmV?d00001 diff --git a/Assets/StreamingAssets/sound_proj.acf.meta b/Assets/StreamingAssets/sound_proj.acf.meta new file mode 100644 index 0000000..a098e24 --- /dev/null +++ b/Assets/StreamingAssets/sound_proj.acf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2cb8c0ccfe8a75e49904375f12e1d622 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: