Merge remote-tracking branch 'origin/master' into YuYang

FastMail/Assets/0A1_Scenes/DemoScenes.unity

@@ -228,43 +228,6 @@ MonoBehaviour:
   - {fileID: 7703634908436291340, guid: d401dcdc19f88dc4e8061a5298678a95, type: 3}
   - {fileID: 5193473676709483997, guid: 1de93096a4f39384188ac6f9255d30c6, type: 3}
   - {fileID: 3549603769035422718, guid: 8b2b005692936564e83248fd253a2861, type: 3}
---- !u!1 &583032563
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 583032564}
-  m_Layer: 5
-  m_Name: Setting
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &583032564
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 583032563}
-  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: 822756101}
-  - {fileID: 1811439588}
-  m_Father: {fileID: 4450358041612225942}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &707446923
 GameObject:
   m_ObjectHideFlags: 0
@@ -296,7 +259,7 @@ Transform:
   - {fileID: 1872965181}
   - {fileID: 186647395}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &707446925
 MonoBehaviour:
@@ -310,236 +273,38 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eac3ab1cd8d56dc4fb10ca3966649e25, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  battleUI: {fileID: 8825948266311990946}
+  battleUI: {fileID: 8344528902126245600}
   m_levelManager: {fileID: 186647396}
---- !u!1 &822756100
+--- !u!1 &1859283441
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_PrefabInstance: {fileID: 44176021}
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 822756101}
-  - component: {fileID: 822756103}
-  - component: {fileID: 822756102}
-  m_Layer: 5
-  m_Name: Image
+  - component: {fileID: 1859283442}
+  m_Layer: 0
+  m_Name: TinySauce (Missing Prefab)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &822756101
-RectTransform:
+--- !u!4 &1859283442
+Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_PrefabInstance: {fileID: 44176021}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 822756100}
+  m_GameObject: {fileID: 1859283441}
   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: 1930907542}
-  m_Father: {fileID: 583032564}
-  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: 700, y: 700}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &822756102
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 822756100}
-  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_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e3fa2e4a04010fa40b6229dcd1645929, 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 &822756103
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 822756100}
-  m_CullTransparentMesh: 0
---- !u!1 &1427783556
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1427783557}
-  - component: {fileID: 1427783559}
-  - component: {fileID: 1427783558}
-  m_Layer: 5
-  m_Name: Text (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1427783557
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1427783556}
-  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: 1811439588}
+  m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -315, y: -8}
-  m_SizeDelta: {x: 500, y: 80.56}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1427783558
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1427783556}
-  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.41509432, g: 0.41509432, b: 0.41509432, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
-    m_FontSize: 74
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 5
-    m_MaxSize: 76
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: VIBRATION
---- !u!222 &1427783559
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1427783556}
-  m_CullTransparentMesh: 0
---- !u!1 &1811439587
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1811439588}
-  - component: {fileID: 1811439590}
-  - component: {fileID: 1811439589}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1811439588
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1811439587}
-  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: 1427783557}
-  m_Father: {fileID: 583032564}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 225, y: 174}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1811439589
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1811439587}
-  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: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d438d7dfdc9501b4db48485eba0a4ef3, 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 &1811439590
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1811439587}
-  m_CullTransparentMesh: 0
 --- !u!1 &1872965180
 GameObject:
   m_ObjectHideFlags: 0
@@ -584,8 +349,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 65d718b4fac224944ad7728793e3fdc7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  pad: {fileID: 8825948267100604669}
-  joyStick: {fileID: 3338679503344492232}
+  pad: {fileID: 8344528901304131775}
+  joyStick: {fileID: 2874693686150493834}
 --- !u!114 &1872965183
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -598,231 +363,49 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff376a18ea419e546ba78667f1b5c6b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1930907541
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1930907542}
-  - component: {fileID: 1930907544}
-  - component: {fileID: 1930907543}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1930907542
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1930907541}
-  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: 822756101}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 313}
-  m_SizeDelta: {x: 411.9, y: 80.56}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1930907543
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1930907541}
-  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: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
-    m_FontSize: 74
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 5
-    m_MaxSize: 76
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: SETTING
---- !u!222 &1930907544
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1930907541}
-  m_CullTransparentMesh: 0
---- !u!1 &2041063827
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2041063828}
-  - component: {fileID: 2041063831}
-  - component: {fileID: 2041063830}
-  - component: {fileID: 2041063829}
-  m_Layer: 5
-  m_Name: SettingBtn
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2041063828
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2041063827}
-  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: 4450358041612225943}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 129, y: -133}
-  m_SizeDelta: {x: 180, y: 180}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2041063829
+--- !u!114 &2874693686150493834 stripped
 MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 1259541852, guid: 919382978f5e2684ba83e6daf6491458,
