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 0000000000..3aeebf7789 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png differ 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)