diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png new file mode 100644 index 0000000000..7fb2d14182 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png.meta new file mode 100644 index 0000000000..d641b11671 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_disidui.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2827c7115910f564e99d1f7ca5e4d518 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: ebf008e0787b7314f8bb75c91ccef7e7 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ExploreAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png new file mode 100644 index 0000000000..ace1b90dce Binary files /dev/null and b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta new file mode 100644 index 0000000000..33c8310470 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_diwudui.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f97be1fdc1d373646a260705672575df +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: 1165bde3c7ff2d24caf6ac5708ff5e27 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ExploreAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png new file mode 100644 index 0000000000..75039f462e Binary files /dev/null and b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png differ diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta new file mode 100644 index 0000000000..fe369c0091 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ExploreAtlas/y_yuxulundao_tansuozhong.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6e6036354af272748bbb5af95ab920f3 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - 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: e5827377d58b73049913c1da57a2651c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ExploreAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 9e16a71809..ae7887e831 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -12341,6 +12341,80 @@ RectTransform: m_AnchoredPosition: {x: 29.799988, y: -78.5} m_SizeDelta: {x: 642.71, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1368536612236462623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7585235434928099993} + - component: {fileID: 8548672819578578971} + - component: {fileID: 3482131063915512777} + m_Layer: 5 + m_Name: Image6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7585235434928099993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368536612236462623} + 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: 4761079688238677584} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 140, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8548672819578578971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368536612236462623} + m_CullTransparentMesh: 0 +--- !u!114 &3482131063915512777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368536612236462623} + 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: 6e6036354af272748bbb5af95ab920f3, 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!1 &1388174875177810144 GameObject: m_ObjectHideFlags: 0 @@ -28946,6 +29020,7 @@ RectTransform: - {fileID: 6823656507059928199} - {fileID: 8863559515178324334} - {fileID: 7182411058494587866} + - {fileID: 7585235434928099993} m_Father: {fileID: 491038039515440220} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -40355,7 +40430,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: e33370dca61c0ec46ba9858cfd7a2cc8, type: 3} + m_Sprite: {fileID: 21300000, guid: f97be1fdc1d373646a260705672575df, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -40895,7 +40970,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: efa15a6fa087ddd4087e8be91945380a, type: 3} + m_Sprite: {fileID: 21300000, guid: 2827c7115910f564e99d1f7ca5e4d518, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -68420,27 +68495,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, 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: 2320031819902321005, 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68450,7 +68505,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68590,27 +68665,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, 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: 2320031819902321005, 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68620,7 +68675,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68760,27 +68835,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, 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: 2320031819902321005, 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68790,7 +68845,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68930,27 +69005,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, 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: 2320031819902321005, 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -68960,7 +69015,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69100,27 +69175,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, 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: 2320031819902321005, 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69130,7 +69185,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69270,27 +69345,7 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, 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: 2320031819902321005, 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -69300,7 +69355,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - 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: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 diff --git a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua index ace7cd3f58..bb30e85aef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Explore/ExploreManager.lua @@ -46,8 +46,8 @@ function this.OnLevelChange() if v.state < 0 then if PlayerManager.level >= v.openLv then v.state = 0 - if PlayerManager.level == 20 then - this.CopyStoryFormationToCurFormation(k) + if k == 3101 then + FormationManager.CopyStoryFormationToCurFormation(k) end isCheckRed = true end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index 1b3c36a4fa..3127e5e026 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -247,6 +247,10 @@ function this.GetWuJinFormationHeroIds(index) end function this.CopyStoryFormationToCurFormation(teamId) + + if not this.formationList[teamId] then + this.formationList[teamId] = this.MakeAEmptyTeam(teamId) + end if #this.formationList[teamId].teamHeroInfos<=0 then for n = 1, #this.formationList[1].teamHeroInfos do table.insert(this.formationList[teamId].teamHeroInfos, this.formationList[1].teamHeroInfos[n]) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 31036169c7..9ed858c900 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -862,7 +862,9 @@ function this.SingleHeroDataShow(_go, _heroData) exploreTeam.gameObject:SetActive(true) if this.opView.GetHeroTeam then local index = this.opView.GetHeroTeam(heroData.dynamicId) - if index and index ~= 0 and index ~= 100 then + if index and index ~= 0 and index ~= 100 and this.opView.CheckIsExploring(index) then + exploreTeamList[#exploreTeamList].gameObject:SetActive(true) + elseif index and index ~= 0 and index ~= 100 then exploreTeamList[index].gameObject:SetActive(true) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua index e093c1d6dd..9f28be4db6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ExploreFormation.lua @@ -69,6 +69,12 @@ function this.On_Btn2_Click() this.root:ClosePanel() end +function this.CheckIsExploring(index) + if ExploreManager.FormationData[index + 3100].state > 0 then + return true + end + return false +end function this.SortHeroDatas(_roleDatas) local datas1 = {} for i = 1,#_roleDatas do @@ -106,7 +112,9 @@ end function this.HeroUpDownCheck(params, CheckFail, CheckSuccess) if params.action == FORMATION_ACTION.UP then local team = this.GetHeroTeam(params.heroData.dynamicId) - if team ~= 0 and team ~= 100 then + if team ~= 0 and team ~= 100 and this.CheckIsExploring(team) then + CheckFail("神将正在探索中,无法编入队伍!") + elseif team ~= 0 and team ~= 100 and not this.CheckIsExploring(team) then MsgPanel.ShowTwo("该神将正处于其他队伍,是否要编入当前队伍内",nil, function() --改变英雄队伍id改变 this.RemoveHero(params.heroData.dynamicId) @@ -114,7 +122,7 @@ function this.HeroUpDownCheck(params, CheckFail, CheckSuccess) if CheckSuccess then CheckSuccess(params) end - end) + end) else if CheckSuccess then if params.position and params.position ~= 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua index e27400dee8..f333cac996 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_ExploreSelectFormation.lua @@ -45,6 +45,9 @@ function this:OnOpen(_parent,...) end function this.RefreshData() + if not this.mapData then + return + end if this.typeIndex == 0 then this.data = ExploreManager.GetFormationData(1) else @@ -130,8 +133,9 @@ function this:Refresh(_data,_item) local formation = FormationManager.GetFormationByID(_data.formationId) for j, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(hero.heroId) - _item.heroList[j].hero:SetActive(true) - _item.heroList[j].levelText.text = heroData.lv + local pos = hero.position + _item.heroList[pos].hero:SetActive(true) + _item.heroList[pos].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) local starSize = Vector2.New(25,25) local starScale = -12.3 @@ -141,14 +145,14 @@ function this:Refresh(_data,_item) elseif starType == 2 then starSize = Vector2.New(36.868,39.76) end - SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType,starSize,starScale) - Util.SetParticleSortLayer( _item.heroList[j].starGrid,sortingOrder + 1) + SetHeroStars(this.spLoader, _item.heroList[pos].starGrid, star,starType,starSize,starScale) + Util.SetParticleSortLayer( _item.heroList[pos].starGrid,sortingOrder + 1) local demonId = heroData.id local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) - _item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - _item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - _item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) - _item.heroList[j].heroData = heroData + _item.heroList[pos].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + _item.heroList[pos].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + _item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + _item.heroList[pos].heroData = heroData end _item.exploring.gameObject:SetActive(false) _item.updateFormationBtn.gameObject:SetActive(false) @@ -235,6 +239,7 @@ end function this:OnDestroy() this.spLoader:Destroy() this.itemList = {} + this.mapData = {} end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua index 6293a2ad1a..1ff5554e21 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralSizeFitterPopup_OneKeyExplore.lua @@ -256,7 +256,6 @@ function this.SetExploreCost(forId) end function this.SetPos(gobj,pos,formationId) - LogGreen("formationId:"..formationId.." this.formationId:"..this.formationId) if this.formationId ~= formationId then gobj.transform:SetParent(pos.transform) gobj.gameObject:SetActive(true) @@ -299,8 +298,9 @@ function this:Refresh(_data,_item,index) local formation = FormationManager.GetFormationByID(_data.formationId) for j, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(hero.heroId) - _item.heroList[j].hero:SetActive(true) - _item.heroList[j].levelText.text = heroData.lv + local pos = hero.position + _item.heroList[pos].hero:SetActive(true) + _item.heroList[pos].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) local star,starType = heroData.GetStar(1) local starSize = Vector2.New(25,25) @@ -311,13 +311,13 @@ function this:Refresh(_data,_item,index) elseif starType == 2 then starSize = Vector2.New(36.868,39.76) end - SetHeroStars(this.spLoader, _item.heroList[j].starGrid, star,starType,starSize,starScale) + SetHeroStars(this.spLoader, _item.heroList[pos].starGrid, star,starType,starSize,starScale) local demonId = heroData.id local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) - _item.heroList[j].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - _item.heroList[j].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - _item.heroList[j].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) - _item.heroList[j].heroData = heroData + _item.heroList[pos].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + _item.heroList[pos].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + _item.heroList[pos].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + _item.heroList[pos].heroData = heroData end this.formationList[_data.formationId] = {} --formationId 为索引 ,预设index,mapId,exploreTime,formationId