+    type: 3}
+  m_PrefabInstance: {fileID: 8990117750319156764}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2041063827}
+  m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Script: {fileID: 11500000, guid: c26c7a0dcd8138d4194e0a4435a4740c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    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: 2041063830}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &2041063830
+--- !u!114 &8344528901304131775 stripped
 MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
+    type: 3}
+  m_PrefabInstance: {fileID: 8990117750319156764}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2041063827}
+  m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: f18c148d709481248b386c10e695e1ed, 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 &2041063831
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2041063827}
-  m_CullTransparentMesh: 0
---- !u!114 &3338679503344492232 stripped
+--- !u!114 &8344528902126245600 stripped
 MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1259541852, guid: 919382978f5e2684ba83e6daf6491458,
+  m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
     type: 3}
-  m_PrefabInstance: {fileID: 4450358041612225941}
+  m_PrefabInstance: {fileID: 8990117750319156764}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c26c7a0dcd8138d4194e0a4435a4740c, type: 3}
+  m_Script: {fileID: 11500000, guid: 719c0ad6d83af074a83455f6c88d41e0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &4450358041612225941
+--- !u!1001 &8990117750319156764
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4852413556718236688, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 6064464676328073066, guid: 919382978f5e2684ba83e6daf6491458,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
         type: 3}
       propertyPath: m_Name
@@ -866,7 +449,7 @@ PrefabInstance:
     - target: {fileID: 6064464677632144690, guid: 919382978f5e2684ba83e6daf6491458,
         type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6064464677632144690, guid: 919382978f5e2684ba83e6daf6491458,
         type: 3}
@@ -935,39 +518,3 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
---- !u!224 &4450358041612225942 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6064464677632144690, guid: 919382978f5e2684ba83e6daf6491458,
-    type: 3}
-  m_PrefabInstance: {fileID: 4450358041612225941}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &4450358041612225943 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 767122297, guid: 919382978f5e2684ba83e6daf6491458,
-    type: 3}
-  m_PrefabInstance: {fileID: 4450358041612225941}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &8825948266311990946 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
-    type: 3}
-  m_PrefabInstance: {fileID: 4450358041612225941}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 719c0ad6d83af074a83455f6c88d41e0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &8825948267100604669 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6064464676810081129, guid: 919382978f5e2684ba83e6daf6491458,
-    type: 3}
-  m_PrefabInstance: {fileID: 4450358041612225941}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e3ca8d9f66bfdf4da1bfb54682c658b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 

