Skip to content

M
MDPro3
Commit 3dc972d7 authored by SherryChaos's avatar SherryChaos
Browse files
Options

new bgm logic

parent ae4e04cf
Show whitespace changes
Inline Side-by-side
Showing with 829 additions and 196 deletions
Assets/Addressables/Text/UpdateContent.txt
View file @ 3dc972d7
......@@ -3,7 +3,7 @@
MDPro3 v1.1.8.3更新：
1.语音功能支持所有支持的语言。
2.修复语音功能部分角色的台词错误。
3.
3.设置中新增场地背景音乐由哪方决定的选项。
MDPro3 v1.1.8.2更新：
1.语音功能新增全卡语音。
......
Assets/Main.unity
View file @ 3dc972d7
......@@ -10131,7 +10131,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -400.00006, y: 0}
m_AnchoredPosition: {x: -400.00012, y: 0}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &129642814
......@@ -11736,7 +11736,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: -490.00055, y: 0}
m_AnchoredPosition: {x: -490.0006, y: 0}
m_SizeDelta: {x: 490, y: 2000}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &153416284
......@@ -19319,14 +19319,15 @@ RectTransform:
- {fileID: 1149457841}
- {fileID: 1802412320}
- {fileID: 852752482}
- {fileID: 611922613}
- {fileID: 1437610478}
- {fileID: 1914298059}
m_Father: {fileID: 835420698}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 2700}
m_AnchoredPosition: {x: 0, y: 1770}
m_SizeDelta: {x: 0, y: 2850}
m_Pivot: {x: 0, y: 1}
--- !u!1 &256757514
GameObject:
......@@ -25956,7 +25957,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -400.00006, y: 300}
m_AnchoredPosition: {x: -400.00012, y: 300}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &365844423
......@@ -31407,8 +31408,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 902627733}
m_HandleRect: {fileID: 902627732}
m_Direction: 2
m_Value: 1
m_Size: 0.4
m_Value: 0
m_Size: 0.37894738
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -32456,6 +32457,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 456200220}
m_CullTransparentMesh: 1
--- !u!1 &458468419
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 458468420}
- component: {fileID: 458468422}
- component: {fileID: 458468421}
m_Layer: 5
m_Name: '#Text_SettingValue'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &458468420
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 458468419}
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: 575582987}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -100, y: -15}
m_SizeDelta: {x: 600, y: 40}
m_Pivot: {x: 1, y: 1}
--- !u!114 &458468421
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 458468419}
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.8, g: 1, b: 0, 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: cdf4c81f8bf6eb248a105d8a5edf19fd, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u6211\u65B9"
--- !u!222 &458468422
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 458468419}
m_CullTransparentMesh: 1
--- !u!1 &458744425
GameObject:
m_ObjectHideFlags: 0
......@@ -33338,9 +33418,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
previewClip: {fileID: 0}
enterAudio:
clickAudio: SE_MENU_SELECT_01
clickAudio: VOICE/VoiceSample
exitAudio:
audioType: 0
audioType: 2
--- !u!1 &469869503
GameObject:
m_ObjectHideFlags: 0
......@@ -40999,6 +41079,171 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
label: IconMate
--- !u!1 &575582986
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 575582987}
- component: {fileID: 575582992}
- component: {fileID: 575582991}
- component: {fileID: 575582990}
- component: {fileID: 575582989}
- component: {fileID: 575582988}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &575582987
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 575582986}
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:
- {fileID: 814723412}
- {fileID: 824422405}
- {fileID: 458468420}
- {fileID: 1806643104}
m_Father: {fileID: 611922613}
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!95 &575582988
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 575582986}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: a331e0b501f943a4ebf8f266a43ae8f7, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &575582989
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 575582986}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c48b628189305e649b63ee28987f282f, type: 3}
m_Name:
m_EditorClassIdentifier:
previewClip: {fileID: 0}
enterAudio:
clickAudio: SE_MENU_SELECT_01
exitAudio:
audioType: 0
--- !u!114 &575582990
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 575582986}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 0}
m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
m_PressedColor: {r: 0.6, g: 0.6, b: 0.6, 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: 575582991}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &575582991
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 575582986}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: 9126a6c7014175e4b91a80f607d03903, type: 2}
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: 21300000, guid: cd51bb57b5d16b14b82579d3a9d130fc, type: 3}
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 &575582992
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 575582986}
m_CullTransparentMesh: 1
--- !u!1 &577011132
GameObject:
m_ObjectHideFlags: 0
......@@ -43297,6 +43542,82 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 609598881}
m_CullTransparentMesh: 1
--- !u!1 &611922612
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 611922613}
- component: {fileID: 611922615}
- component: {fileID: 611922614}
m_Layer: 5
m_Name: BgmBy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &611922613
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 611922612}
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:
- {fileID: 575582987}
m_Father: {fileID: 255926432}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10, y: -2380}
m_SizeDelta: {x: -50, y: 140}
m_Pivot: {x: 0, y: 1}
--- !u!114 &611922614
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 611922612}
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: 21300000, guid: c60170ace8b98804da6966754b4bf67e, type: 3}
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 &611922615
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 611922612}
m_CullTransparentMesh: 1
--- !u!1 &613235426
GameObject:
m_ObjectHideFlags: 0
......@@ -47107,6 +47428,8 @@ MonoBehaviour:
uiScaleValue: {fileID: 827639876}
background: {fileID: 515005595}
backgroundValue: {fileID: 1496759375}
bgmBy: {fileID: 575582990}
bgmByValue: {fileID: 458468421}
cardLanguage: {fileID: 1442862357}
cardLanguageValue: {fileID: 1593847972}
language: {fileID: 2138794183}
......@@ -50524,7 +50847,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -420.00006, y: -60}
m_AnchoredPosition: {x: -420.00012, y: -60}
m_SizeDelta: {x: 400, y: 760}
m_Pivot: {x: 0, y: 1}
--- !u!114 &736958434
......@@ -52111,7 +52434,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 476827028}
m_Direction: 2
m_Value: 1
m_Size: 0.64128274
m_Size: 0.696476
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -54035,6 +54358,85 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 813652849}
m_CullTransparentMesh: 1
--- !u!1 &814723411
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 814723412}
- component: {fileID: 814723414}
- component: {fileID: 814723413}
m_Layer: 5
m_Name: '#Text_Title'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &814723412
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814723411}
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: 575582987}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 25, y: -30}
m_SizeDelta: {x: -75, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &814723413
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814723411}
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: cdf4c81f8bf6eb248a105d8a5edf19fd, type: 3}
m_FontSize: 25
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 59
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u573A\u5730\u80CC\u666F\u97F3\u4E50"
--- !u!222 &814723414
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 814723411}
m_CullTransparentMesh: 1
--- !u!1 &814756180
GameObject:
m_ObjectHideFlags: 0
......@@ -54861,6 +55263,85 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
label: Group
--- !u!1 &824422404
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 824422405}
- component: {fileID: 824422407}
- component: {fileID: 824422406}
m_Layer: 5
m_Name: '#Text_Ex'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &824422405
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 824422404}
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: 575582987}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 25, y: -26}
m_SizeDelta: {x: -50, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &824422406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 824422404}
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: cdf4c81f8bf6eb248a105d8a5edf19fd, type: 3}
m_FontSize: 23
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 59
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u573A\u5730\u80CC\u666F\u97F3\u4E50\u7531\u54EA\u65B9\u51B3\u5B9A"
--- !u!222 &824422407
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 824422404}
m_CullTransparentMesh: 1
--- !u!1 &825093772
GameObject:
m_ObjectHideFlags: 0
......@@ -67755,7 +68236,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 400.00006, y: -132}
m_AnchoredPosition: {x: 400.00012, y: -132}
m_SizeDelta: {x: 330, y: 840}
m_Pivot: {x: 1, y: 1}
--- !u!114 &998933908
......@@ -91205,7 +91686,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -400.00006, y: 150}
m_AnchoredPosition: {x: -400.00012, y: 150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1374530642
......@@ -95962,7 +96443,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10, y: -2380}
m_AnchoredPosition: {x: 10, y: -2530}
m_SizeDelta: {x: -50, y: 140}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1437610479
......@@ -120990,7 +121471,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -400.00006, y: -150}
m_AnchoredPosition: {x: -400.00012, y: -150}
m_SizeDelta: {x: -1350, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1800729521
......@@ -121635,6 +122116,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1804949511}
m_CullTransparentMesh: 1
--- !u!1 &1806643103
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1806643104}
- component: {fileID: 1806643106}
- component: {fileID: 1806643105}
m_Layer: 5
m_Name: Arrow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1806643104
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1806643103}
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: 575582987}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -20, y: -35}
m_SizeDelta: {x: 20.8, y: 32}
m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1806643105
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1806643103}
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: 21300000, guid: 579c4968ae1425a4594bdd981b3d8ee6, type: 3}
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 &1806643106
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1806643103}
m_CullTransparentMesh: 1
--- !u!1 &1807146475
GameObject:
m_ObjectHideFlags: 0
......@@ -128802,7 +129358,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10, y: -2530}
m_AnchoredPosition: {x: 10, y: -2680}
m_SizeDelta: {x: -50, y: 140}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1914298060
......@@ -131674,7 +132230,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -1000.00055, y: 0}
m_AnchoredPosition: {x: -1000.0006, y: 0}
m_SizeDelta: {x: -1000, y: 128}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1953445533
Assets/Scripts/MDPro3/Managers/AudioManager.cs
View file @ 3dc972d7
......@@ -27,7 +27,31 @@ namespace MDPro3
PlayBGM("BGM_MENU_01");
}
void OnAudioConfigurationChanged(bool deviceWasChanged)
{
#if !UNITY_EDITOR && UNITY_ANDROID
if (deviceWasChanged)
{
AudioConfiguration config = AudioSettings.GetConfiguration();
AudioSettings.Reset(config);
}
bgm.Play();
#endif
}
public static void SetSeVol(float vol)
{
se.volume = vol;
}
public static void SetBGMVol(float vol)
{
bgm.volume = vol * currentBGMScale;
}
public static void SetVoiceVol(float vol)
{
voice.volume = vol;
}
#region SE
struct LastSE
{
public float time;
......@@ -58,7 +82,7 @@ namespace MDPro3
};
}
public static IEnumerator PlaySEGroup(List<string> ses, float volumeScale = 1)
static IEnumerator PlaySEGroup(List<string> ses, float volumeScale = 1)
{
foreach (string s in ses)
{
......@@ -92,84 +116,199 @@ namespace MDPro3
se.gameObject.SetActive(true);
}
static int bgmState = 0;
#endregion
static int GetFieldID(string fieldName)
#region Voice
public static void PlayVoiceByResourcePath(string path)
{
return int.Parse(fieldName.Substring(4, 3));
var clip = Resources.Load<AudioClip>(path);
if(clip != null)
voice.PlayOneShot(clip);
}
public static void PlayVoice(AudioClip clip)
{
voice.PlayOneShot(clip);
}
#endregion
#region BGM
enum BgmType
{
NORMAL,
KEYCARD,
CLIMAX
}
static List<int> commonBgms = new List<int>()
struct BgmLoop
{
public string name;
public float startTime;
public float endTime;
}
readonly static List<BgmLoop> loops = new List<BgmLoop>
{
new BgmLoop{name = "BGM_MENU_01", startTime = 12.433f, endTime = 120 + 31.100f },
new BgmLoop{name = "BGM_MENU_02", startTime = 15.687f, endTime = 120 + 2.354f },
new BgmLoop{name = "BGM_DUEL_NORMAL_01", startTime = 9.600f, endTime = 60 + 55.200f },
new BgmLoop{name = "BGM_DUEL_NORMAL_02", startTime = 16.500f, endTime = 60 + 48.500f },
new BgmLoop{name = "BGM_DUEL_NORMAL_03", startTime = 5.727f, endTime = 120 + 11.444f },
new BgmLoop{name = "BGM_DUEL_NORMAL_04", startTime = 13.518f, endTime = 60 + 57.300f },
new BgmLoop{name = "BGM_DUEL_NORMAL_05", startTime = 11.208f, endTime = 120 + 22.875f },
new BgmLoop{name = "BGM_DUEL_NORMAL_06", startTime = 9.527f, endTime = 60 + 41.906f },
new BgmLoop{name = "BGM_DUEL_NORMAL_07", startTime = 17.456f, endTime = 120 +9.247f },
new BgmLoop{name = "BGM_DUEL_NORMAL_08", startTime = 18.400f, endTime = 120 + 12.400f },
new BgmLoop{name = "BGM_DUEL_NORMAL_09", startTime = 6.200f, endTime = 60 +51.400f },
new BgmLoop{name = "BGM_DUEL_NORMAL_10", startTime = 9.989f, endTime = 60 + 51.636f },
new BgmLoop{name = "BGM_DUEL_NORMAL_11", startTime = 2.378f, endTime = 60 +29.650f },
new BgmLoop{name = "BGM_DUEL_NORMAL_12", startTime = 7.500f, endTime = 60 +47.800f },
new BgmLoop{name = "BGM_DUEL_NORMAL_13", startTime = 7.433f, endTime = 60 + 54.741f },
new BgmLoop{name = "BGM_DUEL_NORMAL_14", startTime = 5.538f, endTime = 60 +34.142f },
new BgmLoop{name = "BGM_DUEL_NORMAL_15", startTime = 8.455f, endTime = 60 +34.855f },
new BgmLoop{name = "BGM_DUEL_NORMAL_16", startTime = 14.440f, endTime = 60 + 44.440f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_01", startTime = 11.744f, endTime = 60 + 49.390f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_02", startTime = 10.500f, endTime = 60 + 46.500f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_03", startTime = 13.697f, endTime = 60 + 38.150f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_04", startTime = 7.032f, endTime = 60 + 49.888f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_05", startTime = 12.495f, endTime = 60 +23.079f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_06", startTime = 11.400f, endTime = 60 + 38.400f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_07", startTime = 6.518f, endTime = 60 + 24.928f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_08", startTime = 13.783f, endTime = 60 + 57.727f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_09", startTime = 3.800f, endTime = 60 + 20.300f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_10", startTime = 17.599f, endTime = 60 + 40.508f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_11", startTime = 11.738f, endTime = 60 + 57.104f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_12", startTime = 13.630f, endTime = 60 + 45.684f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_13", startTime = 18.519f, endTime = 60 + 55.734f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_14", startTime = 2.269f, endTime = 60 + 35.830f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_15", startTime = 11.369f, endTime = 60 + 41.369f },
new BgmLoop{name = "BGM_DUEL_KEYCARD_16", startTime = 6.348f, endTime = 60 + 36.151f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_01", startTime = 6.300f, endTime = 60 + 37.800f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_02", startTime = 12.883f, endTime = 60 + 53.958f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_03", startTime = 12.579f, endTime = 120 + 7.444f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_04", startTime = 3.325f, endTime = 60 + 31.047f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_05", startTime = 5.424f, endTime = 60 + 37.188f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_06", startTime = 5.896f, endTime = 60 + 26.184f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_07", startTime = 11.500f, endTime = 60 + 31.500f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_08", startTime = 15.547f, endTime = 60 + 48.505f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_09", startTime = 6.300f, endTime = 60 + 28.800f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_10", startTime = 2.500f, endTime = 60 + 34.500f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_11", startTime = 13.223f, endTime = 60 + 43.955f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_12", startTime = 6.448f, endTime = 60 + 34.252f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_13", startTime = 5.637f, endTime = 60 + 50.429f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_14", startTime = 12.169f, endTime = 60 + 48.165f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_15", startTime = 7.056f, endTime = 60 + 39.847f },
new BgmLoop{name = "BGM_DUEL_CLIMAX_16", startTime = 9.606f, endTime = 60 + 28.067f },
new BgmLoop{name = "BGM_DUEL_EX_01", startTime = 21.014f, endTime = 60 + 57.026f },
new BgmLoop{name = "BGM_DUEL_EX_02_NORMAL", startTime = 2.466f, endTime = 60 + 47.193f },
new BgmLoop{name = "BGM_DUEL_EX_02_KEYCARD", startTime = 6.941f, endTime = 60 + 46.766f },
new BgmLoop{name = "BGM_DUEL_EX_02_CLIMAX", startTime = 2.346f, endTime = 60 + 43.210f },
new BgmLoop{name = "BGM_DUEL_EX_03_NORMAL", startTime = 11.478f, endTime = 60 + 56.473f },
new BgmLoop{name = "BGM_DUEL_EX_03_KEYCARD", startTime = 12.463f, endTime = 60 + 46.098f },
new BgmLoop{name = "BGM_DUEL_EX_03_CLIMAX", startTime = 1.815f, endTime = 120 + 8.792f },
new BgmLoop{name = "BGM_OUT_TUTORIAL_2", startTime = 7.480f, endTime = 60 + 22.480f },
};
static readonly List<int> bgms = new List<int>()
{
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
};
static readonly List<int> exBgms = new List<int>()
{
2, 3, 4, 5
};
static readonly List<int> commonBgms = new List<int>()
{
1,
2,
3,
4,
6,
7,
8,
10,
11,
12,
13,
15,
16
7
};
static int currentBgmID = 1;
static List<int> GetBgmByField(int fieldID)
{
var returnValue = new List<int>();
if (fieldID == 7)
returnValue.Add(5);
else if (fieldID == 16 || fieldID == 17)
returnValue.Add(9);
else if (fieldID == 22)
returnValue.Add(14);
else
return commonBgms;
return returnValue;
static readonly Dictionary<int, List<int>> fieldBGMs = new Dictionary<int, List<int>>()
{
{1, new List<int>{ 2, 12 } },//「森」「未界域－欧玛利亚大陆」
{2, new List<int>{ 4, 3, 21 } },//「齿车街」「魔导书廊」「教导的圣堂」
{3, new List<int>{ 1, 11 } },//「仪式之间」「荒野的祭殿」
{4, new List<int>{ 5, 6 } },//「火山」「星遺物沉眠的废墟」
{5, new List<int>{ 7 } },//「异国之都」
{6, new List<int>{ 15, 24 } },//「鲜彩之苍海」「辉石的洞窟」
{7, new List<int>{ 9 } },//「摩天楼」
{8, new List<int>{ } },
{9, new List<int>{ 16, 17 } },//「魔偶甜点城堡」「鬼计之馆」
{10, new List<int>{ } },
{11, new List<int>{ } },
{12, new List<int>{ 19, 18, 25 } },//「突异变种进化研究所」「电脑的宇宙」「六世坏=天魔世界」
{13, new List<int>{ 14 } },//「相剑的灵峰」
{14, new List<int>{ 22 } },//「恶魔宫殿」
{15, new List<int>{ 10 } },//「冻结的世界」
{16, new List<int>{ 20, 27, 28 } },//「古之决斗的记忆」「苏醒的天空殿」「青色眼睛的灵堂」
};
static readonly Dictionary<int, List<int>> exFieldBGMs = new Dictionary<int, List<int>>()
{
{1, new List<int>{ } },
{2, new List<int>{ 8 } },//「角斗场」
{3, new List<int>{ 13 } },//「WCS」
{4, new List<int>{ } },
{5, new List<int>{ } },
};
static int bgmState = 0;
static int bgmId = 1;
static bool exBgm = false;
static int GetFieldIdByFieldName(string fieldName)
{
return int.Parse(fieldName.Substring(4, 3));
}
public static void PlayBGMNormal(string filedName)
static int GetBgmIdByFieldId(int fieldId)
{
bgmState = 0;
var fieldID = GetFieldID(filedName);
if (fieldID == 8)
PlayBGM("BGM_DUEL_EX_02_NORMAL");
else if (fieldID == 13)
PlayBGM("BGM_DUEL_EX_03_NORMAL");
else
exBgm = false;
foreach(var pair in fieldBGMs)
if (pair.Value.Contains(fieldId))
return pair.Key;
foreach (var pair in exFieldBGMs)
if (pair.Value.Contains(fieldId))
{
var list = GetBgmByField(fieldID);
currentBgmID = list[UnityEngine.Random.Range(0, list.Count)];
PlayBGM("BGM_DUEL_NORMAL_" + currentBgmID.ToString("D2"));
exBgm = true;
return pair.Key;
}
return commonBgms[UnityEngine.Random.Range(0, commonBgms.Count)];
}
public static void PlayBGMKeyCard(string filedName)
static string GetBgmPathById(int bgmId, BgmType type)
{
if (exBgm)
return "BGM_DUEL_EX_" + bgmId.ToString("D2") + "_" + type;
else
return "BGM_DUEL_" + type + "_" + bgmId.ToString("D2");
}
public static void PlayBgmNormal(string filedName)
{
bgmState = 0;
var fieldId = GetFieldIdByFieldName(filedName);
bgmId = GetBgmIdByFieldId(fieldId);
PlayBGM(GetBgmPathById(bgmId, BgmType.NORMAL));
}
public static void PlayBgmKeyCard()
{
if (bgmState > 0)
return;
bgmState = 1;
var fieldID = GetFieldID(filedName);
if (fieldID == 8)
PlayBGM("BGM_DUEL_EX_02_KEYCARD");
else if (fieldID == 13)
PlayBGM("BGM_DUEL_EX_03_KEYCARD");
else
PlayBGM("BGM_DUEL_KEYCARD_" + currentBgmID.ToString("D2"));
PlayBGM(GetBgmPathById(bgmId, BgmType.KEYCARD));
}
public static void PlayBGMClimax(string filedName)
public static void PlayBgmClimax()
{
if (bgmState == 2)
return;
bgmState = 2;
var fieldID = GetFieldID(filedName);
if (fieldID == 8)
PlayBGM("BGM_DUEL_EX_02_CLIMAX");
else if (fieldID == 13)
PlayBGM("BGM_DUEL_EX_03_CLIMAX");
else
PlayBGM("BGM_DUEL_CLIMAX_" + currentBgmID.ToString("D2"));
PlayBGM(GetBgmPathById(bgmId, BgmType.CLIMAX));
}
static float currentBGMScale = 1f;
......@@ -202,8 +341,7 @@ namespace MDPro3
}
public static void PlayRandomKeyCardBGM()
{
var bgm = "BGM_DUEL_KEYCARD_" + commonBgms[UnityEngine.Random.Range(0, commonBgms.Count)].ToString("D2");
PlayBGM(bgm);
PlayBGM(GetBgmPathById(bgms[UnityEngine.Random.Range(0, bgms.Count)], BgmType.KEYCARD));
}
static string currentBGM = string.Empty;
......@@ -236,115 +374,12 @@ namespace MDPro3
return;
if (bgm.time > loopEnd)
bgm.time = loopStart;
//if (Input.GetKeyDown(KeyCode.T))
// bgm.time = loopEnd - 5;
}
public static void PlayVoiceByPath(string path)
{
}
public static void PlayVoice(AudioClip clip)
{
voice.PlayOneShot(clip);
}
public static void SetSeVol(float vol)
{
se.volume = vol;
}
public static void SetBGMVol(float vol)
{
bgm.volume = vol * currentBGMScale;
}
public static void SetVoiceVol(float vol)
{
voice.volume = vol;
}
void OnAudioConfigurationChanged(bool deviceWasChanged)
{
#if !UNITY_EDITOR && UNITY_ANDROID
if (deviceWasChanged)
{
AudioConfiguration config = AudioSettings.GetConfiguration();
AudioSettings.Reset(config);
}
bgm.Play();
#endif
}
public struct BGMLoop
{
public string name;
public float startTime;
public float endTime;
}
readonly static List<BGMLoop> loops = new List<BGMLoop>
{
new BGMLoop{name = "BGM_MENU_01", startTime = 12.433f, endTime = 120 + 31.100f },
new BGMLoop{name = "BGM_MENU_02", startTime = 15.687f, endTime = 120 + 2.354f },
new BGMLoop{name = "BGM_DUEL_NORMAL_01", startTime = 9.600f, endTime = 60 + 55.200f },
new BGMLoop{name = "BGM_DUEL_NORMAL_02", startTime = 16.500f, endTime = 60 + 48.500f },
new BGMLoop{name = "BGM_DUEL_NORMAL_03", startTime = 5.727f, endTime = 120 + 11.444f },
new BGMLoop{name = "BGM_DUEL_NORMAL_04", startTime = 13.518f, endTime = 60 + 57.300f },
new BGMLoop{name = "BGM_DUEL_NORMAL_05", startTime = 11.208f, endTime = 120 + 22.875f },
new BGMLoop{name = "BGM_DUEL_NORMAL_06", startTime = 9.527f, endTime = 60 + 41.906f },
new BGMLoop{name = "BGM_DUEL_NORMAL_07", startTime = 17.456f, endTime = 120 +9.247f },
new BGMLoop{name = "BGM_DUEL_NORMAL_08", startTime = 18.400f, endTime = 120 + 12.400f },
new BGMLoop{name = "BGM_DUEL_NORMAL_09", startTime = 6.200f, endTime = 60 +51.400f },
new BGMLoop{name = "BGM_DUEL_NORMAL_10", startTime = 9.989f, endTime = 60 + 51.636f },
new BGMLoop{name = "BGM_DUEL_NORMAL_11", startTime = 2.378f, endTime = 60 +29.650f },
new BGMLoop{name = "BGM_DUEL_NORMAL_12", startTime = 7.500f, endTime = 60 +47.800f },
new BGMLoop{name = "BGM_DUEL_NORMAL_13", startTime = 7.433f, endTime = 60 + 54.741f },
new BGMLoop{name = "BGM_DUEL_NORMAL_14", startTime = 5.538f, endTime = 60 +34.142f },
new BGMLoop{name = "BGM_DUEL_NORMAL_15", startTime = 8.455f, endTime = 60 +34.855f },
new BGMLoop{name = "BGM_DUEL_NORMAL_16", startTime = 14.440f, endTime = 60 + 44.440f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_01", startTime = 11.744f, endTime = 60 + 49.390f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_02", startTime = 10.500f, endTime = 60 + 46.500f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_03", startTime = 13.697f, endTime = 60 + 38.150f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_04", startTime = 7.032f, endTime = 60 + 49.888f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_05", startTime = 12.495f, endTime = 60 +23.079f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_06", startTime = 11.400f, endTime = 60 + 38.400f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_07", startTime = 6.518f, endTime = 60 + 24.928f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_08", startTime = 13.783f, endTime = 60 + 57.727f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_09", startTime = 3.800f, endTime = 60 + 20.300f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_10", startTime = 17.599f, endTime = 60 + 40.508f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_11", startTime = 11.738f, endTime = 60 + 57.104f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_12", startTime = 13.630f, endTime = 60 + 45.684f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_13", startTime = 18.519f, endTime = 60 + 55.734f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_14", startTime = 2.269f, endTime = 60 + 35.830f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_15", startTime = 11.369f, endTime = 60 + 41.369f },
new BGMLoop{name = "BGM_DUEL_KEYCARD_16", startTime = 6.348f, endTime = 60 + 36.151f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_01", startTime = 6.300f, endTime = 60 + 37.800f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_02", startTime = 12.883f, endTime = 60 + 53.958f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_03", startTime = 12.579f, endTime = 120 + 7.444f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_04", startTime = 3.325f, endTime = 60 + 31.047f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_05", startTime = 5.424f, endTime = 60 + 37.188f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_06", startTime = 5.896f, endTime = 60 + 26.184f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_07", startTime = 11.500f, endTime = 60 + 31.500f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_08", startTime = 15.547f, endTime = 60 + 48.505f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_09", startTime = 6.300f, endTime = 60 + 28.800f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_10", startTime = 2.500f, endTime = 60 + 34.500f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_11", startTime = 13.223f, endTime = 60 + 43.955f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_12", startTime = 6.448f, endTime = 60 + 34.252f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_13", startTime = 5.637f, endTime = 60 + 50.429f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_14", startTime = 12.169f, endTime = 60 + 48.165f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_15", startTime = 7.056f, endTime = 60 + 39.847f },
new BGMLoop{name = "BGM_DUEL_CLIMAX_16", startTime = 9.606f, endTime = 60 + 28.067f },
new BGMLoop{name = "BGM_DUEL_EX_01", startTime = 21.014f, endTime = 60 + 57.026f },
new BGMLoop{name = "BGM_DUEL_EX_02_NORMAL", startTime = 2.466f, endTime = 60 + 47.193f },
new BGMLoop{name = "BGM_DUEL_EX_02_KEYCARD", startTime = 6.941f, endTime = 60 + 46.766f },
new BGMLoop{name = "BGM_DUEL_EX_02_CLIMAX", startTime = 2.346f, endTime = 60 + 43.210f },
new BGMLoop{name = "BGM_DUEL_EX_03_NORMAL", startTime = 11.478f, endTime = 60 + 56.473f },
new BGMLoop{name = "BGM_DUEL_EX_03_KEYCARD", startTime = 12.463f, endTime = 60 + 46.098f },
new BGMLoop{name = "BGM_DUEL_EX_03_CLIMAX", startTime = 1.815f, endTime = 120 + 8.792f },
new BGMLoop{name = "BGM_OUT_TUTORIAL_2", startTime = 7.480f, endTime = 60 + 22.480f },
};
#endregion
#region PUBLIC STATIC FUNCTION
public static IEnumerator<AudioClip> LoadAudioFileAsync(string path, AudioType audioType)
{
string fullPath;
......@@ -360,12 +395,14 @@ namespace MDPro3
while (!wait.isDone)
yield return null;
if(request.result == UnityWebRequest.Result.Success)
if (request.result == UnityWebRequest.Result.Success)
{
var audioClip = DownloadHandlerAudioClip.GetContent(request);
yield return audioClip;
}
}
#endregion
}
}
Assets/Scripts/MDPro3/Servants/MonsterCutin.cs
View file @ 3dc972d7
......@@ -14,6 +14,7 @@ using YgomSystem.YGomTMPro;
using MDPro3.YGOSharp;
using MDPro3.YGOSharp.OCGWrapper.Enums;
using MDPro3.UI;
using static UnityEngine.Rendering.DebugUI;
namespace MDPro3
{
......@@ -135,6 +136,9 @@ namespace MDPro3
{
StopCoroutine(autoPlay);
autoPlay = null;
foreach(var cutin in cutins)
Destroy(cutin);
cutins.Clear();
UIManager.ShowExitButton(transitionTime);
cg.alpha = 1;
cg.blocksRaycasts = true;
......@@ -174,7 +178,7 @@ namespace MDPro3
return;
playing = true;
if (Program.I().ocgcore.isShowed)
AudioManager.PlayBGMKeyCard(Program.I().ocgcore.field1Manager.name);
AudioManager.PlayBgmKeyCard();
DOTween.To(v => { }, 0, 0, 1.6f).OnComplete(() =>
{
playing = false;
......@@ -340,10 +344,14 @@ namespace MDPro3
StartCoroutine(autoPlay);
}
bool randomBGMPlayed;
List<GameObject> cutins = new List<GameObject>();
IEnumerator AutoPlayAsync()
{
while (playing)
yield return null;
if(!isShowed)
yield break;
AudioManager.PlayRandomKeyCardBGM();
randomBGMPlayed = true;
cg.alpha = 0f;
......@@ -361,10 +369,10 @@ namespace MDPro3
ie = ABLoader.LoadFromFileAsync("MonsterCutin2/" + card.Id, false, true);
diy = true;
}
StartCoroutine(ie);
while (ie.MoveNext())
yield return null;
ie.Current.SetActive(false);
cutins.Add(ie.Current);
while (playing)
yield return null;
ie.Current.SetActive(true);
......
Assets/Scripts/MDPro3/Servants/OcgCore.cs
View file @ 3dc972d7
......@@ -3439,7 +3439,7 @@ namespace MDPro3
cg.blocksRaycasts = true;
buttons.SetActive(true);
messagePass = true;
AudioManager.PlayBGMNormal(field1.name);
AudioManager.PlayBgmNormal(Config.GetBool("BGMbyMySide", true) ? field0.name : field1.name);
};
};
});
......@@ -3592,7 +3592,7 @@ namespace MDPro3
cg.interactable = true;
cg.blocksRaycasts = true;
buttons.SetActive(true);
AudioManager.PlayBGMNormal(field1.name);
AudioManager.PlayBgmNormal(Config.GetBool("BGMbyMySide", true) ? field0.name : field1.name);
};
for (var i = 0; i < cards.Count; i++)
......@@ -8768,7 +8768,7 @@ namespace MDPro3
grave0Manager.PlayAnimatorTrigger(TriggerLabelDefine.DamagePhase3ToPhase4);
if (stand0Manager != null)
stand0Manager.PlayAnimatorTrigger(TriggerLabelDefine.DamagePhase3ToPhase4);
AudioManager.PlayBGMClimax(field1.name);
AudioManager.PlayBgmClimax();
}
if (bgPhase0 == 4 && life0 <= 0)
{
......@@ -8812,7 +8812,7 @@ namespace MDPro3
grave1Manager.PlayAnimatorTrigger(TriggerLabelDefine.DamagePhase3ToPhase4);
if (stand1Manager != null)
stand1Manager.PlayAnimatorTrigger(TriggerLabelDefine.DamagePhase3ToPhase4);
AudioManager.PlayBGMClimax(field1.name);
AudioManager.PlayBgmClimax();
}
if (bgPhase1 == 4 && life1 <= 0)
{
......
Assets/Scripts/MDPro3/Servants/Setting.cs
View file @ 3dc972d7
......@@ -50,6 +50,8 @@ namespace MDPro3
public Text uiScaleValue;
public Button background;
public Text backgroundValue;
public Button bgmBy;
public Text bgmByValue;
public Button cardLanguage;
public Text cardLanguageValue;
public Button language;
......@@ -212,6 +214,7 @@ namespace MDPro3
language.onClick.AddListener(OnLanguageChange);
confirm.onClick.AddListener(OnConfirmClicked);
autoRPS.onClick.AddListener(OnAutoRPS);
bgmBy.onClick.AddListener(OnBgmByClicked);
duelAppearance.onClick.AddListener(OnDuelAppearcanceClick);
watchAppearance.onClick.AddListener(OnWatchAppearcanceClick);
......@@ -323,6 +326,7 @@ namespace MDPro3
InitializeCardLanguage();
InitializeLanguage();
InitializeSwitches();
InitializeBgmBy();
}
public override void Show(int preDepth)
......@@ -902,6 +906,31 @@ namespace MDPro3
}
}
public void InitializeBgmBy()
{
var value = Config.GetBool("BGMbyMySide", true);
if (value)
bgmByValue.text = InterString.Get("我方");
else
bgmByValue.text = InterString.Get("对方");
}
public void OnBgmByClicked()
{
var value = Config.GetBool("BGMbyMySide", true);
if (value)
{
bgmByValue.text = InterString.Get("对方");
Config.SetBool("BGMbyMySide", false);
}
else
{
bgmByValue.text = InterString.Get("我方");
Config.SetBool("BGMbyMySide", true);
}
}
public void OnAutoRPS()
{
if (autoRPSValue.text == InterString.Get("关"))
......
Assets/Scripts/MDPro3/UI/New UI/UIEventWithAudio.cs
View file @ 3dc972d7
......@@ -36,12 +36,12 @@ namespace MDPro3.UI
private void PlayAudio(string path)
{
if (path == "")
if (string.IsNullOrEmpty(path))
return;
if (audioType == AudioType.SE)
AudioManager.PlaySE(path);
else if (audioType == AudioType.Voice)
AudioManager.PlayVoiceByPath(path);
AudioManager.PlayVoiceByResourcePath(path);
}
}
......
Data/locales/zh-CN/translation.conf
View file @ 3dc972d7
......@@ -639,3 +639,6 @@ YDK 内容不合法，主卡组必须满 40 张->YDK 内容不合法，主卡组
自定义游戏->自定义游戏
检测到新版先行卡，请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。->检测到新版先行卡，请至 [游戏设置]-[扩展卡包]-[更新先行卡] 处进行更新。
SMAA High->SMAA High
决斗场地背景音乐->决斗场地背景音乐
场地背景音乐->场地背景音乐
场地背景音乐由哪方决定->场地背景音乐由哪方决定
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