From ae706c75d14d0a29fc0ee20467b4d72f094eac76 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 23 十月 2025 11:51:41 +0800
Subject: [PATCH] 125 战斗 战斗层级变更
---
BuiltIn/Prefabs/UIRoot.prefab | 2
Battle/Prefabs/BattleRootNode.prefab | 98 ++++++++++++++++++++++--
UI/StoryBossBattleWin.prefab | 110 +++++++++++----------------
3 files changed, 133 insertions(+), 77 deletions(-)
diff --git a/Battle/Prefabs/BattleRootNode.prefab b/Battle/Prefabs/BattleRootNode.prefab
index cca4607..dd380a5 100644
--- a/Battle/Prefabs/BattleRootNode.prefab
+++ b/Battle/Prefabs/BattleRootNode.prefab
@@ -321,7 +321,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 5056809326870738701}
+ - {fileID: 1252616454279781821}
- {fileID: 6601719774650107310}
- {fileID: 2775740563243893854}
- {fileID: 6335577651418102169}
@@ -355,8 +355,9 @@
battleNode: {fileID: 6335577651418102169}
battleNodePos1: {fileID: 4967262652072425624}
battleNodePos2: {fileID: 541575910266420155}
- rendererAdjuster: {fileID: 3272286357575029464}
- battleStartAdjuster: {fileID: 4909480092527576182}
+ skillMaskAdjuster: {fileID: 3272286357575029464}
+ battleStartAdjuster: {fileID: 8193497641100769921}
+ backgroundAdjuster: {fileID: 2763837602030351588}
skillBackNode: {fileID: 175482138899157131}
skillFrontNode: {fileID: 8080636801987895324}
skillMaskNode: {fileID: 4095416971228565534}
@@ -678,12 +679,12 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4908274161673223518}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: 2610348819904339951}
+ m_Father: {fileID: 1252616454279781821}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -881,8 +882,8 @@
serializedVersion: 6
m_Component:
- component: {fileID: 5457806422418689570}
- - component: {fileID: 4611239464031536639}
- - component: {fileID: 4909480092527576182}
+ - component: {fileID: 8849348478469341179}
+ - component: {fileID: 8193497641100769921}
m_Layer: 5
m_Name: BattleStartNode
m_TagString: Untagged
@@ -913,7 +914,7 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &4611239464031536639
+--- !u!223 &8849348478469341179
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -931,12 +932,12 @@
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
- m_AdditionalShaderChannelsFlag: 0
+ m_AdditionalShaderChannelsFlag: -1
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
---- !u!114 &4909480092527576182
+--- !u!114 &8193497641100769921
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1576,3 +1577,80 @@
m_AnchoredPosition: {x: 0, y: 180}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8861651120425948290
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1252616454279781821}
+ - component: {fileID: 6968603263242989935}
+ - component: {fileID: 2763837602030351588}
+ m_Layer: 5
+ m_Name: BgContainer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1252616454279781821
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8861651120425948290}
+ 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: 5056809326870738701}
+ m_Father: {fileID: 2610348819904339951}
+ 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!223 &6968603263242989935
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8861651120425948290}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_VertexColorAlwaysGammaSpace: 0
+ m_AdditionalShaderChannelsFlag: -1
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &2763837602030351588
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8861651120425948290}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 75517d945fb16024d9ab09ca21288a01, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ sortingOrder: 0
+ customSortingLayer: UI
+ renderers: []
+ canvasOffset: 1
diff --git a/BuiltIn/Prefabs/UIRoot.prefab b/BuiltIn/Prefabs/UIRoot.prefab
index 5d54fb9..80a81dc 100644
--- a/BuiltIn/Prefabs/UIRoot.prefab
+++ b/BuiltIn/Prefabs/UIRoot.prefab
@@ -250,7 +250,7 @@
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
- m_SortingOrder: 0
+ m_SortingOrder: -100
m_TargetDisplay: 0
--- !u!114 &4794437089932782112
MonoBehaviour:
diff --git a/UI/StoryBossBattleWin.prefab b/UI/StoryBossBattleWin.prefab
index 600208d..0f04a33 100644
--- a/UI/StoryBossBattleWin.prefab
+++ b/UI/StoryBossBattleWin.prefab
@@ -5092,8 +5092,7 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 283350275927264382}
- - {fileID: 4699143017626069204}
- - {fileID: 4270962903487703275}
+ - {fileID: 7597145194114994779}
m_Father: {fileID: 6596073646348987259}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -8860,7 +8859,8 @@
textSpeed: {fileID: 3753605132909972506}
btnPass: {fileID: 7520516383119463704}
btnPause: {fileID: 1756463565233016470}
- buttonsAdjuster: {fileID: 3852890186370681495}
+ skillTipsAdjuster: {fileID: 0}
+ buttonsAdjuster: {fileID: 0}
bossLifeBar: {fileID: 6310558442968886447}
skillWordCells:
- {fileID: 3692737166798524015}
@@ -9492,9 +9492,6 @@
serializedVersion: 6
m_Component:
- component: {fileID: 283350275927264382}
- - component: {fileID: 5557276675822703764}
- - component: {fileID: 3852890186370681495}
- - component: {fileID: 3782753990768723671}
m_Layer: 5
m_Name: Buttons
m_TagString: Untagged
@@ -9524,62 +9521,6 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &5557276675822703764
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6586386302205870154}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 2
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 1
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_VertexColorAlwaysGammaSpace: 0
- m_AdditionalShaderChannelsFlag: -1
- m_UpdateRectTransformForStandalone: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!114 &3852890186370681495
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6586386302205870154}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 75517d945fb16024d9ab09ca21288a01, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- sortingOrder: 0
- customSortingLayer: UI
- renderers: []
- canvasOffset: 2
---- !u!114 &3782753990768723671
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6586386302205870154}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
--- !u!1 &6837463614546730677
GameObject:
m_ObjectHideFlags: 0
@@ -10822,7 +10763,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7688634974736881974}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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
@@ -10830,7 +10771,7 @@
- {fileID: 2631269395869754527}
- {fileID: 6591462368546782204}
- {fileID: 7127609221603993553}
- m_Father: {fileID: 5215487054184206767}
+ m_Father: {fileID: 7597145194114994779}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10988,7 +10929,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7797410624637415741}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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
@@ -10996,7 +10937,7 @@
- {fileID: 7492407839254666015}
- {fileID: 2202127067376319791}
- {fileID: 3037691105356819223}
- m_Father: {fileID: 5215487054184206767}
+ m_Father: {fileID: 7597145194114994779}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12044,6 +11985,43 @@
m_AnchoredPosition: {x: -74, y: -80.5}
m_SizeDelta: {x: 116, y: 27}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8493077929900256324
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7597145194114994779}
+ m_Layer: 5
+ m_Name: SkillTips
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7597145194114994779
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8493077929900256324}
+ 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: 4699143017626069204}
+ - {fileID: 4270962903487703275}
+ m_Father: {fileID: 5215487054184206767}
+ 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 &8503027319672868956
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0