FastMail/Assets/0A2_Scripts/Battle/UI/SettingPanel.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class SettingPanel : MonoBehaviour
+{
+    public Button m_vibrationBtn;//震动按钮
+    public Button m_soundBtn;//音效按钮
+    public Button m_bgmBtn;//背景音乐按钮
+    public GameObject m_vibrationImageObj;//震动✔
+    public GameObject m_soundImageObj;//音效✔
+    public GameObject m_bgmImageObj;//背景音乐✔
+    private void Awake()
+    {
+        m_vibrationBtn.onClick.AddListener(OnVibrationClick);
+        m_soundBtn.onClick.AddListener(OnSoundClick);
+        m_bgmBtn.onClick.AddListener(OnBgmClick);
+    }
+    private void Start()
+    {
+        string varStr1 = GlobalConfig.VibrationKey;
+        if (LocalRecord.HasKey(varStr1))
+        {
+            m_vibrationImageObj.SetActive(LocalRecord.GetIntRecord(varStr1) > 0 ? true : false);
+        }
+        else
+        {
+            m_vibrationImageObj.SetActive(true);
+        }
+        string varStr2 = GlobalConfig.SoundKey;
+        if (LocalRecord.HasKey(varStr2))
+        {
+            m_soundImageObj.SetActive(LocalRecord.GetIntRecord(varStr2) > 0 ? true : false);
+        }
+        else
+        {
+            m_soundImageObj.SetActive(true);
+        }
+        string varStr3 = GlobalConfig.BgmKey;
+        if (LocalRecord.HasKey(varStr3))
+        {
+            m_bgmImageObj.SetActive(LocalRecord.GetIntRecord(varStr3) > 0 ? true : false);
+        }
+        else
+        {
+            m_bgmImageObj.SetActive(true);
+        }
+    }
+    //震动
+    void OnVibrationClick()
+    {
+        bool varBool = m_vibrationImageObj.activeSelf;
+        m_vibrationImageObj.SetActive(!varBool);
+        LocalRecord.SetIntRecord(GlobalConfig.VibrationKey, varBool ? 0 : 1);
+    }
+    //音效
+    void OnSoundClick()
+    {
+        bool varBool = m_soundImageObj.activeSelf;
+        m_soundImageObj.SetActive(!varBool);
+        LocalRecord.SetIntRecord(GlobalConfig.SoundKey, varBool ? 0 : 1);
+    }
+    //背景音乐
+    void OnBgmClick()
+    {
+        bool varBool = m_bgmImageObj.activeSelf;
+        m_bgmImageObj.SetActive(!varBool);
+        LocalRecord.SetIntRecord(GlobalConfig.BgmKey, varBool ? 0 : 1);
+        if(varBool)
+        {
+            GameServices.audioServices.RecycleBgm();
+        }
+        else
+        {
+            GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
+        }
+    }
+    public void OnCloseClick()
+    {
+        gameObject.SetActive(false);
+        BattleCtrl.instance.battleUI.SetBattleObjState(true);
+    }
+}

FastMail/Assets/0A2_Scripts/Battle/UI/SettingPanel.cs.meta

+fileFormatVersion: 2
+guid: 86d1c03e5362d0d44ab2d6e6ca6418f5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FastMail/Assets/0A2_Scripts/Battle/View/ChainRopeView.cs

@@ -71,7 +71,6 @@ public class ChainRopeView : MonoBehaviour
     private Outlinable m_outlinable;//插件脚本
     private bool m_bIsClawUp = false;//是否爪子在上升
     private AudioSource m_clawDownOrUpAudioSource;//下降上升音乐，需要循环播放
