diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 9e10bb5086..eb8334db20 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -1239,7 +1239,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: 66, y: -63} + m_AnchoredPosition: {x: 66, y: -213.2} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1542938824 @@ -1434,7 +1434,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1617991400 RectTransform: m_ObjectHideFlags: 0 @@ -1574,7 +1574,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: 66, y: -504.6} + m_AnchoredPosition: {x: 66, y: -213.2} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1685526105 @@ -48971,8 +48971,8 @@ 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: -38.299988, y: 23.539917} - m_SizeDelta: {x: 70, y: 30} + m_AnchoredPosition: {x: -37.6, y: 24.4} + m_SizeDelta: {x: 70, y: 35.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &441895129913578270 CanvasRenderer: @@ -49015,7 +49015,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 99 + m_Text: 999 --- !u!1 &554290000199095296 GameObject: m_ObjectHideFlags: 0 @@ -60048,11 +60048,11 @@ RectTransform: m_Children: - {fileID: 7224823736296256471} m_Father: {fileID: 116484329638739653} - m_RootOrder: 1 + 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: -41.524994, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 498.47498, y: 99} m_SizeDelta: {x: 996.95, y: 198} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7162959857640522880 @@ -70576,16 +70576,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6648152787238716647} - - {fileID: 3262943830304729264} - {fileID: 3299316360080635000} + - {fileID: 3262943830304729264} - {fileID: 1141173458163028699} m_Father: {fileID: 224787418950452670} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!1 &3277653647806802868 GameObject: @@ -108857,12 +108857,12 @@ RectTransform: - {fileID: 6959223419321465460} - {fileID: 5970967723695097414} m_Father: {fileID: 116484329638739653} - m_RootOrder: 2 + 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: 0, y: 50} - m_SizeDelta: {x: 1080, y: 198} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 99} + m_SizeDelta: {x: 0, y: 198} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &561441181829072738 CanvasRenderer: @@ -121794,8 +121794,8 @@ 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: -38.299976, y: 25.039997} - m_SizeDelta: {x: 70, y: 30} + m_AnchoredPosition: {x: -38.299976, y: 25.5} + m_SizeDelta: {x: 70, y: 34.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1533283932518276852 CanvasRenderer: @@ -121838,7 +121838,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 99 + m_Text: 999 --- !u!1 &8330124711593374729 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab index 6a083934a0..863887b350 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/TrialMiniGamePanel.prefab @@ -407,10 +407,10 @@ RectTransform: m_Father: {fileID: 1280518217681842888} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1897} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8876465078496269038 CanvasRenderer: @@ -454,7 +454,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -6.1, y: -509.8} + m_AnchoredPosition: {x: -6.0999756, y: -509.8} m_SizeDelta: {x: -428.2, y: 684.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1066462919 @@ -742,10 +742,10 @@ RectTransform: m_Father: {fileID: 1280518217681842888} 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} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1897} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3438442689703484279 CanvasRenderer: @@ -3528,10 +3528,8 @@ GameObject: - component: {fileID: 1278139079203103452} - component: {fileID: 2982603578629396005} - component: {fileID: 6310210829915362271} - - component: {fileID: 1693878391989132653} - - component: {fileID: 299378301947211865} m_Layer: 5 - m_Name: btnAns + m_Name: name m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3554,7 +3552,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -3.7} + m_AnchoredPosition: {x: 0, y: -3.699997} m_SizeDelta: {x: 0, y: 85.36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2982603578629396005 @@ -3594,67 +3592,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &1693878391989132653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693878391989132652} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 3 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6310210829915362271} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &299378301947211865 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693878391989132652} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1736064518602581030 GameObject: m_ObjectHideFlags: 0 @@ -3729,6 +3666,134 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1756003204704914539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6681966750920845827} + - component: {fileID: 1275948471631647510} + - component: {fileID: 8042051116758757027} + - component: {fileID: 8565438496906897152} + - component: {fileID: 8390791751782757268} + m_Layer: 5 + m_Name: btnAns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6681966750920845827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1756003204704914539} + 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_Children: [] + m_Father: {fileID: 777787707364229898} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -11.1} + m_SizeDelta: {x: 0, y: 22.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1275948471631647510 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1756003204704914539} + m_CullTransparentMesh: 0 +--- !u!114 &8042051116758757027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1756003204704914539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &8565438496906897152 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1756003204704914539} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &8390791751782757268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1756003204704914539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &1852881188124841594 GameObject: m_ObjectHideFlags: 0 @@ -4221,10 +4286,10 @@ RectTransform: m_Father: {fileID: 948311900591901430} 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: 0, y: -10} - m_SizeDelta: {x: 1080, y: 1897} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6220959639753906426 CanvasRenderer: @@ -5386,10 +5451,10 @@ RectTransform: m_Father: {fileID: 1280518217681842888} 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} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1897} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3499889165284746162 CanvasRenderer: @@ -5875,10 +5940,10 @@ RectTransform: m_Father: {fileID: 1280518217681842888} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1897} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4013470453203785711 CanvasRenderer: @@ -10097,6 +10162,8 @@ GameObject: m_Component: - component: {fileID: 777787707364229898} - component: {fileID: 3426556763394578584} + - component: {fileID: 3226995555382308334} + - component: {fileID: 7380704027587842329} m_Layer: 5 m_Name: c1 m_TagString: Untagged @@ -10118,6 +10185,7 @@ RectTransform: - {fileID: 6138740248572394673} - {fileID: 8343060592706080390} - {fileID: 1278139079203103452} + - {fileID: 6681966750920845827} m_Father: {fileID: 7769278599016104259} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10134,6 +10202,68 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5531769749249215547} m_CullTransparentMesh: 0 +--- !u!114 &3226995555382308334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531769749249215547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &7380704027587842329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5531769749249215547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3226995555382308334} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5538950309585165781 GameObject: m_ObjectHideFlags: 0 @@ -10431,10 +10561,10 @@ RectTransform: m_Father: {fileID: 3017325564524252201} 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: 0, y: -10} - m_SizeDelta: {x: 1080, y: 1897} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8732457258053475454 CanvasRenderer: @@ -14043,10 +14173,10 @@ RectTransform: m_Father: {fileID: 1280518217681842888} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1897} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &433466252625347041 CanvasRenderer: @@ -14972,7 +15102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -5.7499} + m_AnchoredPosition: {x: 0, y: -5.749878} m_SizeDelta: {x: 0, y: 11.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7187847128878917696 @@ -15118,10 +15248,10 @@ RectTransform: m_Father: {fileID: 1752152938647739880} 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: 0, y: -10} - m_SizeDelta: {x: 1080, y: 1897} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4109802729622572070 CanvasRenderer: @@ -17887,10 +18017,10 @@ RectTransform: m_Father: {fileID: 787863531} 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: 0, y: -10} - m_SizeDelta: {x: 1080, y: 1897} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &462780920467324558 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 9b5a0b104f..5e70dcbb78 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -34,9 +34,7 @@ function this:InitComponent() this.btnReward=Util.GetGameObject(self.gameObject,"leftCenter/btnReward") this.item = Util.GetGameObject(self.gameObject, "item") - -- 显示死亡计时时间 - -- this.deadRoot = Util.GetGameObject(self.gameObject, "RevivePanel") - -- this.deadTime = Util.GetGameObject(self.gameObject, "RevivePanel/bg/Time"):GetComponent("Text") + -- buff显示 this.propList = Util.GetGameObject(self.transform, "centerDown/bufflist") @@ -47,8 +45,8 @@ function this:InitComponent() this.propInfo:SetActive(false) this.propList:SetActive(true) -- 行动力警告显示 - this.warn = Util.GetGameObject(self.gameObject, "EndLessEffect/effect") - this.warnRoot = Util.GetGameObject(self.gameObject, "EndLessEffect") + -- this.warn = Util.GetGameObject(self.gameObject, "EndLessEffect/effect") + -- this.warnRoot = Util.GetGameObject(self.gameObject, "EndLessEffect") -- 面板遮罩, 没有接地图任务前不可点击 this.Mask = Util.GetGameObject(self.gameObject, "Mask") @@ -79,14 +77,6 @@ function this:BindEvent() this.SetEliteBackShow() this.SetEndlessShow() end) - -- Util.AddClick(this.BtnBack2, function () - -- if ctrlView.GetCallListCount() > 1 then - -- PopupTipPanel.ShowTip(Language[11232]) - -- return - -- end - -- this.SetEliteBackShow() - -- this.SetEndlessShow() - -- end) -- 功绩按钮 Util.AddClick(this.btnAchive, function () @@ -96,10 +86,10 @@ function this:BindEvent() Util.AddClick(this.btnRank, function () UIManager.OpenPanel(UIName.CarbonScoreSortPanel,1) end) - --回春散 - Util.AddClick(this.btnXingYao,function() - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialXingYao) - end) + -- --回春散 + -- Util.AddClick(this.btnXingYao,function() + -- UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialXingYao) + -- end) --奖励 Util.AddClick(this.btnReward,function() UIManager.OpenPanel(UIName.TrialRewardPopup) @@ -188,7 +178,7 @@ function this:OnShow() if amb and amb ~= "" then SoundManager.PlayAmbient(amb) end - this.xingYaoNum.text = BagManager.GetItemCountById(31) + -- this.xingYaoNum.text = BagManager.GetItemCountById(31) playerView.OnShow() endLessMapView.OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index b79f557a64..e470b1506e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -2,7 +2,6 @@ local this = TrialMapPanel local istrialMap = false local MapPanel -local bombNum = 0 local powerValue = 0 local ctrlView = require("Modules/Map/View/MapControllView") local targetPos = Vector2.New(109, 289) @@ -48,6 +47,10 @@ function TrialMapPanel:InitComponent(root, mapPanel) this.normalShop = Util.GetGameObject(root, "rightDown/shop") this.shopNum = Util.GetGameObject(this.normalShop, "num"):GetComponent("Text") + --回春散 + this.btnXingYao=Util.GetGameObject(root,"rightDown/btnXingYao") + this.xingYaoNum=Util.GetGameObject(this.btnXingYao,"num"):GetComponent("Text") + this.effectRoot = Util.GetGameObject(root, "fireRoot") this.fire = Util.GetGameObject(this.effectRoot, "UI_effect_shilian_huo") this.guiji = Util.GetGameObject(this.effectRoot, "UI_effect_shilian_guiji") @@ -71,10 +74,16 @@ end function TrialMapPanel:BindEvent() + --炸弹按钮 Util.AddClick(this.btnBomb, function () UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialBomb) end) + --回春散 + Util.AddClick(this.btnXingYao,function() + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialXingYao) + end) + -- 打开补给点 Util.AddClick(this.buffShop, function() -- 判断是否有保存的补给点 @@ -156,8 +165,8 @@ function this.InitShowState() MapPanel.btnRank.gameObject:SetActive(true) MapPanel.btnXingYao.gameObject:SetActive(true) MapPanel.btnReward.gameObject:SetActive(true) - MapPanel.warnRoot:SetActive(false) - MapPanel.warn:SetActive(false) + -- MapPanel.warnRoot:SetActive(false) + -- MapPanel.warn:SetActive(false) this.CheckTrialHeroInfo() this.InitTrialMission() @@ -217,6 +226,7 @@ function this.UpdatePowerValue() --Log("更新数值") this.powerPercent.text = _value this.sliderValue.fillAmount = _value / 100 + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) -- -1时召唤boss if powerValue == -1 then @@ -322,10 +332,11 @@ function this.OnTempBagChanged() end end --- 刷新砸炸弹数量 +-- 刷新砸炸弹、回春散数量 function this.RefreshBombNum() -- 试炼副本才执行 - bombNum = 0 + local bombNum = 0 + local yaoNum = 0 if CarbonManager.difficulty ~= CARBON_TYPE.TRIAL then return end if BagManager.GetItemCountById(43) == 0 or not BagManager.GetItemCountById(43) then bombNum = 0 @@ -334,6 +345,12 @@ function this.RefreshBombNum() end this.bombNum.text = bombNum + if BagManager.GetItemCountById(31) == 0 or not BagManager.GetItemCountById(31) then + yaoNum = 0 + else + yaoNum = BagManager.GetItemCountById(31) + end + this.xingYaoNum.text = yaoNum end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua index 5ecc75a1a7..b15df204da 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_14.lua @@ -38,7 +38,7 @@ function this.Show() _itemsList[index]:SetActive(true) local data = ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"Id",tonumber(answerId)) Util.GetGameObject(_itemsList[index], "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(data.Icon)) - Util.GetGameObject(_itemsList[index], "btnAns/name"):GetComponent("Text").text = data.ReadingName + Util.GetGameObject(_itemsList[index], "name/name"):GetComponent("Text").text = data.ReadingName Util.AddOnceClick(Util.GetGameObject(_itemsList[index], "btnAns"), function() this.ChooseAnswer(index) end) @@ -54,11 +54,7 @@ function this.ChooseAnswer(index) else PopupTipPanel.ShowTip(this.config.FalseFeedback) end - -- UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1, function() - -- if TrialMiniGameManager.IsGameDone() then - -- TrialMiniGameManager.EndGame() - -- end - -- end) + if TrialMiniGameManager.IsGameDone() then TrialMiniGameManager.EndGame() end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index daad17b9cc..f0ab2b65cc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -190,8 +190,8 @@ function this.InitCompShow(carbonType) this.btnReset:SetActive(carbonType == CARBON_TYPE.ENDLESS) this.btnFormat:SetActive(carbonType == CARBON_TYPE.ENDLESS) this.btnNote:SetActive(carbonType == CARBON_TYPE.ENDLESS) - this.warnRoot:SetActive(carbonType == CARBON_TYPE.ENDLESS) - this.warn:SetActive(false) + -- this.warnRoot:SetActive(carbonType == CARBON_TYPE.ENDLESS) + -- this.warn:SetActive(false) this.btnSet:SetActive(carbonType == CARBON_TYPE.ENDLESS) this.endLessTitleRoot:SetActive(carbonType == CARBON_TYPE.ENDLESS) this.btnSet:SetActive(carbonType == CARBON_TYPE.ENDLESS) @@ -333,7 +333,7 @@ function this.RefreshEnergyValue(isInit, costType) if ctrlView.GetCallListCount() > 1 then ctrlView.StopWalk() end - this.PlayWarnEffect() + -- this.PlayWarnEffect() end -- 死翘翘 elseif costType == COST_TYPE.DEAD then @@ -412,14 +412,14 @@ function this.OnRoleTransport(func) end -- 行动力警告特效 -function this.PlayWarnEffect() - this.warn:SetActive(true) +-- function this.PlayWarnEffect() + -- this.warn:SetActive(true) - local timer = Timer.New(function () - this.warn:SetActive(false) - end, 1.6) - timer:Start() -end + -- local timer = Timer.New(function () + -- this.warn:SetActive(false) + -- end, 1.6) + -- timer:Start() +-- end -- 行动力是否显示倒计时 function this.ShowCountTime() @@ -452,7 +452,7 @@ end function this.OnClose() if not this.IsEndLessMap() then return end - this.warn:SetActive(false) + -- this.warn:SetActive(false) this.isPanelClose = true EndLessMapManager.isUpdateOnClose = false if this.timer then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua index 874eccd704..ae1c0fdb63 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua @@ -43,6 +43,7 @@ function this:BindEvent() PopupTipPanel.ShowTip("炸弹使用已达最大次数~") else NetManager.RequestUseBomb(function (msg)--请求使用炸弹 + MapTrialManager.bombUsed = MapTrialManager.bombUsed + 1 parent:ClosePanel() UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function() MapTrialManager.UpdatePowerValue(msg.essenceValue)