From a0d7e22ce8543d5a361d2ee181abdee915fd0495 Mon Sep 17 00:00:00 2001 From: GL <2365963573@qq.com> Date: Thu, 21 Nov 2024 12:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=9C=97=E7=89=9B=E7=9A=84?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/Battle_Royale.unity | 342 +++--------------- TheStrongestSnail/Assets/Scenes/logo.unity | 2 +- .../Scripts/Battle_Royale/AllHouseContro.cs | 25 +- .../Assets/Scripts/Battle_Royale/Allother.cs | 63 +++- .../Scripts/Battle_Royale/BossContro.cs | 4 +- .../Assets/Scripts/Battle_Royale/OtherMove.cs | 46 ++- .../Assets/Scripts/otherWoniu.cs | 18 +- 7 files changed, 170 insertions(+), 330 deletions(-) diff --git a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity index 9e16243..d7024fe 100644 --- a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity +++ b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity @@ -967,7 +967,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &74076850 RectTransform: m_ObjectHideFlags: 0 @@ -1000,23 +1000,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &74076852 Animator: serializedVersion: 5 @@ -1693,7 +1678,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &135970890 RectTransform: m_ObjectHideFlags: 0 @@ -1726,23 +1711,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &135970892 Animator: serializedVersion: 5 @@ -1923,6 +1893,7 @@ RectTransform: - {fileID: 1246685950} - {fileID: 716344323} - {fileID: 728793965} + - {fileID: 1996128088} m_Father: {fileID: 1225833476} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2038,6 +2009,8 @@ MonoBehaviour: player: {fileID: 177818107} HaveLoad: 0 historyPanel: {fileID: 907368012} + IsLoadIn: 0 + IsHideLoadPanel: 0 is_jisha: 0 is_jisha_jiesuan: 0 --- !u!114 &142654724 @@ -2441,7 +2414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &175091442 RectTransform: m_ObjectHideFlags: 0 @@ -2474,23 +2447,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &175091444 Animator: serializedVersion: 5 @@ -2664,7 +2622,7 @@ RectTransform: 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: 113, y: -703} + m_AnchoredPosition: {x: 371, y: -890} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &177818104 @@ -2740,7 +2698,6 @@ MonoBehaviour: m_EditorClassIdentifier: objectToMove: {fileID: 177818103} pathPoints: - - {fileID: 1409653245} - {fileID: 1300544800} - {fileID: 1345616811} - {fileID: 79505380} @@ -2775,7 +2732,7 @@ MonoBehaviour: Pos5Parent: {fileID: 1049673027} Pos6Parent: {fileID: 708679836} OutParent: {fileID: 142654719} - ReturnPos: {fileID: 1409653245} + ReturnPos: {fileID: 1996128088} IsBoos: 0 allHouseContro: {fileID: 0} SelfTextTrans: {fileID: 1246685950} @@ -5419,7 +5376,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &488757077 RectTransform: m_ObjectHideFlags: 0 @@ -5452,23 +5409,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &488757079 Animator: serializedVersion: 5 @@ -6960,7 +6902,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &615808349 RectTransform: m_ObjectHideFlags: 0 @@ -6993,23 +6935,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &615808351 Animator: serializedVersion: 5 @@ -8829,8 +8756,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: otherWonius: [] - House: [] OtherWoniuPre: {fileID: 4217838679404656796, guid: cb258e284be1975488c77564b0cadd91, type: 3} + allHouseContro: {fileID: 142654723} --- !u!1 &718419355 GameObject: m_ObjectHideFlags: 0 @@ -10699,7 +10626,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &918823859 RectTransform: m_ObjectHideFlags: 0 @@ -10732,23 +10659,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &918823861 Animator: serializedVersion: 5 @@ -16268,7 +16180,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1386019233 RectTransform: m_ObjectHideFlags: 0 @@ -16301,23 +16213,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &1386019235 Animator: serializedVersion: 5 @@ -22383,7 +22280,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1887905477 RectTransform: m_ObjectHideFlags: 0 @@ -22416,23 +22313,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &1887905479 Animator: serializedVersion: 5 @@ -23158,6 +23040,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1995711212} m_CullTransparentMesh: 1 +--- !u!1 &1996128087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1996128088} + m_Layer: 5 + m_Name: woniureturnpos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1996128088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1996128087} + 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: 142654719} + m_RootOrder: 13 + 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: 373, y: -888} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1996718642 GameObject: m_ObjectHideFlags: 0 @@ -24243,7 +24161,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2131031522 RectTransform: m_ObjectHideFlags: 0 @@ -24276,23 +24194,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &2131031524 Animator: serializedVersion: 5 @@ -24448,7 +24351,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2132522076 RectTransform: m_ObjectHideFlags: 0 @@ -24481,23 +24384,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0ab200c063ec6704eaa1b8951e7c8ff9, type: 3} m_Name: m_EditorClassIdentifier: - EndPosList: - - {fileID: 79505379} - - {fileID: 743869540} - - {fileID: 1269595632} - - {fileID: 1741271744} - - {fileID: 1952121427} - - {fileID: 1623243284} - WaitingArea: {fileID: 716344323} - bossContros: - - {fileID: 1790882391} - - {fileID: 1519901232} - - {fileID: 1088858450} - - {fileID: 1557156371} - - {fileID: 1377318868} OrPosTrams: {fileID: 1300544800} Panrent: {fileID: 716344323} - allHouseContros: {fileID: 0} --- !u!95 &2132522078 Animator: serializedVersion: 5 @@ -25308,137 +25196,13 @@ PrefabInstance: propertyPath: bossContros.Array.data[4] value: objectReference: {fileID: 1377318868} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: EndPos - value: - objectReference: {fileID: 1952121428} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: JumpPos - value: - objectReference: {fileID: 79505380} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: OutParent - value: - objectReference: {fileID: 142654719} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: ReturnPos - value: - objectReference: {fileID: 716344323} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: Pos1Parent - value: - objectReference: {fileID: 898215875} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: Pos2Parent - value: - objectReference: {fileID: 2143530046} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: Pos3Parent - value: - objectReference: {fileID: 20259217} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: Pos4Parent - value: - objectReference: {fileID: 1605011914} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: Pos5Parent - value: - objectReference: {fileID: 1049673027} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: Pos6Parent - value: - objectReference: {fileID: 708679836} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos0 - value: - objectReference: {fileID: 928564782} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos1 - value: - objectReference: {fileID: 79505380} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos2 - value: - objectReference: {fileID: 743869541} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos3 - value: - objectReference: {fileID: 1269595633} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos4 - value: - objectReference: {fileID: 1741271745} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos5 - value: - objectReference: {fileID: 1952121428} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: TypeEndPos6 - value: - objectReference: {fileID: 1623243285} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[0] - value: - objectReference: {fileID: 1300544800} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[1] - value: - objectReference: {fileID: 1345616811} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[2] - value: - objectReference: {fileID: 79505380} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[3] - value: - objectReference: {fileID: 743869541} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[4] - value: - objectReference: {fileID: 111370691} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[5] - value: - objectReference: {fileID: 1267988960} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[6] - value: - objectReference: {fileID: 1269595633} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[7] - value: - objectReference: {fileID: 1741271745} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[8] - value: - objectReference: {fileID: 47838340} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[9] - value: - objectReference: {fileID: 1739383417} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[10] - value: - objectReference: {fileID: 1952121428} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[11] - value: - objectReference: {fileID: 44890940} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[12] - value: - objectReference: {fileID: 1623243285} - - target: {fileID: 4217838679404656792, guid: cb258e284be1975488c77564b0cadd91, type: 3} - propertyPath: pathPoints.Array.data[13] - value: - objectReference: {fileID: 928564782} - target: {fileID: 4217838679404656796, guid: cb258e284be1975488c77564b0cadd91, type: 3} propertyPath: m_Name value: woniu (1) objectReference: {fileID: 0} - target: {fileID: 4217838679404656796, guid: cb258e284be1975488c77564b0cadd91, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4217838679404656799, guid: cb258e284be1975488c77564b0cadd91, type: 3} propertyPath: m_Pivot.x diff --git a/TheStrongestSnail/Assets/Scenes/logo.unity b/TheStrongestSnail/Assets/Scenes/logo.unity index 84a0d86..d6c7c95 100644 --- a/TheStrongestSnail/Assets/Scenes/logo.unity +++ b/TheStrongestSnail/Assets/Scenes/logo.unity @@ -3631,7 +3631,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -1339.5} + m_AnchoredPosition: {x: 540, y: -1369.5} m_SizeDelta: {x: 1018, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1071890038 diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs index e0f91a8..1becefd 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs @@ -37,6 +37,9 @@ public class AllHouseContro : MonoBehaviour public bool HaveLoad; public HistoryPanel historyPanel; + + public bool IsLoadIn;//是否已经进入游戏 + public bool IsHideLoadPanel;//是否关闭加载页面 // Start is called before the first frame update async void Start() { @@ -94,7 +97,8 @@ public class AllHouseContro : MonoBehaviour is_jisha_jiesuan = false; is_jisha = false; - StartCoroutine(LoadPanel.instance.ToHidePanel()); + IsLoadIn = true; + //StartCoroutine(LoadPanel.instance.ToHidePanel()); } public bool is_jisha = false; public bool is_jisha_jiesuan = false; @@ -127,6 +131,7 @@ public class AllHouseContro : MonoBehaviour public async void checkOutAllTheEscapeRoomsAsync()//5.1.2 { + foreach (HouseBtn house in HouseBtnList) { @@ -154,6 +159,7 @@ public class AllHouseContro : MonoBehaviour if (houseBtn.roomNo==item.roomNo) { houseBtn.roomBeansCoin = item.roomBeansCoin; + houseBtn.roomUserNo = item.roomUserNo; houseBtn.text.GetComponentInChildren().SetText(item.roomBeansCoin); } @@ -176,10 +182,20 @@ public class AllHouseContro : MonoBehaviour detailsText.GetComponentInChildren().text = "";//游戏结束 battleRoyaleGameDetails(); LoadPanel.instance.ShowPanel(); + allother.ClearAllWoniu(); + IsHideLoadPanel = false; GetInfo516(); PlayerInfo.instance.AllBetCoins = 0;//投注归0 } else if (serverResponse.data.carrySeconds < 45){ + + if (IsLoadIn && !IsHideLoadPanel&& serverResponse.data.carrySeconds <38)//关闭加载页面 + { + LoadPanel.instance.HidePanel(); + IsHideLoadPanel = true; + HaveallotherMove = false; + } + //ClearBoosHouseId();//清空boos房间号 ControAllDoorOpen(); text.GetComponentInChildren().text = (45 - serverResponse.data.carrySeconds).ToString(); @@ -190,8 +206,9 @@ public class AllHouseContro : MonoBehaviour if (!HaveallotherMove) { - //StartCoroutine(allother.WoniuToMove()); - allother.CreateWoniu(); + //StartCoroutine(allother.IECreateWoniu()); + + allother.startIEmove(); HaveallotherMove = true; //其他蜗牛进笼子 } @@ -254,7 +271,7 @@ public class AllHouseContro : MonoBehaviour PlayerInfo.instance.SelfWoniuText.text= PlayerInfo.instance.AllBetCoins.ToString(); PlayerInfo.instance.HaveBet=false; - HaveallotherMove=false; + if (!is_jisha_jiesuan) { diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/Allother.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/Allother.cs index fc4e22b..acc60af 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/Allother.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/Allother.cs @@ -7,9 +7,9 @@ public class Allother : MonoBehaviour { public List otherWonius=new List(); - public List House;//蜗牛进入的父物体 + // public List House;//蜗牛进入的父物体 public GameObject OtherWoniuPre;//其他蜗牛预制体 - + public AllHouseContro allHouseContro; // Start is called before the first frame update void Start() { @@ -32,24 +32,65 @@ public class Allother : MonoBehaviour // } // } - //蜗牛全部刷新到笼子里面 - public void RefrashAllWoniu() + //笼子里的蜗牛全部清空 + public void ClearAllWoniu() { - + if (otherWonius != null) + { + for (int i = 0; i < otherWonius.Count; i++) + { + Destroy(otherWonius[i].gameObject); + + } + } + otherWonius.Clear(); } - public void CreateWoniu() + public void CreateWoniu() { - foreach (HouseBtn house in House) + foreach (HouseBtn house in allHouseContro.HouseBtnList) { - for (int i = 0; i < house.roomUserNo; i++) + for (int i = 0; i < house.roomUserNo; i++) { - GameObject ot=Instantiate(OtherWoniuPre, transform); + // 在指定范围内随机生成位置 + float randomX = Random.Range(-250f, 250f); // X轴范围 + float randomY = Random.Range(-80f, 80f); // Y轴范围 + Vector2 randomPosition = new Vector2(randomX, randomY); + + // 实例化蜗牛 + GameObject ot = Instantiate(OtherWoniuPre, transform); + ot.GetComponent().anchoredPosition = randomPosition; + + // 添加到蜗牛列表并设置其行为 otherWonius.Add(ot.GetComponent()); - ot.GetComponent().OtherWoniuMove(house.roomNo);//进房间 + ot.GetComponent().OtherWoniuMove(house); // 移动到目标房间 + + Debug.Log("生成蜗牛，随机位置：" + randomPosition); + } + } + + } + + public void startIEmove() + { + StartCoroutine(IECreateWoniu()); + } + public IEnumerator IECreateWoniu() + { + foreach (HouseBtn house in allHouseContro.HouseBtnList) + { + for (int i = 0; i < house.roomUserNo; i++) + { + + GameObject ot = Instantiate(OtherWoniuPre, transform); + ot.GetComponent().anchoredPosition = new Vector2(Random.Range(-250, 250), Random.Range(-80, 80)); + otherWonius.Add(ot.GetComponent()); + ot.GetComponent().OtherWoniuMove(house);//进房间 + + Debug.Log("生成蜗牛"); + yield return new WaitForSeconds(0.1f); } } } - } diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs index dba4573..232d8b4 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs @@ -25,7 +25,7 @@ public class BossContro : MonoBehaviour { //instance = this; originalParent = transform.parent; - OrPos = transform.position; + OrPos = transform.GetComponent().anchoredPosition; } public void MoveParent() @@ -47,7 +47,7 @@ public class BossContro : MonoBehaviour transform.SetAsFirstSibling(); // 设置为第一个子节点 Vector3 RePos = StartPos.position; - transform.position = OrPos; + transform.GetComponent().anchoredPosition = OrPos; BoosStartPos=StartPos; //allHouseContro.CloseBoosDoor(BoosHouse.GetComponent()); diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/OtherMove.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/OtherMove.cs index 2d20cf0..64c25d4 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/OtherMove.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/OtherMove.cs @@ -15,9 +15,9 @@ public class OtherMove : MonoBehaviour public float Speed; public Transform EndPos; public Transform posGroup; - - + public Transform JumpPos; + public Transform OutParent; @@ -30,7 +30,7 @@ public class OtherMove : MonoBehaviour - private void Start() + private void Awake() { Speed = 2f; objectToMove = transform; @@ -44,13 +44,14 @@ public class OtherMove : MonoBehaviour // 去掉父物体自身（只要子节点） pathPoints = System.Array.FindAll(pathPoints, t => t != posGroup); - Debug.Log("子节点已存入数组"); + Debug.Log("子节点已存入数组"+ pathPoints.Length); } else { Debug.LogError("请分配父物体！"); } OutParent= GameObject.Find("Canvas/Bg").transform ; + JumpPos = GameObject.Find("Canvas/Bg/Posgroup/pos (3)").transform; } public void MoveOutParent() { @@ -91,17 +92,26 @@ public class OtherMove : MonoBehaviour } + public bool JudagePos1() + { + if (EndPos == JumpPos) + { + return true; + } + return false; + } + - public void StartMove() { - + Debug.Log("启动其他蜗牛移动"); // 提取路径中的所有点的位置 - + Debug.Log("路径长度"+ pathPoints.Length); for (int i = 0; i < pathPoints.Length; i++) { + Debug.Log("其他蜗判断终点"); if (objectToMove.GetComponent().StartPos == pathPoints[i]) { startIndex = i; @@ -121,7 +131,7 @@ public class OtherMove : MonoBehaviour if (endIndex > startIndex) { - + Debug.Log("其他蜗牛分配路径"); duration = (endIndex - startIndex) / Speed; @@ -129,7 +139,12 @@ public class OtherMove : MonoBehaviour Vector3[] waypoints = new Vector3[endIndex - startIndex + 1]; for (int i = startIndex, j = 0; j < pathPoints.Length && i <= endIndex; i++, j++) { - + if (!JudagePos1() && pathPoints[i] == JumpPos) + { + waypoints[j] = pathPoints[i - 1].position; + continue; + + } waypoints[j] = pathPoints[i].position; } @@ -144,8 +159,13 @@ public class OtherMove : MonoBehaviour Vector3[] waypoints = new Vector3[startIndex - endIndex + 1]; for (int i = startIndex, j = 0; j < pathPoints.Length && i >= endIndex; i--, j++) { + if (!JudagePos1() && pathPoints[i] == JumpPos) + { + waypoints[j] = pathPoints[i + 1].position; + continue; + + } - waypoints[j] = pathPoints[i].position; } @@ -160,7 +180,7 @@ public class OtherMove : MonoBehaviour public void AfterMove() { - + Debug.Log("其他蜗牛到达终点"); RectTransform rectTransform = objectToMove.GetComponent(); @@ -179,7 +199,7 @@ public class OtherMove : MonoBehaviour objectToMove.GetComponent().PlayAni.SetInteger("State", 0); - rectTransform.anchoredPosition = new Vector2(rectTransform.anchoredPosition.x + Random.Range(-50, 50), rectTransform.anchoredPosition.y); + rectTransform.anchoredPosition = new Vector2(rectTransform.anchoredPosition.x + Random.Range(-100, 100), rectTransform.anchoredPosition.y); }); @@ -211,7 +231,7 @@ public class OtherMove : MonoBehaviour public void OnMove(Vector3[] waypoints) { - + Debug.Log("其他蜗牛开始移动"); objectToMove.GetComponent().PlayAni.SetInteger("State", 1); diff --git a/TheStrongestSnail/Assets/Scripts/otherWoniu.cs b/TheStrongestSnail/Assets/Scripts/otherWoniu.cs index ea9365f..eed4316 100644 --- a/TheStrongestSnail/Assets/Scripts/otherWoniu.cs +++ b/TheStrongestSnail/Assets/Scripts/otherWoniu.cs @@ -9,25 +9,23 @@ public class otherWoniu : MonoBehaviour public Transform OrPosTrams;//出发点 public Transform Panrent;//父亲节点 - public AllHouseContro allHouseContros; + //public AllHouseContro allHouseContros; // Start is called before the first frame update void Start() { //OtherWoniuMove(); - allHouseContros=GameObject.Find("Canvas/Bg").GetComponent(); + //allHouseContros=GameObject.Find("Canvas/Bg").GetComponent(); } - public void OtherWoniuMove(int roomNo) + public void OtherWoniuMove(HouseBtn house) { - foreach (HouseBtn house in allHouseContros.HouseBtnList) - { - if (house.roomNo==roomNo) - { + + transform.GetComponent().EndPos=house.post.transform; transform.GetComponent().StartMove(); - - } - } + + + }