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

Storage/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -35,6 +35,7 @@ public class BattleUI : MonoBehaviour
     public GameObject m_successResultMaskObj;//胜利结算maskobj
     public GameObject m_ShowMouseObj;//显示手指图标obj
     public GameObject m_HideMouseObj;//隐藏手指图标obj
+    public GameObject m_ChangeBgColorObj;//更换背景颜色obj
     public GameObject[] m_boomUIS;//爆炸Ui
     public Button m_boomBtn;//炸弹按钮
     public GameObject m_symbolObj;//十字架图标
@@ -54,6 +55,11 @@ public class BattleUI : MonoBehaviour
     private bool m_bResult = false;//结果
     private bool m_bIsDebug = false;//是否开启调试模式
     public bool isDebug => m_bIsDebug;
+    private Color m_blueBgColor = Color.blue;
+    private Color m_greenBgColor = Color.green;
+    private Color m_pinkBgColor = new Color(1, 228.0f / 255.0f, 235.0f / 255.0f, 1.0f);
+    private Color m_orangeBgColor = new Color(241.0f/255.0f,145.0f/255.0f,0,1.0f);
+    private int m_colorIndex = 0;
     public bool IsLeftEmtryBomb { get { return m_bombIndex >= 3; } }//是否不剩炸弹了
     public bool IsBombButtonCanInteractable { get { return m_boomBtn.interactable; } }
     void Awake()
@@ -282,6 +288,7 @@ public class BattleUI : MonoBehaviour
         //m_successResultMaskObj.SetActive(!bool_);
         //m_ShowMouseObj.SetActive(!bool_);
         //m_HideMouseObj.SetActive(!bool_);
+        m_ChangeBgColorObj.SetActive(!bool_);
     }
     //设置手势位置
     public void SetMousePos(float x,float y)
@@ -307,6 +314,32 @@ public class BattleUI : MonoBehaviour
         m_HideMouseObj.SetActive(false);
         m_bIsShowMouse = false;
     }
+    //更换背景颜色按钮
+    public void ChangeBgColorBtn()
+    {
+        Camera varCamera = Camera.main;
+        if(m_colorIndex == 0)
+        {
+            varCamera.backgroundColor = m_blueBgColor;
+        }
+        else if(m_colorIndex == 1)
+        {
+            varCamera.backgroundColor = m_greenBgColor;
+        }
+        else if (m_colorIndex == 2)
+        {
+            varCamera.backgroundColor = m_pinkBgColor;
+        }
+        else if (m_colorIndex == 3)
+        {
+            varCamera.backgroundColor = m_orangeBgColor;
+        }
+        m_colorIndex++;
+        if (m_colorIndex % 4 == 0)
+        {
+            m_colorIndex = 0;
+        }
+    }
     //设置炸弹
     public void SetBomb()
     {

Storage/Assets/#A3_Prefabs/BattleUI.prefab

@@ -8856,6 +8856,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Button
+--- !u!1 &4839385671503273097
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3940906887395351743}
+  - component: {fileID: 2929133535498386407}
+  - component: {fileID: 6511880685085054443}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3940906887395351743
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4839385671503273097}
+  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: 7791812015510660763}
+  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: 0}
+  m_SizeDelta: {x: 270.7, y: 304.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2929133535498386407
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4839385671503273097}
+  m_CullTransparentMesh: 0
+--- !u!114 &6511880685085054443
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4839385671503273097}
+  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.5754717, g: 0.5727572, b: 0.5727572, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
+    m_FontSize: 60
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 300
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: color
 --- !u!1 &4884304546091204745
 GameObject:
   m_ObjectHideFlags: 0
@@ -11748,6 +11826,7 @@ RectTransform:
   - {fileID: 9048927093243070911}
   - {fileID: 824464444758788978}
   - {fileID: 7859706533838850162}
+  - {fileID: 7791812015510660763}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11856,6 +11935,7 @@ MonoBehaviour:
   m_successResultMaskObj: {fileID: 5927221786089016403}
   m_ShowMouseObj: {fileID: 647498885}
   m_HideMouseObj: {fileID: 8052859672645981793}
+  m_ChangeBgColorObj: {fileID: 6729869204294635771}
   m_boomUIS:
   - {fileID: 5669112702353908132}
   - {fileID: 9114938694515689495}
@@ -13093,6 +13173,136 @@ MonoBehaviour:
   m_Text: 'BGM
 
 '
+--- !u!1 &6729869204294635771
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7791812015510660763}
+  - component: {fileID: 4238842729869115368}
+  - component: {fileID: 6402754339467809880}
+  - component: {fileID: 2687314953228717768}
+  m_Layer: 5
+  m_Name: ChangeBgColorBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7791812015510660763
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6729869204294635771}
+  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: 3940906887395351743}
+  m_Father: {fileID: 6064464677632144690}
+  m_RootOrder: 15
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -50, y: -50}
+  m_SizeDelta: {x: 220, y: 234}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &4238842729869115368
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6729869204294635771}
+  m_CullTransparentMesh: 0
+--- !u!114 &6402754339467809880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6729869204294635771}
+  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: 03b62a6533b97bf428f151a5820f3ec4, 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!114 &2687314953228717768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6729869204294635771}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 6402754339467809880}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 6064464677632144694}
+        m_MethodName: ChangeBgColorBtn
+        m_Mode: 1
+        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!1 &6928916565205648858
 GameObject:
   m_ObjectHideFlags: 0

Storage/ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: Dyspace
-  productName: Storage
+  productName: Storage Master 3D
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -163,7 +163,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.Dyspace.Storage
+    Android: com.mspo.mstorage
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 19