diff --git a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity index b15d44a..7a89921 100644 --- a/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity +++ b/TheStrongestSnail/Assets/Scenes/Battle_Royale.unity @@ -318,6 +318,7 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 1239105052} text: {fileID: 1341881301} + post: {fileID: 1269595632} DoorIsOpen: 0 --- !u!114 &20259222 MonoBehaviour: @@ -393,8 +394,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 1269595633} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -452,82 +455,6 @@ MonoBehaviour: moveDuration: 1 delayBetweenCoins: 0.1 randomTargetRadius: 60 ---- !u!1 &35069046 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 35069047} - - component: {fileID: 35069049} - - component: {fileID: 35069048} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &35069047 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35069046} - 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: 814771130} - m_RootOrder: 2 - 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.002533, y: 0.00016785} - m_SizeDelta: {x: 1373.5, y: 320.62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &35069048 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35069046} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df4b759196edd7349a1b0ece8a840042, 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!222 &35069049 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35069046} - m_CullTransparentMesh: 1 --- !u!1 &43098354 GameObject: m_ObjectHideFlags: 0 @@ -1082,6 +1009,7 @@ RectTransform: - {fileID: 1952121428} - {fileID: 44890940} - {fileID: 1623243285} + - {fileID: 928564782} m_Father: {fileID: 1225833476} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1171,6 +1099,14 @@ MonoBehaviour: text: {fileID: 1632850610} detailsText: {fileID: 1543732512} house: {fileID: 0} + bossobj: + - {fileID: 1790882387} + - {fileID: 1519901229} + - {fileID: 1088858447} + - {fileID: 1557156368} + - {fileID: 1377318865} + is_jisha: 0 + is_jisha_jiesuan: 0 --- !u!114 &142654724 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1390,10 +1326,13 @@ MonoBehaviour: - {fileID: 1952121428} - {fileID: 44890940} - {fileID: 1623243285} + - {fileID: 928564782} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 1952121428} + TypeEndPos0: {fileID: 928564782} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -2284,82 +2223,6 @@ RectTransform: m_AnchoredPosition: {x: 299, y: -613} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &301587264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 301587265} - - component: {fileID: 301587267} - - component: {fileID: 301587266} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &301587265 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301587264} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 814771130} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -278.3129, y: -1.6697} - m_SizeDelta: {x: 556.136, y: 154.82} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &301587266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301587264} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8861006ac3d3bf44bb92d91a99bcf14a, 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!222 &301587267 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 301587264} - m_CullTransparentMesh: 1 --- !u!1 &311685756 GameObject: m_ObjectHideFlags: 0 @@ -3048,82 +2911,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 470934205} m_CullTransparentMesh: 1 ---- !u!1 &475260560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 475260561} - - component: {fileID: 475260563} - - component: {fileID: 475260562} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &475260561 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475260560} - 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: 814771130} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.0022401, y: 53.669502} - m_SizeDelta: {x: 1373.5, y: 54.516098} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &475260562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475260560} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 34a7d35ff3d32c2439f6bb08f3d5f7cc, 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!222 &475260563 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475260560} - m_CullTransparentMesh: 1 --- !u!1 &521012223 GameObject: m_ObjectHideFlags: 0 @@ -3309,7 +3096,7 @@ RectTransform: m_Children: - {fileID: 1726520800} m_Father: {fileID: 1556512052} - m_RootOrder: 2 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3704,6 +3491,7 @@ MonoBehaviour: canvasGroup: {fileID: 0} ReturnBtn: {fileID: 470934207} moveObject: {fileID: 177818102} + bg: {fileID: 142654718} --- !u!1 &632503723 GameObject: m_ObjectHideFlags: 0 @@ -3985,6 +3773,7 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 1996718643} text: {fileID: 1057682373} + post: {fileID: 1623243284} DoorIsOpen: 0 --- !u!114 &708679842 MonoBehaviour: @@ -4060,8 +3849,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 1623243285} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -4300,6 +4091,7 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 2143809077} text: {fileID: 1130954133} + post: {fileID: 1741271744} DoorIsOpen: 0 --- !u!114 &715869105 MonoBehaviour: @@ -4375,8 +4167,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 1741271745} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -4856,50 +4650,6 @@ RectTransform: m_AnchoredPosition: {x: 19, y: 28} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &814771129 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 814771130} - m_Layer: 5 - m_Name: WarmingPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &814771130 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 814771129} - 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: 863267874} - - {fileID: 301587265} - - {fileID: 35069047} - - {fileID: 475260561} - - {fileID: 1803102933} - - {fileID: 1294715599} - - {fileID: 948231120} - - {fileID: 913843384} - m_Father: {fileID: 1225833476} - m_RootOrder: 18 - 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.75429, y: 3.7756} - m_SizeDelta: {x: 1373.5, y: 320.6191} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &822718466 GameObject: m_ObjectHideFlags: 0 @@ -5236,82 +4986,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4075030775632783688, guid: a030fef0719b2504ba325e558ca3651c, type: 3} m_PrefabInstance: {fileID: 849249375} m_PrefabAsset: {fileID: 0} ---- !u!1 &863267873 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 863267874} - - component: {fileID: 863267876} - - component: {fileID: 863267875} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &863267874 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863267873} - 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: 814771130} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 271.94434, y: -5.3265} - m_SizeDelta: {x: 543.3828, y: 147.5045} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &863267875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863267873} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c85417c5686dfd54a99974f178fffaa0, 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!222 &863267876 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863267873} - m_CullTransparentMesh: 1 --- !u!1 &875993942 GameObject: m_ObjectHideFlags: 0 @@ -5586,7 +5260,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1556512052} - m_RootOrder: 1 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5736,6 +5410,7 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 1501690016} text: {fileID: 1099774253} + post: {fileID: 79505379} DoorIsOpen: 0 --- !u!114 &898215880 MonoBehaviour: @@ -5811,8 +5486,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 79505380} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -5910,7 +5587,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 177} m_SizeDelta: {x: 1105, y: 323} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &913843383 +--- !u!1 &928564781 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5918,74 +5595,34 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 913843384} - - component: {fileID: 913843386} - - component: {fileID: 913843385} + - component: {fileID: 928564782} m_Layer: 5 - m_Name: Image + m_Name: pos (14) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &913843384 +--- !u!224 &928564782 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913843383} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 928564781} + 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: 814771130} - m_RootOrder: 7 + m_Father: {fileID: 142654719} + m_RootOrder: 25 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: -3.4371, y: -1.6694} - m_SizeDelta: {x: 539.3728, y: 154.82} + m_AnchoredPosition: {x: 305, y: -663} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &913843385 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913843383} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4bf2014a44e462747b6789f5acc60d5d, 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!222 &913843386 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913843383} - m_CullTransparentMesh: 1 --- !u!1 &935748550 GameObject: m_ObjectHideFlags: 0 @@ -6098,82 +5735,6 @@ MonoBehaviour: - {fileID: 1099774253} - {fileID: 231143271} bg: {fileID: 142654718} ---- !u!1 &948231119 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 948231120} - - component: {fileID: 948231122} - - component: {fileID: 948231121} - m_Layer: 5 - m_Name: image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &948231120 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948231119} - 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: 814771130} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -270, y: -1.6657} - m_SizeDelta: {x: 178.22693, y: 154.81} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &948231121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948231119} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 428393460daf652418b8828261dc2578, 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!222 &948231122 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 948231119} - m_CullTransparentMesh: 1 --- !u!1 &953766737 GameObject: m_ObjectHideFlags: 0 @@ -6540,6 +6101,7 @@ MonoBehaviour: canvasGroup: {fileID: 0} ReturnBtn: {fileID: 1234669328} moveObject: {fileID: 177818102} + bg: {fileID: 142654718} --- !u!1 &1049673026 GameObject: m_ObjectHideFlags: 0 @@ -6645,6 +6207,7 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 1275337683} text: {fileID: 364052607} + post: {fileID: 1952121427} DoorIsOpen: 0 --- !u!114 &1049673033 MonoBehaviour: @@ -6720,8 +6283,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 1952121428} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -6876,6 +6441,179 @@ MonoBehaviour: numText: {fileID: 0} ParentHouse: {fileID: 708679836} Parent: {fileID: 1153582820} +--- !u!1 &1088858447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1088858448} + - component: {fileID: 1088858453} + - component: {fileID: 1088858452} + - component: {fileID: 1088858451} + - component: {fileID: 1088858450} + - component: {fileID: 1088858449} + m_Layer: 5 + m_Name: boss (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1088858448 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088858447} + 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: 1556512052} + m_RootOrder: 2 + 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: 149, y: -75.65271} + m_SizeDelta: {x: 403.92, y: 403.92} + m_Pivot: {x: 0.2753303, y: 0.3881147} +--- !u!95 &1088858449 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088858447} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d95f5d3eafaf34445bdda993987a5680, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1088858450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088858447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05db1acde3beeac42ac0515b33c40a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 142654719} + originalParent: {fileID: 1556512052} + BoosStartPos: {fileID: 1088858448} + StartPos: {fileID: 286275319} + BossAni: {fileID: 1088858449} + IsLeft: 0 + HouseId: 0 + BoosHouse: {fileID: 0} + allHouseContro: {fileID: 142654723} + bg: {fileID: 0} +--- !u!114 &1088858451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088858447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a691aaaa3074ac4d823aa67ebc1b2b0, type: 3} + m_Name: + m_EditorClassIdentifier: + objectToMove: {fileID: 1088858448} + pathPoints: + - {fileID: 1409653245} + - {fileID: 1300544800} + - {fileID: 1345616811} + - {fileID: 79505380} + - {fileID: 743869541} + - {fileID: 111370691} + - {fileID: 1267988960} + - {fileID: 1269595633} + - {fileID: 1741271745} + - {fileID: 47838340} + - {fileID: 1739383417} + - {fileID: 1952121428} + - {fileID: 44890940} + - {fileID: 1623243285} + duration: 5 + isLooping: 0 + room_id: + Speed: 5 + EndPos: {fileID: 0} + TypeEndPos0: {fileID: 0} + TypeEndPos1: {fileID: 79505380} + TypeEndPos2: {fileID: 743869541} + TypeEndPos3: {fileID: 1269595633} + TypeEndPos4: {fileID: 1741271745} + TypeEndPos5: {fileID: 1952121428} + TypeEndPos6: {fileID: 1623243285} + JumpPos: {fileID: 79505380} + Pos1Parent: {fileID: 2065312023} + Pos2Parent: {fileID: 1457829063} + Pos3Parent: {fileID: 1804302356} + Pos4Parent: {fileID: 1605011914} + Pos5Parent: {fileID: 12831517} + Pos6Parent: {fileID: 879293994} + OutParent: {fileID: 142654719} + ReturnPos: {fileID: 1409653245} + IsBoos: 1 + allHouseContro: {fileID: 142654723} +--- !u!114 &1088858452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088858447} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ec15d0dac8f8449a3a162ff5ac5c65, 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!222 &1088858453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1088858447} + m_CullTransparentMesh: 1 --- !u!1 &1099774253 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4075030775632783691, guid: a030fef0719b2504ba325e558ca3651c, type: 3} @@ -7586,7 +7324,6 @@ RectTransform: - {fileID: 1016365649} - {fileID: 627582903} - {fileID: 286275319} - - {fileID: 814771130} - {fileID: 2127674356} m_Father: {fileID: 0} m_RootOrder: 2 @@ -8203,7 +7940,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1556512052} - m_RootOrder: 4 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -8365,82 +8102,6 @@ MonoBehaviour: numText: {fileID: 0} ParentHouse: {fileID: 898215875} Parent: {fileID: 1153582820} ---- !u!1 &1294715598 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1294715599} - - component: {fileID: 1294715601} - - component: {fileID: 1294715600} - m_Layer: 5 - m_Name: image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1294715599 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294715598} - 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: 814771130} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 256.17654, y: -1.6657} - m_SizeDelta: {x: 178.2269, y: 154.81} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1294715600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294715598} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 428393460daf652418b8828261dc2578, 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!222 &1294715601 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1294715598} - m_CullTransparentMesh: 1 --- !u!1 &1300544799 GameObject: m_ObjectHideFlags: 0 @@ -8802,6 +8463,179 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1347256775} m_CullTransparentMesh: 1 +--- !u!1 &1377318865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1377318866} + - component: {fileID: 1377318871} + - component: {fileID: 1377318870} + - component: {fileID: 1377318869} + - component: {fileID: 1377318868} + - component: {fileID: 1377318867} + m_Layer: 5 + m_Name: boss (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1377318866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377318865} + 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: 1556512052} + m_RootOrder: 4 + 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: 8, y: -75.65271} + m_SizeDelta: {x: 403.92, y: 403.92} + m_Pivot: {x: 0.2753303, y: 0.3881147} +--- !u!95 &1377318867 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377318865} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d95f5d3eafaf34445bdda993987a5680, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1377318868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377318865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05db1acde3beeac42ac0515b33c40a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 142654719} + originalParent: {fileID: 1556512052} + BoosStartPos: {fileID: 1377318866} + StartPos: {fileID: 286275319} + BossAni: {fileID: 1377318867} + IsLeft: 0 + HouseId: 0 + BoosHouse: {fileID: 0} + allHouseContro: {fileID: 142654723} + bg: {fileID: 0} +--- !u!114 &1377318869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377318865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a691aaaa3074ac4d823aa67ebc1b2b0, type: 3} + m_Name: + m_EditorClassIdentifier: + objectToMove: {fileID: 1377318866} + pathPoints: + - {fileID: 1409653245} + - {fileID: 1300544800} + - {fileID: 1345616811} + - {fileID: 79505380} + - {fileID: 743869541} + - {fileID: 111370691} + - {fileID: 1267988960} + - {fileID: 1269595633} + - {fileID: 1741271745} + - {fileID: 47838340} + - {fileID: 1739383417} + - {fileID: 1952121428} + - {fileID: 44890940} + - {fileID: 1623243285} + duration: 5 + isLooping: 0 + room_id: + Speed: 5 + EndPos: {fileID: 0} + TypeEndPos0: {fileID: 0} + TypeEndPos1: {fileID: 79505380} + TypeEndPos2: {fileID: 743869541} + TypeEndPos3: {fileID: 1269595633} + TypeEndPos4: {fileID: 1741271745} + TypeEndPos5: {fileID: 1952121428} + TypeEndPos6: {fileID: 1623243285} + JumpPos: {fileID: 79505380} + Pos1Parent: {fileID: 2065312023} + Pos2Parent: {fileID: 1457829063} + Pos3Parent: {fileID: 1804302356} + Pos4Parent: {fileID: 1605011914} + Pos5Parent: {fileID: 12831517} + Pos6Parent: {fileID: 879293994} + OutParent: {fileID: 142654719} + ReturnPos: {fileID: 1409653245} + IsBoos: 1 + allHouseContro: {fileID: 142654723} +--- !u!114 &1377318870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377318865} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ec15d0dac8f8449a3a162ff5ac5c65, 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!222 &1377318871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377318865} + m_CullTransparentMesh: 1 --- !u!1 &1382013987 GameObject: m_ObjectHideFlags: 0 @@ -9587,6 +9421,179 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1511603130} m_CullTransparentMesh: 1 +--- !u!1 &1519901229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1519901230} + - component: {fileID: 1519901235} + - component: {fileID: 1519901234} + - component: {fileID: 1519901233} + - component: {fileID: 1519901232} + - component: {fileID: 1519901231} + m_Layer: 5 + m_Name: boss (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1519901230 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519901229} + 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: 1556512052} + m_RootOrder: 1 + 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: 25, y: -75.65271} + m_SizeDelta: {x: 403.92, y: 403.92} + m_Pivot: {x: 0.2753303, y: 0.3881147} +--- !u!95 &1519901231 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519901229} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d95f5d3eafaf34445bdda993987a5680, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1519901232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519901229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05db1acde3beeac42ac0515b33c40a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 142654719} + originalParent: {fileID: 1556512052} + BoosStartPos: {fileID: 1519901230} + StartPos: {fileID: 286275319} + BossAni: {fileID: 1519901231} + IsLeft: 0 + HouseId: 0 + BoosHouse: {fileID: 0} + allHouseContro: {fileID: 142654723} + bg: {fileID: 0} +--- !u!114 &1519901233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519901229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a691aaaa3074ac4d823aa67ebc1b2b0, type: 3} + m_Name: + m_EditorClassIdentifier: + objectToMove: {fileID: 1519901230} + pathPoints: + - {fileID: 1409653245} + - {fileID: 1300544800} + - {fileID: 1345616811} + - {fileID: 79505380} + - {fileID: 743869541} + - {fileID: 111370691} + - {fileID: 1267988960} + - {fileID: 1269595633} + - {fileID: 1741271745} + - {fileID: 47838340} + - {fileID: 1739383417} + - {fileID: 1952121428} + - {fileID: 44890940} + - {fileID: 1623243285} + duration: 5 + isLooping: 0 + room_id: + Speed: 5 + EndPos: {fileID: 0} + TypeEndPos0: {fileID: 0} + TypeEndPos1: {fileID: 79505380} + TypeEndPos2: {fileID: 743869541} + TypeEndPos3: {fileID: 1269595633} + TypeEndPos4: {fileID: 1741271745} + TypeEndPos5: {fileID: 1952121428} + TypeEndPos6: {fileID: 1623243285} + JumpPos: {fileID: 79505380} + Pos1Parent: {fileID: 2065312023} + Pos2Parent: {fileID: 1457829063} + Pos3Parent: {fileID: 1804302356} + Pos4Parent: {fileID: 1605011914} + Pos5Parent: {fileID: 12831517} + Pos6Parent: {fileID: 879293994} + OutParent: {fileID: 142654719} + ReturnPos: {fileID: 1409653245} + IsBoos: 1 + allHouseContro: {fileID: 142654723} +--- !u!114 &1519901234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519901229} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ec15d0dac8f8449a3a162ff5ac5c65, 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!222 &1519901235 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519901229} + m_CullTransparentMesh: 1 --- !u!1 &1520288747 GameObject: m_ObjectHideFlags: 0 @@ -9889,6 +9896,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1790882388} + - {fileID: 1519901230} + - {fileID: 1088858448} + - {fileID: 1557156369} + - {fileID: 1377318866} - {fileID: 896021223} - {fileID: 557294885} - {fileID: 2074977173} @@ -9958,7 +9969,181 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 1726520800} text: {fileID: 0} + post: {fileID: 0} DoorIsOpen: 0 +--- !u!1 &1557156368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1557156369} + - component: {fileID: 1557156374} + - component: {fileID: 1557156373} + - component: {fileID: 1557156372} + - component: {fileID: 1557156371} + - component: {fileID: 1557156370} + m_Layer: 5 + m_Name: boss (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1557156369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557156368} + 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: 1556512052} + m_RootOrder: 3 + 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: -102, y: -75.65271} + m_SizeDelta: {x: 403.92, y: 403.92} + m_Pivot: {x: 0.2753303, y: 0.3881147} +--- !u!95 &1557156370 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557156368} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d95f5d3eafaf34445bdda993987a5680, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1557156371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557156368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05db1acde3beeac42ac0515b33c40a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + Parent: {fileID: 142654719} + originalParent: {fileID: 1556512052} + BoosStartPos: {fileID: 1557156369} + StartPos: {fileID: 286275319} + BossAni: {fileID: 1557156370} + IsLeft: 0 + HouseId: 0 + BoosHouse: {fileID: 0} + allHouseContro: {fileID: 142654723} + bg: {fileID: 0} +--- !u!114 &1557156372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557156368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a691aaaa3074ac4d823aa67ebc1b2b0, type: 3} + m_Name: + m_EditorClassIdentifier: + objectToMove: {fileID: 1557156369} + pathPoints: + - {fileID: 1409653245} + - {fileID: 1300544800} + - {fileID: 1345616811} + - {fileID: 79505380} + - {fileID: 743869541} + - {fileID: 111370691} + - {fileID: 1267988960} + - {fileID: 1269595633} + - {fileID: 1741271745} + - {fileID: 47838340} + - {fileID: 1739383417} + - {fileID: 1952121428} + - {fileID: 44890940} + - {fileID: 1623243285} + duration: 5 + isLooping: 0 + room_id: + Speed: 5 + EndPos: {fileID: 0} + TypeEndPos0: {fileID: 0} + TypeEndPos1: {fileID: 79505380} + TypeEndPos2: {fileID: 743869541} + TypeEndPos3: {fileID: 1269595633} + TypeEndPos4: {fileID: 1741271745} + TypeEndPos5: {fileID: 1952121428} + TypeEndPos6: {fileID: 1623243285} + JumpPos: {fileID: 79505380} + Pos1Parent: {fileID: 2065312023} + Pos2Parent: {fileID: 1457829063} + Pos3Parent: {fileID: 1804302356} + Pos4Parent: {fileID: 1605011914} + Pos5Parent: {fileID: 12831517} + Pos6Parent: {fileID: 879293994} + OutParent: {fileID: 142654719} + ReturnPos: {fileID: 1409653245} + IsBoos: 1 + allHouseContro: {fileID: 142654723} +--- !u!114 &1557156373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557156368} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 58ec15d0dac8f8449a3a162ff5ac5c65, 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!222 &1557156374 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557156368} + m_CullTransparentMesh: 1 --- !u!1 &1565478602 GameObject: m_ObjectHideFlags: 0 @@ -11294,7 +11479,8 @@ MonoBehaviour: IsLeft: 0 HouseId: 0 BoosHouse: {fileID: 0} - allHouseContro: {fileID: 0} + allHouseContro: {fileID: 142654723} + bg: {fileID: 0} --- !u!114 &1790882392 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11325,8 +11511,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 0} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} @@ -11401,82 +11589,6 @@ RectTransform: m_AnchoredPosition: {x: -3, y: 3} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1803102932 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1803102933} - - component: {fileID: 1803102935} - - component: {fileID: 1803102934} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1803102933 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803102932} - 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: 814771130} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0.0022401, y: -57} - m_SizeDelta: {x: 1373.5, y: 54.516098} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1803102934 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803102932} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 34a7d35ff3d32c2439f6bb08f3d5f7cc, 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!222 &1803102935 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803102932} - m_CullTransparentMesh: 1 --- !u!1 &1804033312 GameObject: m_ObjectHideFlags: 0 @@ -12884,7 +12996,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1556512052} - m_RootOrder: 3 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13036,7 +13148,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1225833476} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13472,6 +13584,7 @@ MonoBehaviour: Mask: {fileID: 0} door: {fileID: 577253061} text: {fileID: 231143271} + post: {fileID: 743869540} DoorIsOpen: 0 --- !u!114 &2143530051 MonoBehaviour: @@ -13547,8 +13660,10 @@ MonoBehaviour: - {fileID: 1623243285} duration: 5 isLooping: 0 + room_id: Speed: 5 EndPos: {fileID: 743869541} + TypeEndPos0: {fileID: 0} TypeEndPos1: {fileID: 79505380} TypeEndPos2: {fileID: 743869541} TypeEndPos3: {fileID: 1269595633} diff --git a/TheStrongestSnail/Assets/Scenes/logo.unity b/TheStrongestSnail/Assets/Scenes/logo.unity index 0bef638..faa90c1 100644 --- a/TheStrongestSnail/Assets/Scenes/logo.unity +++ b/TheStrongestSnail/Assets/Scenes/logo.unity @@ -4044,6 +4044,29 @@ MonoBehaviour: station: cuteNo: memberTime: + response: + code: 0 + message: + data: + carrySeconds: 0 + gameEscapeRoomResponseVoList: [] + gameEscapeModel: + id: 0 + gameNo: + demonMode: 0 + startTime: + betTime: + countTime: + settleTime: + status: 0 + roomNoKill: + roomNoRemain: + beansCoinAll: 0 + beansCoinKill: 0 + beansCoinRemain: 0 + beansCoinFee: 0 + beansCoinRank: 0 + beansCoinDivide: 0 --- !u!1 &1358692575 GameObject: m_ObjectHideFlags: 0 diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs index bc8fd39..a30c228 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/AllHouseContro.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using UnityEditor; using UnityEngine; using UnityEngine.UI; +using UnityEngine.Windows; using static UnityEditor.Progress; using static UnityEngine.UIElements.UxmlAttributeDescription; @@ -16,6 +17,7 @@ public class AllHouseContro : MonoBehaviour public GameObject text; public GameObject detailsText; public HouseBtn house; + public List bossobj; // Start is called before the first frame update async void Start() { @@ -41,7 +43,7 @@ public class AllHouseContro : MonoBehaviour string response511 = await web.SendRequest(web.URL + "/snail/gameEscape/queryLatest", "POST", "{}", head511); Debug.Log("5.1.1查询最近一场大屠杀" + response511); // 解析服务器返回的数据 - Global.global.response = JsonConvert.DeserializeObject(response511); + Global.global.response = JsonConvert.DeserializeObject(response511); escapeId = Global.global.response.data.gameEscapeModel.id; int index = 0; foreach (GameEscapeRoomResponseVo item in Global.global.response.data.gameEscapeRoomResponseVoList) @@ -73,7 +75,7 @@ public class AllHouseContro : MonoBehaviour body.escapeId = escapeId; string response = await web.SendRequest(web.URL+"/snail/gameEscape/queryEscapeRoomList", "POST", JsonUtility.ToJson(body), Global.global.CreateHeaders()); - //Debug.Log("5.1.2查询逃亡房间详情响应: " + response); + Debug.Log("5.1.2查询逃亡房间详情响应: " + response); ServerResponse serverResponse = JsonConvert.DeserializeObject(response); int index = 0; foreach (var item in serverResponse.data.gameEscapeRoomResponseVoList){ @@ -102,7 +104,29 @@ public class AllHouseContro : MonoBehaviour response = await web.SendRequest(web.URL + "/snail/gameEscape/queryKill", "POST", JsonUtility.ToJson(body), Global.global.CreateHeaders()); Debug.Log("5.1.4: " + response); + ServerResponse514 serverResponse_514 = JsonConvert.DeserializeObject(response); + string[] parts = serverResponse_514.data.roomNoKill.Split(","); // 根据 ',' 分割字符串d + + int index_ = 0; + foreach (string part in parts) { + if (parts.Length > index_) + { + int a = 0; + foreach (HouseBtn item in HouseBtnList) + { + if (a == int.Parse(parts[index_])) { + bossobj[index_].GetComponent().BossMove(int.Parse(parts[index_])); + bossobj[index_].GetComponent().room_id = parts[index_]; + } + a++; + } + + + index_++; + } + + } } } else if (serverResponse.data.carrySeconds > 50) { @@ -114,6 +138,7 @@ public class AllHouseContro : MonoBehaviour response = await web.SendRequest(web.URL + "/snail/gameEscape/queryUserBetResult", "POST", JsonUtility.ToJson(body), Global.global.CreateHeaders()); Debug.Log("5.1.5: " + response); + } } } diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs index 99875c2..d57e798 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BettingBtn.cs @@ -84,39 +84,20 @@ public class BettingBtn : MonoBehaviour } } - public void GiveMoney() + public void GiveMoney(string room_id) { float AllMoney = text1.GetComponent().ReturnText() + text2.GetComponent().ReturnText() + text3.GetComponent().ReturnText() + text4.GetComponent().ReturnText() + text5.GetComponent().ReturnText() + text6.GetComponent().ReturnText(); - - switch (BossContro.instance.HouseId) + foreach (GameObject item in list) { - case 1: - text1.GetComponent().PlayAni(); - ControMoney(text1); - break; - case 2: - text2.GetComponent().PlayAni(); - ControMoney(text2); - break; - case 3: - text3.GetComponent().PlayAni(); - ControMoney(text3); - break; - case 4: - text4.GetComponent().PlayAni(); - ControMoney(text4); - break; - case 5: - text5.GetComponent().PlayAni(); - ControMoney(text5); - break; - case 6: - text6.GetComponent().PlayAni(); - ControMoney(text6); - break; + if (item.GetComponent().ParentHouse.GetComponent().roomNo == int.Parse(room_id)) + { + item.GetComponent().PlayAni(); + ControMoney(item); + } + } diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs index 3a5b7d8..d6e87e9 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/BossContro.cs @@ -8,7 +8,7 @@ public class BossContro : MonoBehaviour public Transform Parent; public Transform originalParent; public Transform BoosStartPos; - public static BossContro instance; + //public static BossContro instance; public Transform StartPos; public Animator BossAni;//boos动画 @@ -17,10 +17,11 @@ public class BossContro : MonoBehaviour public Transform BoosHouse;//boos房间 public AllHouseContro allHouseContro; + public GameObject bg; // Start is called before the first frame update void Start() { - instance = this; + //instance = this; originalParent = transform.parent; } @@ -52,30 +53,42 @@ public class BossContro : MonoBehaviour - public void BossMove() + public void BossMove(int Index) { - int Index=Random.Range(0,5); - switch (Index) - { - case 0: - GetComponent().EndPos = GetComponent().TypeEndPos1; - break; - case 1: - GetComponent().EndPos = GetComponent().TypeEndPos2; - break; - case 2: - GetComponent().EndPos = GetComponent().TypeEndPos3; - break; - case 3: - GetComponent().EndPos = GetComponent().TypeEndPos4; - break; - case 4: - GetComponent().EndPos = GetComponent().TypeEndPos5; - break; - case 5: - GetComponent().EndPos = GetComponent().TypeEndPos6; - break; + Debug.Log("===========--------------"); + foreach (HouseBtn item in allHouseContro.HouseBtnList) + { + Debug.Log(item.roomNo.ToString() + "|" + Index.ToString()); + if (item.roomNo == Index) + { + GetComponent().EndPos = item.post.transform; + } } + //GetComponent().TypeEndPos1 + //switch (Index) + //{ + // case 1: + // GetComponent().EndPos = GetComponent().TypeEndPos1; + // break; + // case 2: + // GetComponent().EndPos = GetComponent().TypeEndPos2; + // break; + // case 3: + // GetComponent().EndPos = GetComponent().TypeEndPos3; + // break; + // case 4: + // GetComponent().EndPos = GetComponent().TypeEndPos4; + // break; + // case 5: + // GetComponent().EndPos = GetComponent().TypeEndPos5; + // break; + // case 6: + // GetComponent().EndPos = GetComponent().TypeEndPos6; + // break; + // case 0: + // GetComponent().EndPos = GetComponent().TypeEndPos0; + // break; + //} //MoveParent(); BossAni.SetInteger("State", 1); // 动画转为移动 GetComponent().StartMove(); // 开始移动 diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/FailPanel.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/FailPanel.cs index 97e0001..fd99975 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/FailPanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/FailPanel.cs @@ -8,6 +8,7 @@ public class FailPanel : BasePanel public Button ReturnBtn; public GameObject moveObject; public static FailPanel instance; + public GameObject bg; public override void Start() { instance = this; @@ -33,6 +34,10 @@ public class FailPanel : BasePanel public override void ShowPanel() { base.ShowPanel(); - BossContro.instance.ReturnParent(); + foreach (GameObject item in bg.GetComponent().bossobj) + { + item.GetComponent().ReturnParent(); + } + //dic[room_id].GetComponent().ReturnParent(); } } diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/HouseBtn.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/HouseBtn.cs index e887258..91f2156 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/HouseBtn.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/HouseBtn.cs @@ -12,6 +12,7 @@ public class HouseBtn : MonoBehaviour public GameObject Mask; public RectTransform door; public GameObject text; + public GameObject post; //public selectLatest511.GameEscapeRoomResponseVo gameEscapeRoomResponseVo; public bool DoorIsOpen; // Start is called before the first frame update diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/PlayerMove.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/PlayerMove.cs index 45f62dd..f64763a 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/PlayerMove.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/PlayerMove.cs @@ -11,10 +11,11 @@ public class PlayerMove : MonoBehaviour public bool isLooping = false; // 是否循环路径 int startIndex = 0; int endIndex = 0; - + public string room_id; public float Speed; public Transform EndPos; + public Transform TypeEndPos0; public Transform TypeEndPos1; public Transform TypeEndPos2; public Transform TypeEndPos3; @@ -74,7 +75,7 @@ public class PlayerMove : MonoBehaviour } else { - BossContro.instance.HouseId = 1; + GetComponent().HouseId = 1; } } else if (EndPos == TypeEndPos2) @@ -87,7 +88,7 @@ public class PlayerMove : MonoBehaviour } else { - BossContro.instance.HouseId = 2; + GetComponent().HouseId = 2; } } else if(EndPos == TypeEndPos3) @@ -99,7 +100,7 @@ public class PlayerMove : MonoBehaviour } else { - BossContro.instance.HouseId = 3; + GetComponent().HouseId = 3; } } else if (EndPos == TypeEndPos4) @@ -111,7 +112,7 @@ public class PlayerMove : MonoBehaviour } else { - BossContro.instance.HouseId = 4; + GetComponent().HouseId = 4; } } else if (EndPos == TypeEndPos5) @@ -123,7 +124,7 @@ public class PlayerMove : MonoBehaviour } else { - BossContro.instance.HouseId = 5; + GetComponent().HouseId = 5; } } else if (EndPos == TypeEndPos6) @@ -135,7 +136,7 @@ public class PlayerMove : MonoBehaviour } else { - BossContro.instance.HouseId = 6; + GetComponent().HouseId = 6; } } @@ -211,7 +212,7 @@ public class PlayerMove : MonoBehaviour Debug.Log("Startindex"+i); } - else if (IsBoos && BossContro.instance.BoosStartPos== pathPoints[i]) + else if (IsBoos && GetComponent().BoosStartPos== pathPoints[i]) { startIndex = i; Debug.Log("Startindex" + i); @@ -290,17 +291,17 @@ public class PlayerMove : MonoBehaviour else { JudgeEnd(); - BossContro.instance.BossAni.SetInteger("State", 0);//停止移动 - allHouseContro.ControOneDoorOpen(BossContro.instance.HouseId,() => {//开门 - - BossContro.instance.BossAni.SetInteger("State", 1); + GetComponent().BossAni.SetInteger("State", 0);//停止移动 + allHouseContro.ControOneDoorOpen(GetComponent().HouseId,() => {//开门 + + GetComponent().BossAni.SetInteger("State", 1); objectToMove.DOMoveY(objectToMove.position.y + 100, 0.5f).OnComplete(() => {//进房间 SetParentToHouse(); StartCoroutine(BoosAttack()); - BossContro.instance.BoosStartPos = EndPos; + GetComponent().BoosStartPos = EndPos; //JudgeSuccOrFail(); }); @@ -324,11 +325,11 @@ public class PlayerMove : MonoBehaviour IEnumerator BoosAttack() { - BossContro.instance.BossAni.SetInteger("State", 2); + GetComponent().BossAni.SetInteger("State", 2); yield return new WaitForSeconds(3f); - BossContro.instance.BossAni.SetInteger("State", 0); + GetComponent().BossAni.SetInteger("State", 0); - BettingBtn.instance.GiveMoney(); + BettingBtn.instance.GiveMoney(room_id); yield return new WaitForSeconds(2f); JudgeSuccOrFail(); } @@ -336,13 +337,14 @@ public class PlayerMove : MonoBehaviour public void JudgeSuccOrFail() { - if (BossContro.instance.BoosStartPos == PlayerMovePos.instance.StartPos && PlayerMovePos.instance.HadChoise) + Debug.Log("=000000000000000000000000000000000000000000000000"); + if (GetComponent().BoosStartPos == PlayerMovePos.instance.StartPos && PlayerMovePos.instance.HadChoise) { //BossContro.instance.BossAni.SetInteger("State", 2);//boos攻击 Debug.Log("失败");//失败 FailPanel.instance.ShowPanel(); } - else if (BossContro.instance.BoosStartPos != PlayerMovePos.instance.StartPos && PlayerMovePos.instance.HadChoise) + else if (GetComponent().BoosStartPos != PlayerMovePos.instance.StartPos && PlayerMovePos.instance.HadChoise) { Debug.Log("胜利");//胜利 SucceePanel.instance.ShowPanel(); @@ -350,7 +352,10 @@ public class PlayerMove : MonoBehaviour else { Debug.Log("没有失败和胜利");//胜利 - + foreach (GameObject item in allHouseContro.bossobj) + { + item.GetComponent().ReturnParent(); + } } //HegemonTime.instance.StartCoroutine(HegemonTime.instance.StartGame());//重新计算时间 } @@ -383,15 +388,15 @@ public class PlayerMove : MonoBehaviour Vector3 nextWaypoint = waypoints[index + 1]; if (IsBoos) { - if (nextWaypoint.x < currentWaypoint.x && !BossContro.instance.IsLeft) + if (nextWaypoint.x < currentWaypoint.x && !GetComponent().IsLeft) { - BossContro.instance.IsLeft = true; + GetComponent().IsLeft = true; // 旋转物体使其面向左侧（绕Y轴旋转180度） Rotate(); } - else if (nextWaypoint.x > currentWaypoint.x && BossContro.instance.IsLeft) + else if (nextWaypoint.x > currentWaypoint.x && GetComponent().IsLeft) { - BossContro.instance.IsLeft = false; + GetComponent().IsLeft = false; Rotate(); } } diff --git a/TheStrongestSnail/Assets/Scripts/Battle_Royale/SucceePanel.cs b/TheStrongestSnail/Assets/Scripts/Battle_Royale/SucceePanel.cs index 7815172..974cf3c 100644 --- a/TheStrongestSnail/Assets/Scripts/Battle_Royale/SucceePanel.cs +++ b/TheStrongestSnail/Assets/Scripts/Battle_Royale/SucceePanel.cs @@ -8,6 +8,7 @@ public class SucceePanel : BasePanel public Button ReturnBtn; public GameObject moveObject; public static SucceePanel instance; + public GameObject bg; public override void Start() { instance = this; @@ -33,6 +34,10 @@ public class SucceePanel : BasePanel public override void ShowPanel() { base.ShowPanel(); - BossContro.instance.ReturnParent(); + foreach (GameObject item in bg.GetComponent().bossobj) + { + item.GetComponent().ReturnParent(); + } + //FailPanel.instance.dic[room_id].GetComponent().ReturnParent(); } } diff --git a/TheStrongestSnail/Assets/Scripts/Login/Global.cs b/TheStrongestSnail/Assets/Scripts/Login/Global.cs index e80ce0b..152c5df 100644 --- a/TheStrongestSnail/Assets/Scripts/Login/Global.cs +++ b/TheStrongestSnail/Assets/Scripts/Login/Global.cs @@ -7,7 +7,7 @@ public class Global : MonoBehaviour { public logoPanel.ServerResponse serverResponse; - public Response response; + public ServerResponse response; public static Global global ; // Start is called before the first frame update @@ -58,12 +58,43 @@ public class Data public object gameEscapeUserModel; // 游戏逃亡用户模型 (目前未处理) } + [Serializable] -public class ServerResponse +public class Data514 +{ + public int id; + public string gameNo; + public int demonMode; + public string startTime; + public string betTime; + public string countTime; + public string settleTime; + public int status; + public string roomNoKill; + public string roomNoRemain; + public float beansCoinAll; + public float beansCoinKill; + public float beansCoinRemain; + public float beansCoinFee; + public float beansCoinRank; + public float beansCoinDivide; +} + +[Serializable] +public class ServerResponse: Response +{ + public Data data; // 数据对象 +} +[Serializable] +public class ServerResponse514: Response +{ + public Data514 data; // 数据对象 +} + +public class Response { public int code; // 响应状态码 public string message; // 提示语 - public Data data; // 数据对象 } // 数据类 [Serializable] @@ -86,12 +117,3 @@ public class GameEscapeModel public float beansCoinRank; // 排名奖励豆币 public float beansCoinDivide; // 分成豆币 } - - -[Serializable] -public class Response -{ - public int code; // 状态码 - public string message; // 返回信息 - public Data data; // 数据对象 -}