-    private bool m_bControlClawDownOrUpAudio = true;//控制音效
     
     void Awake()
     {
@@ -228,7 +227,6 @@ public class ChainRopeView : MonoBehaviour
         {
             return;
         }
-        m_bControlClawDownOrUpAudio = true;
         m_clawDownOrUpAudioSource = GameServices.audioServices.GetPlayAudioSource(GameServices.configService.audioConfig.clawDownOrUp);
         //第五关特殊处理
         //if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
@@ -560,9 +558,8 @@ public class ChainRopeView : MonoBehaviour
                     }
                     else
                     {
-                        if (m_bControlClawDownOrUpAudio)
+                        if (m_clawDownOrUpAudioSource)
                         {
-                            m_bControlClawDownOrUpAudio = false;
                             GameServices.audioServices.AudioPlayFinished(m_clawDownOrUpAudioSource);
                             m_clawDownOrUpAudioSource = null;
                         }
@@ -590,9 +587,8 @@ public class ChainRopeView : MonoBehaviour
                     else
                     {
                         SetJoyStickDirectTrans(m_topCollider.transform);
-                        if (m_bControlClawDownOrUpAudio)
+                        if (m_clawDownOrUpAudioSource)
                         {
-                            m_bControlClawDownOrUpAudio = false;
                             GameServices.audioServices.AudioPlayFinished(m_clawDownOrUpAudioSource);
                             m_clawDownOrUpAudioSource = null;
                         }
@@ -634,9 +630,8 @@ public class ChainRopeView : MonoBehaviour
                     }
                     else
                     {
-                        if (m_bControlClawDownOrUpAudio)
+                        if (m_clawDownOrUpAudioSource)
                         {
-                            m_bControlClawDownOrUpAudio = false;
                             GameServices.audioServices.AudioPlayFinished(m_clawDownOrUpAudioSource);
                             m_clawDownOrUpAudioSource = null;
                         }

FastMail/Assets/0A2_Scripts/Services/AudioServices.cs

@@ -63,6 +63,10 @@ public class AudioServices : MonoBehaviour
 
     public void PlayBgm(AudioClip clip)
     {
+        if(LocalRecord.HasKey(GlobalConfig.BgmKey) && LocalRecord.GetIntRecord(GlobalConfig.BgmKey) == 0)
+        {
+            return;
+        }
         if (bgmSource == null)
         {
             bgmSource = GetSource();
@@ -75,9 +79,22 @@ public class AudioServices : MonoBehaviour
 
         bgmSource.Play();
     }
+    //释放背景音乐
+    public void RecycleBgm()
+    {
+        if(bgmSource)
+        {
+            RecycleSource(bgmSource);
+            bgmSource = null;
+        }
+    }
 
     public void PlayAudio(AudioClip clip, bool isLoop = false, Action onPlayEnd = null)
     {
+        if (LocalRecord.HasKey(GlobalConfig.SoundKey) && LocalRecord.GetIntRecord(GlobalConfig.SoundKey) == 0)
+        {
+            return;
+        }
         AudioSource source = GetSource();
         source.clip = clip;
         source.loop = isLoop;
@@ -91,6 +108,10 @@ public class AudioServices : MonoBehaviour
     }
     public AudioSource GetPlayAudioSource(AudioClip clip)
     {
+        if (LocalRecord.HasKey(GlobalConfig.SoundKey) && LocalRecord.GetIntRecord(GlobalConfig.SoundKey) == 0)
+        {
+            return null;
+        }
         AudioSource source = GetSource();
         source.clip = clip;
         source.loop = true;
@@ -101,6 +122,10 @@ public class AudioServices : MonoBehaviour
 
     public void AudioPlayFinished(AudioSource source)
     {
+        if (LocalRecord.HasKey(GlobalConfig.SoundKey) && LocalRecord.GetIntRecord(GlobalConfig.SoundKey) == 0)
+        {
+            return;
+        }
         RecycleSource(source);
     }
 

FastMail/Assets/0A2_Scripts/Services/GlobalConfig.cs

@@ -22,6 +22,9 @@ public class GlobalConfig
     /// 语言类型
     /// </summary>
     public static LangeType langType;
+    public static string VibrationKey = "VibrationKey";//震动Key
+    public static string SoundKey = "SoundKey";//音效Key
+    public static string BgmKey = "BgmKey";//音乐Key
 }
 
 public enum LangeType

FastMail/Assets/Resources/BattleConfig.asset

@@ -36,14 +36,9 @@ MonoBehaviour:
     fifthLevelGoalName3: SM_Primitive_Sphere_02
     sixthLevelGoalName: SM_Primitive_Pyramid_01
   audioConfig:
-    pienDeads: []
-    win: {fileID: 0}
-    fail: {fileID: 0}
-    shoot: {fileID: 0}
-    ElevatorOpen: {fileID: 0}
-    keyPick: {fileID: 0}
-    GameBgm: {fileID: 0}
-    npcRescue: {fileID: 0}
-    npc2pien: {fileID: 0}
-    gunPick: {fileID: 0}
-    girlScream: {fileID: 0}
+    failList:
+    - {fileID: 8300000, guid: 03522ac8d99167f45ac598927093c79e, type: 3}
+    - {fileID: 8300000, guid: 18755c9489da3654db451b917f8ecd81, type: 3}
+    GameBgm: {fileID: 8300000, guid: 75b73601c36cb92418c2f0e6a18de5e2, type: 3}
+    Success: {fileID: 8300000, guid: a4fa2dc9fd619ef4a965de465f1586dc, type: 3}
+    clawDownOrUp: {fileID: 8300000, guid: f582290ca8df575409f8f5868dbeb6c6, type: 3}