From 662ad26223340c6f4a7fb69b8d163a3bdd85d7ca Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 5 Jan 2022 17:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=BF=83?= =?UTF-8?q?=E9=AD=94/=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BC=96=E9=98=9F=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonsterCampAtlas/ArtFont/r_paihang_zh.png | Bin 0 -> 27549 bytes .../ArtFont/r_paihang_zh.png.meta | 99 +++++++++ .../FourElementMonsterCampPanel.prefab | 193 ++++++++++++++++- .../UI/MonsterCamp/MonsterCampNewPanel.prefab | 202 ++++++++++++++++-- .../Formation/View/FourElementFormation.lua | 19 +- .../Formation/View/MonsterCampFormation.lua | 12 +- .../FourElementMonsterCampPanel.lua | 4 + .../MonsterCamp/MonsterCampNewPanel.lua | 5 +- 8 files changed, 505 insertions(+), 29 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png create mode 100644 Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..3aeebf7789ca6345f72e9f032512f798d59881c8 GIT binary patch literal 27549 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 Ef=XCjz5oCK literal 0 HcmV?d00001 diff --git a/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta new file mode 100644 index 0000000000..80ccee868a --- /dev/null +++ b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2bdb53b239504a94384457d20b331b97 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0d4c320276c5eae4583ade5f5169fed1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MonsterCampAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index 2ab7986a0c..660034d963 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -1,5 +1,122 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &66947568039734892 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6851585754361907152} + - component: {fileID: 5953229080547441855} + - component: {fileID: 6210124064439203645} + - component: {fileID: 4237594905686330943} + m_Layer: 5 + m_Name: btnFormation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6851585754361907152 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66947568039734892} + 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: 7806638948147681323} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -101.5, y: -185.70001} + m_SizeDelta: {x: 127, y: 135} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5953229080547441855 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66947568039734892} + m_CullTransparentMesh: 0 +--- !u!114 &6210124064439203645 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66947568039734892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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 + m_Sprite: {fileID: 21300000, guid: 31331d004c1dffb46a564b185d164204, 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 +--- !u!114 &4237594905686330943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66947568039734892} + 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: 6210124064439203645} + 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 &585007246497186392 GameObject: m_ObjectHideFlags: 0 @@ -225,10 +342,10 @@ RectTransform: m_Father: {fileID: 7806638948147681323} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101.5, y: -185.70001} - m_SizeDelta: {x: 126, y: 126} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 101.5, y: -185.70001} + m_SizeDelta: {x: 128, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4269923484805502012 CanvasRenderer: @@ -258,7 +375,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0ae4375e796ee934997142d1bb379d5d, type: 3} + m_Sprite: {fileID: 21300000, guid: 2bdb53b239504a94384457d20b331b97, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3266,6 +3383,7 @@ RectTransform: - {fileID: 176440091997260688} - {fileID: 1257113198445388884} - {fileID: 7916084515871155950} + - {fileID: 6851585754361907152} m_Father: {fileID: 7806638949382057690} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4412,6 +4530,71 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &4849960437125264606 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index 053e26b834..c2e7d4b58c 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -1218,6 +1218,7 @@ RectTransform: - {fileID: 4835148176914438856} - {fileID: 5771674330105935116} - {fileID: 3220256385954936758} + - {fileID: 6867756170676383893} m_Father: {fileID: 3260027998717083522} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2058,7 +2059,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3a71686756aace84bafe81a0e05f41b9, type: 3} + m_Sprite: {fileID: 21300000, guid: 6d28566506ce46b45896a39e6b796471, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2142,10 +2143,10 @@ RectTransform: m_Father: {fileID: 3260027997770271091} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -101.5, y: -179.59998} - m_SizeDelta: {x: 126, y: 126} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 101.5, y: -179.59998} + m_SizeDelta: {x: 128, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8803097166006486372 CanvasRenderer: @@ -2175,7 +2176,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0ae4375e796ee934997142d1bb379d5d, type: 3} + m_Sprite: {fileID: 21300000, guid: 2bdb53b239504a94384457d20b331b97, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3137,6 +3138,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7740322834635730224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6867756170676383893} + - component: {fileID: 2288959277072321968} + - component: {fileID: 6993218776758046401} + - component: {fileID: 4510359494144940286} + m_Layer: 5 + m_Name: btnFormation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6867756170676383893 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740322834635730224} + 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: 3260027997770271091} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -101.5, y: -179.59998} + m_SizeDelta: {x: 127, y: 135} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2288959277072321968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740322834635730224} + m_CullTransparentMesh: 0 +--- !u!114 &6993218776758046401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740322834635730224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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 + m_Sprite: {fileID: 21300000, guid: 31331d004c1dffb46a564b185d164204, 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 +--- !u!114 &4510359494144940286 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7740322834635730224} + 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: 6993218776758046401} + 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 &8580407688451453896 GameObject: m_ObjectHideFlags: 0 @@ -3289,7 +3407,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -42.799988, y: 114.9} + m_AnchoredPosition: {x: -42.80005, y: 114.9} m_SizeDelta: {x: 40, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6063666794697383833 @@ -3462,11 +3580,6 @@ PrefabInstance: propertyPath: m_Name value: Hero objectReference: {fileID: 0} - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -3592,16 +3705,81 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &7863660303576691920 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua index ce90837ebc..abf0bda87b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua @@ -15,6 +15,7 @@ function this.Init(root, ...) if temp[2] then curId = temp[2] end + this.opType = temp[3] or 1 this.root = root this.InitView() end @@ -25,7 +26,7 @@ function this.InitView() this.root.btn_1:SetActive(true) this.root.btn_2:SetActive(true) this.root.btn_1_lab.text = Language[10710] - this.root.btn_2_lab.text = Language[10706] + this.root.btn_2_lab.text = this.opType == 1 and Language[10706] or "保存编队" this.root.exampleBtn:SetActive(false) this.root.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main}) end @@ -116,12 +117,16 @@ function this.On_Btn2_Click() PopupTipPanel.ShowTip("挑战编队为空") return end - FormationManager.SaveFormation( - this.root.curFormationIndex, - newteam, - FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos - ) - this.StartFight() + FormationManager.SaveFormation( + this.root.curFormationIndex, + newteam, + FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos + ) + if this.opType == 1 then + this.StraightBattle() + elseif this.opType == 2 then + PopupTipPanel.ShowTip("保存编队成功") + end end -- 开始战斗 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua index 2cad2bf54b..ecbcab293f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/MonsterCampFormation.lua @@ -7,8 +7,9 @@ local monsterCampConfig = ConfigManager.GetConfig(ConfigName.FloodConfig) this.IsNeedChangeFormation = false --- 逻辑初始化 -function this.Init(root) +function this.Init(root, opType) this.root = root + this.opType = opType or 1 this.InitView() end --- 获取需要显示的编队id @@ -40,8 +41,11 @@ function this.On_Btn2_Click() -- UIManager.OpenPanel(UIName.QuickPurchasePanel,{ type = UpViewRechargeType.MonsterCampTicket }) -- return -- end - - this.StraightBattle() + if this.opType == 1 then + this.StraightBattle() + elseif this.opType == 2 then + PopupTipPanel.ShowTip("保存编队成功") + end end --- btn2点击回调事件 --RIGHT function this.On_Btn1_Click() @@ -54,7 +58,7 @@ function this.InitView() this.root.btn_2:SetActive(true) -- this.root.failText:SetActive(true) this.root.btn_1_lab.text = Language[10710] - this.root.btn_2_lab.text = Language[10707] + this.root.btn_2_lab.text = this.opType == 1 and Language[10707] or "保存编队" this.root.passBattle0.gameObject:SetActive(false) this.root.passBattle1.gameObject:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index 16b5e27f62..efc1b72b53 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -48,6 +48,7 @@ function FourElementMonsterCampPanel:InitComponent() this.buyMoppingTimes = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/buyMoppingTimes"):GetComponent("Text") this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn") this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank") + this.btnFormation = Util.GetGameObject(self.gameObject, "InfoRoot/btnFormation") this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight") this.btnHelpFightRed = Util.GetGameObject(this.btnHelpFight, "redPoint") this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_zhuzhananniu_zh") @@ -90,6 +91,9 @@ function FourElementMonsterCampPanel:BindEvent() Util.AddClick(this.btnRank, function () UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[curType+26]) end) + Util.AddClick(this.btnFormation, function () + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, trailData.fourElementType, nil, 2) + end) Util.AddClick(this.btnHelpFight, function () local MyHeroData = HeroManager.GetHeroDataByProperty(curType,0) MonsterCampManager.GetFriendHelpHeros(curType,function(data) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index 7b71504f7e..98510446e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -47,8 +47,8 @@ function MonsterCampNewPanel:InitComponent() this.buyMoppingTimes = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/buyMoppingTimes"):GetComponent("Text") this.addBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/addBtn") this.btnRank = Util.GetGameObject(self.gameObject, "InfoRoot/btnRank") + this.btnFormation = Util.GetGameObject(self.gameObject, "InfoRoot/btnFormation") this.btnHelpFight = Util.GetGameObject(self.gameObject, "InfoRoot/btnHelpFight") - this.btnHelpFight:GetComponent("Image").sprite = this.spLoader:LoadSprite("g_guanka_tongguanjiangli_zh") end --绑定事件(用于子类重写) @@ -81,6 +81,9 @@ function MonsterCampNewPanel:BindEvent() -- UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[4])]\ UIManager.OpenPanel(UIName.CarbonScoreSortPanel, 2) end) + Util.AddClick(this.btnFormation, function () + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.MONSTER_CAMP, 2) + end) Util.AddClick(this.btnHelpFight, function () MonsterCampManager.preType = 2 UIManager.OpenPanel(UIName.TrialRewardPopup,MonsterCampManager.SetRewardData(),function(id,rewardFunc)