diff --git a/Assets/ManagedResources/Prefabs/Battle/Map2.prefab b/Assets/ManagedResources/Prefabs/Battle/Map2.prefab index 8bde260cc3..4fc912900e 100644 --- a/Assets/ManagedResources/Prefabs/Battle/Map2.prefab +++ b/Assets/ManagedResources/Prefabs/Battle/Map2.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1887536622553139911} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 1.66, y: 4.16, z: 0} + m_LocalPosition: {x: 1.66, y: 4.16, z: -2.46} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -4724,7 +4724,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3066785958172314607} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 0, y: 1.49, z: 9.52} + m_LocalPosition: {x: 0, y: 1.49, z: 7.0600004} m_LocalScale: {x: 31.869398, y: 6.1044626, z: 11.447266} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -4801,7 +4801,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3066785958559253650} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 0, y: 0.87, z: 5.08} + m_LocalPosition: {x: 0, y: 0.87, z: 2.62} m_LocalScale: {x: 35, y: 2.901878, z: 5.3919} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -4878,7 +4878,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3066785958571888090} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 0, y: 2.630001, z: 5.4800034} + m_LocalPosition: {x: 0, y: 2.630001, z: 3.0200033} m_LocalScale: {x: 25, y: 6.309777, z: 5.3919} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -4955,7 +4955,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3066785958577951449} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 0, y: -0.8, z: 15.47} + m_LocalPosition: {x: 0, y: -0.8, z: 13.01} m_LocalScale: {x: 29.873922, y: 3.439295, z: 10.730506} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -5032,7 +5032,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3066785958658542066} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 0, y: 1.9342003, z: 5.078003} + m_LocalPosition: {x: 0, y: 1.9342003, z: 2.618003} m_LocalScale: {x: 25, y: 5.141837, z: 5.3919} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -5109,7 +5109,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3066785959919920074} m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} - m_LocalPosition: {x: 0, y: -2.8, z: 25.4} + m_LocalPosition: {x: 0, y: -2.8, z: 22.939999} m_LocalScale: {x: 31.599789, y: 26.110092, z: 23.26913} m_Children: [] m_Father: {fileID: 7064588598017826166} @@ -5186,7 +5186,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4311803956719228985} m_LocalRotation: {x: -0.000000030908623, y: -0.7071068, z: -0.7071068, w: 0.000000030908623} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.46} m_LocalScale: {x: 2.5, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7064588598017826166} diff --git a/Assets/ManagedResources/Prefabs/Battle/Map6.prefab b/Assets/ManagedResources/Prefabs/Battle/Map6.prefab index 347c267c24..8919eb7678 100644 --- a/Assets/ManagedResources/Prefabs/Battle/Map6.prefab +++ b/Assets/ManagedResources/Prefabs/Battle/Map6.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497088} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -103,7 +103,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497090} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -180,7 +180,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497092} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -257,7 +257,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497094} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -334,7 +334,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497096} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -411,7 +411,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497098} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -529,7 +529,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497110} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -606,7 +606,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497112} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -683,7 +683,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497114} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -760,7 +760,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497116} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} @@ -837,7 +837,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6196905447429497118} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: -0, y: 2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6196905447429012782} diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua index 9296a51ed4..0344bb14a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua @@ -22,6 +22,10 @@ function this:InitComponent() orginLayer = 0 this.BG = Util.GetGameObject(self.gameObject, "BG") + this.RawBG = Util.GetGameObject(self.gameObject, "RawImage"):GetComponent("RawImage") + local battleCamera = Util.GetGameObject(self.battleSceneGameObject, "CameraRoot/CameraPos/Camera"):GetComponent( + "Camera") + battleCamera.targetTexture = this.RawBG.texture this.UpRoot = Util.GetGameObject(self.gameObject, "UpRoot") this.Option = Util.GetGameObject(this.UpRoot, "option") @@ -259,6 +263,16 @@ end function this:OnDestroy() BattleView:OnDestroy() this.spLoader:Destroy() + --销毁战场 + if this.battleSceneLogicGameObject ~= nil then + GameObject.Destroy(this.battleSceneLogicGameObject) + this.battleSceneLogicGameObject = nil + end + + if this.battleSceneGameObject ~= nil then + GameObject.Destroy(this.battleSceneGameObject) + this.battleSceneGameObject = nil + end end return GuideBattlePanel