Forráskód Böngészése

添加刘海屏适配

lzx 1 napja
szülő
commit
b55c82c425

+ 17 - 1
Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -262,6 +262,7 @@ GameObject:
   - component: {fileID: 4251176618484867663}
   - component: {fileID: 7108258747564116440}
   - component: {fileID: 9137017659689659031}
+  - component: {fileID: 7933938423984907002}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -341,6 +342,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7933938423984907002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1947865541254548843
 GameObject:
   m_ObjectHideFlags: 0
@@ -778,7 +794,7 @@ RectTransform:
   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: 750, y: 1624}
+  m_SizeDelta: {x: 1125, y: 2436}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7203008914783957009
 CanvasRenderer:

+ 17 - 1
Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -459,7 +459,7 @@ RectTransform:
   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: 1500, y: 3248}
+  m_SizeDelta: {x: 898, y: 1944}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -1196,6 +1196,7 @@ GameObject:
   - component: {fileID: 3637005864510300227}
   - component: {fileID: 5727746862753107768}
   - component: {fileID: 7009910568533120546}
+  - component: {fileID: 3054755758390033935}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1278,6 +1279,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10151
+--- !u!114 &3054755758390033935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &4063004393881817651
 GameObject:
   m_ObjectHideFlags: 0

+ 53 - 5
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1053,6 +1053,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1798015912972164048}
   - component: {fileID: 5298345569981142061}
+  - component: {fileID: 7484319669545627100}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: PlayerInfo
@@ -1076,10 +1077,10 @@ RectTransform:
   - {fileID: 7383390820428798537}
   m_Father: {fileID: 9037135992368401232}
   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: 63.271}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -220, y: 0}
+  m_SizeDelta: {x: 440, y: 63.271}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5298345569981142061
 CanvasRenderer:
@@ -1089,6 +1090,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1760937640502948944}
   m_CullTransparentMesh: 1
+--- !u!114 &7484319669545627100
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760937640502948944}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1843990269898586624
 GameObject:
   m_ObjectHideFlags: 0
@@ -1324,6 +1340,7 @@ GameObject:
   - component: {fileID: 6261009774886538096}
   - component: {fileID: 3656203349713481960}
   - component: {fileID: 4472099066628972237}
+  - component: {fileID: 6709258874224180911}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn1_Map
@@ -1460,6 +1477,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &6709258874224180911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956023067385650890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &2067316311261386271
 GameObject:
   m_ObjectHideFlags: 0
@@ -5088,6 +5120,7 @@ GameObject:
   - component: {fileID: 8753960067471709537}
   - component: {fileID: 8766683629811078357}
   - component: {fileID: 7489813112688999977}
+  - component: {fileID: 3102808955735513020}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Daoyou
@@ -5224,6 +5257,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &3102808955735513020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8816327462997807595}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0
@@ -5345,7 +5393,7 @@ RectTransform:
   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: 750, y: 1624}
+  m_SizeDelta: {x: 439, y: 951}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 1 - 1
Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,7 @@ RectTransform:
   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: 750, y: 1624}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 17 - 1
Assets/Res/UI/SentimentPanel/SentimentPanel.prefab

@@ -356,6 +356,7 @@ GameObject:
   - component: {fileID: 8433458334176511681}
   - component: {fileID: 4170656597210444513}
   - component: {fileID: 4909662600279504468}
+  - component: {fileID: 8077185464686204676}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -435,6 +436,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8077185464686204676
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &5692448650326671997
 GameObject:
   m_ObjectHideFlags: 0
@@ -749,7 +765,7 @@ RectTransform:
   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: 1200, y: 2670}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 2 - 1
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -120,6 +120,7 @@ namespace Fort23.Mono
                     //小突破
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {
+                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
                         var heroAttributData =
                             HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, heroInfo);
                         PlayerManager.Instance.myHero.Upgrade();
@@ -156,7 +157,7 @@ namespace Fort23.Mono
                         await heroBreakthroughSuccessPanel.UIClosed();
 
 
-                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
+                      
                     }
                     //大突破
                     else