diff --git a/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_81.png b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_81.png new file mode 100644 index 0000000000..8763f71aab Binary files /dev/null and b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_81.png differ diff --git a/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_81.png.meta b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_81.png.meta new file mode 100644 index 0000000000..b907d128d1 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_81.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 48f4d152353ea874ca7f8be4cf959a46 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9cbd00580aca58448a178099be608c7f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_82.png b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_82.png new file mode 100644 index 0000000000..4e32e29e1b Binary files /dev/null and b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_82.png differ diff --git a/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_82.png.meta b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_82.png.meta new file mode 100644 index 0000000000..a50b06747e --- /dev/null +++ b/Assets/ManagedResources/BG/UI/SpecailTraining/UI_hz_zhonghe05_82.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8eadf0b26a5116e46ab732968850a6c1 +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: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4aecda1ac90fa4c4592d6a5add98cb13 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab index 6907be819e..3add780724 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab @@ -1093,10 +1093,10 @@ RectTransform: m_Father: {fileID: 1194381517165096416} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 81.3, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &131834162815349112 CanvasRenderer: @@ -2970,10 +2970,10 @@ RectTransform: m_Father: {fileID: 1262679124945878172} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 216.3, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7506017845641071818 CanvasRenderer: @@ -9051,9 +9051,9 @@ RectTransform: m_Father: {fileID: 4914380869751366237} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 672.45, y: -66.45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 297.6, y: 132.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8740356665160797084 @@ -16230,9 +16230,9 @@ RectTransform: m_Father: {fileID: 7865542922754469003} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 229, y: -28.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7308598287584177953 @@ -16635,9 +16635,9 @@ RectTransform: m_Father: {fileID: 7865542922754469003} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 117.64, y: -28.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4144429730720456656 @@ -17312,10 +17312,10 @@ RectTransform: m_Father: {fileID: 1262679124945878172} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 81.3, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6361240161137750590 CanvasRenderer: @@ -18022,9 +18022,9 @@ RectTransform: m_Father: {fileID: 800725520187452421} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80.95, y: -89.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 152, y: 152} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7234040720317302532 @@ -18424,9 +18424,9 @@ RectTransform: m_Father: {fileID: 800725520187452421} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 262.75, y: -89.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 181.6, y: 181.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8672316360936894560 @@ -18606,6 +18606,124 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 95555 +--- !u!1 &3911690828756762726 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4052698705578036687} + - component: {fileID: 6479842693796617650} + - component: {fileID: 7277485095966830342} + - component: {fileID: 2460507155796485635} + m_Layer: 5 + m_Name: training + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4052698705578036687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911690828756762726} + 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: + - {fileID: 3405831451646764092} + m_Father: {fileID: 172099646559819528} + 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: 152, y: 18} + m_SizeDelta: {x: 40, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6479842693796617650 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911690828756762726} + m_CullTransparentMesh: 0 +--- !u!114 &7277485095966830342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911690828756762726} + 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: 8eadf0b26a5116e46ab732968850a6c1, 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 &2460507155796485635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911690828756762726} + 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: 7277485095966830342} + 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 &3920588745679062564 GameObject: m_ObjectHideFlags: 0 @@ -20959,9 +21077,9 @@ RectTransform: m_Father: {fileID: 7865542922754469003} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 173.32, y: -28.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4830524830271220141 @@ -21423,6 +21541,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2484111339674375613} + - {fileID: 2354881869455195728} + - {fileID: 4052698705578036687} m_Father: {fileID: 77454835683373753} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -21488,6 +21608,86 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &5545037893225729236 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2354881869455195728} + - component: {fileID: 4014593063886873425} + - component: {fileID: 4828592190708346317} + m_Layer: 5 + m_Name: traininglv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2354881869455195728 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5545037893225729236} + 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: 172099646559819528} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 259, y: -47} + m_SizeDelta: {x: 89.3, y: 50.59} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4014593063886873425 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5545037893225729236} + m_CullTransparentMesh: 0 +--- !u!114 &4828592190708346317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5545037893225729236} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.78431374, g: 0.6784314, b: 0.5137255, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7279\u8BAD\u4E00\u7EA7" + LanguageIndex: 0 --- !u!1 &5595650462081336604 GameObject: m_ObjectHideFlags: 0 @@ -21900,9 +22100,9 @@ RectTransform: m_Father: {fileID: 7865542922754469003} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 340.36, y: -28.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3058767237682553964 @@ -26815,10 +27015,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 213.65, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2099235981827177424 CanvasRenderer: @@ -27664,10 +27864,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 483.65, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &657113344816791394 CanvasRenderer: @@ -28099,9 +28299,9 @@ RectTransform: m_Father: {fileID: 4767352897535079369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 438.65, y: -66.45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 562.3, y: 132.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5697136989062052279 @@ -28256,9 +28456,9 @@ RectTransform: m_Father: {fileID: 7865542922754469003} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 284.68, y: -28.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4688608861329625077 @@ -28710,10 +28910,10 @@ RectTransform: m_Father: {fileID: 1194381517165096416} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 216.3, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7566916072860817259 CanvasRenderer: @@ -28906,6 +29106,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6806023684344429548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3405831451646764092} + - component: {fileID: 5774323138541167742} + - component: {fileID: 3706131594852721305} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3405831451646764092 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6806023684344429548} + 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: 4052698705578036687} + m_RootOrder: 0 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5774323138541167742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6806023684344429548} + m_CullTransparentMesh: 0 +--- !u!114 &3706131594852721305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6806023684344429548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Button --- !u!1 &6857219681682898819 GameObject: m_ObjectHideFlags: 0 @@ -30111,10 +30390,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 78.649994, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8503794955063177387 CanvasRenderer: @@ -37276,9 +37555,9 @@ RectTransform: m_Father: {fileID: 4914380869751366237} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 204.84999, y: -66.45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 297.6, y: 132.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &93807191997552399 @@ -38640,10 +38919,10 @@ RectTransform: m_Father: {fileID: 7603097860510337896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 348.65, y: -66.45} - m_SizeDelta: {x: 130, y: 130} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1202601738595703871 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab index 15c059aa9e..271b208527 100644 --- a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/SpecailTrainingInfoPopup.prefab @@ -156,6 +156,85 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &72460570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 72460571} + - component: {fileID: 72460573} + - component: {fileID: 72460572} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &72460571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72460570} + 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: 156128562416990824} + m_RootOrder: 0 + 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: 1.8, y: -13.6} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &72460573 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72460570} + m_CullTransparentMesh: 0 +--- !u!114 &72460572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 72460570} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.40000004, g: 0.3372549, b: 0.28235295, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7279\u8BAD\u4E2D" --- !u!1 &149716120 GameObject: m_ObjectHideFlags: 0 @@ -540,12 +619,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1417757171} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 352, y: -136} - m_SizeDelta: {x: 281.05, y: -15} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 281.05, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &622002768 CanvasRenderer: @@ -569,7 +648,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.97647065, g: 0.62352943, b: 0.11764707, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -982,6 +1061,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1417757171} + - component: {fileID: 365477818} + - component: {fileID: 365477819} m_Layer: 0 m_Name: Chose m_TagString: Untagged @@ -1000,17 +1081,54 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1604794131773003506} - {fileID: 1482736898} - {fileID: 622002766} - - {fileID: 1604794131773003506} m_Father: {fileID: 6674535297047208383} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104, y: -492.85498} - m_SizeDelta: {x: 100, y: 349.15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 104, y: 0} + m_SizeDelta: {x: 100, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &365477818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417757170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &365477819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1417757170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 277 + m_Right: 0 + m_Top: 63 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1482736897 GameObject: m_ObjectHideFlags: 0 @@ -1043,11 +1161,11 @@ RectTransform: m_Children: - {fileID: 461167997} m_Father: {fileID: 1417757171} - m_RootOrder: 0 + 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: 358, y: -57} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1482736901 @@ -2151,6 +2269,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &251641109847497925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4189421130390394065} + - component: {fileID: 2373459641177728600} + - component: {fileID: 6132241783477372615} + m_Layer: 0 + m_Name: Tip2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4189421130390394065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251641109847497925} + 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: 6674535297652902529} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 748, y: -36} + m_SizeDelta: {x: 290.77, y: 243.87} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2373459641177728600 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251641109847497925} + m_CullTransparentMesh: 0 +--- !u!114 &6132241783477372615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251641109847497925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.97647065, g: 0.62352943, b: 0.11764707, 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_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5DF2\u6FC0\u6D3B" --- !u!1 &257372989048444098 GameObject: m_ObjectHideFlags: 0 @@ -2428,6 +2625,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1309773933990658214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 156128562416990824} + - component: {fileID: 6232666570923579936} + - component: {fileID: 3807558414331264444} + m_Layer: 0 + m_Name: trainingIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &156128562416990824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309773933990658214} + 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: + - {fileID: 72460571} + m_Father: {fileID: 2997030700277455518} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6232666570923579936 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309773933990658214} + m_CullTransparentMesh: 0 +--- !u!114 &3807558414331264444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309773933990658214} + 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: 8eadf0b26a5116e46ab732968850a6c1, 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 &1352223330102657910 GameObject: m_ObjectHideFlags: 0 @@ -3070,11 +3342,11 @@ RectTransform: - {fileID: 913382186} - {fileID: 6023404032977498027} m_Father: {fileID: 1417757171} - m_RootOrder: 2 + m_RootOrder: 0 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: 373, y: 74} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 666.6, y: 146.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6241586588448486677 @@ -3090,12 +3362,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 135 + m_Left: -47 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: -94.13 + m_Spacing: -292.05 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -3135,6 +3407,89 @@ RectTransform: m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!1 &3966376096039826985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2997030700277455518} + - component: {fileID: 6072846989514163292} + - component: {fileID: 3966376096039826986} + m_Layer: 0 + m_Name: TrainingStatus + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2997030700277455518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3966376096039826985} + 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: + - {fileID: 156128562416990824} + - {fileID: 4632894044974008664} + - {fileID: 2556807525071909064} + m_Father: {fileID: 6674535296717857660} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 755.1, y: 35} + m_SizeDelta: {x: 289.8, y: 71.36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6072846989514163292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3966376096039826985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3966376096039826986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3966376096039826985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 8 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4015868113105511502 GameObject: m_ObjectHideFlags: 0 @@ -3640,7 +3995,6 @@ GameObject: - component: {fileID: 4632894044974008664} - component: {fileID: 2918332741423966806} - component: {fileID: 1072665637818740539} - - component: {fileID: 5250601639866356744} m_Layer: 0 m_Name: mySelfCondition m_TagString: Untagged @@ -3659,13 +4013,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6674535297821892818} - m_RootOrder: 2 + m_Father: {fileID: 2997030700277455518} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 825.7, y: -23.8} - m_SizeDelta: {x: 155.02, y: 77.08} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 155.02, y: 50.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2918332741423966806 CanvasRenderer: @@ -3709,26 +4063,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u4E03\u661F\u5F00\u542F" ---- !u!114 &5250601639866356744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5890748171070420120} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &5936617852943861241 GameObject: m_ObjectHideFlags: 0 @@ -4062,7 +4396,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6674535295989938524 RectTransform: m_ObjectHideFlags: 0 @@ -4078,10 +4412,10 @@ RectTransform: m_Father: {fileID: 6674535297821892818} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -97.84} - m_SizeDelta: {x: 100, y: 72.24} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6674535296167222859 GameObject: @@ -4223,7 +4557,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 443, y: -56} - m_SizeDelta: {x: 400, y: 60} + m_SizeDelta: {x: 400, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6674535296229178781 CanvasRenderer: @@ -4476,10 +4810,10 @@ RectTransform: m_Father: {fileID: 6674535297544090741} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 462.45, y: -148.56} - m_SizeDelta: {x: 924.9, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 462.45, y: 0} + m_SizeDelta: {x: 924.9, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6674535296452004502 MonoBehaviour: @@ -4978,14 +5312,14 @@ RectTransform: m_Children: - {fileID: 6674535296333067623} - {fileID: 6674535297888432879} - - {fileID: 6674535297057631880} + - {fileID: 2997030700277455518} m_Father: {fileID: 6674535297821892818} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 450, y: -30.86} - m_SizeDelta: {x: 900, y: 61.72} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 900, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6674535296717857663 CanvasRenderer: @@ -5558,7 +5892,7 @@ RectTransform: - {fileID: 6674535296905616216} - {fileID: 6674535296497147603} m_Father: {fileID: 6319587351412410082} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5634,10 +5968,10 @@ RectTransform: m_Father: {fileID: 6674535297544090741} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 412.7, y: -476.875} - m_SizeDelta: {x: 825.4, y: 667.43} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 412.7, y: 0} + m_SizeDelta: {x: 825.4, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7346170022788454816 MonoBehaviour: @@ -5705,12 +6039,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6674535296717857660} - m_RootOrder: 2 + m_Father: {fileID: 6319587351412410082} + 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: 333, y: -59.2} + m_AnchoredPosition: {x: 529, y: 4.4799995} m_SizeDelta: {x: 286.61, y: 80.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6674535297057631882 @@ -6171,10 +6505,10 @@ RectTransform: m_Father: {fileID: 6674535296229178769} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 535.15, y: 22} - m_SizeDelta: {x: 670.3, y: 82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 670.3, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &6674535297518341898 CanvasRenderer: @@ -6237,7 +6571,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6674535297544090741 RectTransform: m_ObjectHideFlags: 0 @@ -6260,7 +6594,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 4, y: 12} - m_SizeDelta: {x: 924.9, y: 830.59} + m_SizeDelta: {x: 924.9, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6674535297544090736 CanvasRenderer: @@ -6340,12 +6674,13 @@ RectTransform: - {fileID: 6674535295941555060} - {fileID: 6674535296682107925} - {fileID: 6674535296229178769} + - {fileID: 4189421130390394065} m_Father: {fileID: 6674535297047208383} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 99.14, y: -273.14} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 90.28, y: 90.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6674535297652902540 @@ -6791,16 +7126,14 @@ RectTransform: m_Children: - {fileID: 6674535296717857660} - {fileID: 6674535295989938524} - - {fileID: 4632894044974008664} - - {fileID: 2556807525071909064} m_Father: {fileID: 6674535297544090741} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -76.979996} - m_SizeDelta: {x: 100, y: 153.95999} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!114 &2003090693943887253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7098,7 +7431,6 @@ GameObject: - component: {fileID: 6360330089692946623} - component: {fileID: 6751857522063487850} - component: {fileID: 4895371788250988526} - - component: {fileID: 4380261233603830200} m_Layer: 0 m_Name: ActiveBtn m_TagString: Untagged @@ -7118,13 +7450,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 337225397030718338} - m_Father: {fileID: 6674535297821892818} - m_RootOrder: 3 + m_Father: {fileID: 2997030700277455518} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 607, y: -28} - m_SizeDelta: {x: 58, y: 58} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 48, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6360330089692946623 CanvasRenderer: @@ -7205,26 +7537,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &4380261233603830200 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6975896323061029864} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 --- !u!1 &7177798478496537727 GameObject: m_ObjectHideFlags: 0 @@ -7253,6 +7565,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6674535297251089022} + - {fileID: 6674535297057631880} - {fileID: 6674535297032631426} m_Father: {fileID: 6674535295989938524} m_RootOrder: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index 6bf336ea0d..c3fbf33b91 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -560,6 +560,7 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill) end return heroData.star,index end + heroData.HeroTraining=_msgHeroData.training return heroData end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 95fdadd320..6651d910d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -101,6 +101,8 @@ function RoleInfoPopup:InitComponent() this.potentyPre=Util.GetGameObject(this.potentyGrid,"giftPre") --技能 this.skillInfo = Util.GetGameObject(self.transform, "Panel/Scroll View/Viewport/Content/skillInfo") + this.trainlevel = Util.GetGameObject(this.skillInfo, "TitleBG/traininglv") + this.trainBtn = Util.GetGameObject(this.skillInfo, "TitleBG/training") this.skillGrid = Util.GetGameObject(this.skillInfo, "Grid") this.skillPre=Util.GetGameObject(this.godPrintGrid,"S1") @@ -210,6 +212,9 @@ function RoleInfoPopup:BindEvent() end Game.GlobalEvent:AddEvent(GameEvent.UI.OnClose, triggerCallBack) end) + Util.AddClick(this.trainBtn,function () + UIManager.OpenPanel(UIName.SpecailTrainingInfoPopup,curHeroData,2) + end) end --添加事件监听(用于子类重写) @@ -594,6 +599,7 @@ function this.SkillInfo() if curHeroData.heroConfig.MaxRank>9 then skillList2 = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas2(curHeroData.heroConfig.Id,10,curHeroData.star) end + this.trainlevel:GetComponent("Text").text=Language[12326]..NumToComplexFont[curHeroData.HeroTraining.trainingLv]..Language[10065] for i = 1, this.skillGrid.transform.childCount do this.skillGrid.transform:GetChild(i-1).gameObject:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index a7d664748f..b4a4e6465f 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -265,7 +265,7 @@ function RoleInfoPanel:BindEvent() end) --特训 Util.AddClick(this.trainingClick, function() - UIManager.OpenPanel(UIName.SpecailTrainingInfoPopup,curHeroData) + UIManager.OpenPanel(UIName.SpecailTrainingInfoPopup,curHeroData,1) end) --魂印 Util.AddClick(this.soulPrintBtn, function() @@ -380,7 +380,8 @@ function RoleInfoPanel:OnShow() this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj) this.curLiveObj = HeroManager.LoadHerolive(curHeroData,this.curObj) - + local t=ConfigManager.TryGetAllConfigsDataByKey(ConfigName.Train,"HeroID",curHeroData.id) + this.trainingBtn:SetActive(#t~=0) local leftToward=0 if leftHeroData.skinId and leftHeroData.skinId~=0 then local roleCon=ConfigManager.TryGetConfigData(ConfigName.RoleConfig,leftHeroData.skinId) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua index 1b79d06851..4360b9bcf5 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua @@ -27,6 +27,7 @@ function SpecailTrainingInfoPopup:InitComponent() self.textList = {} self.attList={} self.attSkill={} + self.OpenType=1 end @@ -41,10 +42,12 @@ end function SpecailTrainingInfoPopup:RemoveListener() end -function SpecailTrainingInfoPopup:OnOpen(curHeroData) +--type 1 是自己的英雄打开 --type 2 是别人的英雄打开 +function SpecailTrainingInfoPopup:OnOpen(curHeroData,OpenType) self._curHerodata = curHeroData self._HeroTraining=curHeroData.HeroTraining self.showList={} + self.OpenType=OpenType self.curLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",self._HeroTraining.trainingLv) end @@ -79,32 +82,41 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) local title = Util.GetGameObject(_go,"HeroInfo/title/Text"):GetComponent("Text") title.text= Language[12326]..Language[10000+tData.Level]..Language[10065] local heroContion= Util.GetGameObject(_go,"HeroInfo/heroContion") - local condition= Util.GetGameObject(_go,"HeroInfo/title/condition"):GetComponent("Text") + local condition= Util.GetGameObject(heroContion,"condition"):GetComponent("Text") local Content=Util.GetGameObject(_go,"Content") local SkillContent=Util.GetGameObject(_go,"SkillContent") local attPre=Util.GetGameObject(_go,"Content/attPre") local numPre= Util.GetGameObject(_go,"Content/attPre/numPre") - local mySelfCondition= Util.GetGameObject(_go,"HeroInfo/mySelfCondition"):GetComponent("Text") + local mySelfCondition= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/mySelfCondition"):GetComponent("Text") + local trainingIcon= Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/trainingIcon") local isOpen=self._curHerodata.star>=tData.MyselfCondition and curLevel>=tData.Level - - mySelfCondition.gameObject:SetActive(tData.MyselfCondition~=0) - mySelfCondition.text=NumToChinese[tData.MyselfCondition==0 and 1 or tData.MyselfCondition].."星开启" - if tData.OtherCondition then - if type(tData.OtherCondition[1][1])=="userdata" then - heroContion:SetActive(false) + local lastLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",tData.Level-1) + if tData.Level>1 then + mySelfCondition.gameObject:SetActive(lastLevelData.MyselfCondition~=0) + mySelfCondition.text=NumToChinese[lastLevelData.MyselfCondition==0 and 1 or lastLevelData.MyselfCondition].."星开启" + condition.gameObject:SetActive(lastLevelData.Desc~="") + condition.text=lastLevelData.Desc + if lastLevelData.OtherCondition then + if type(lastLevelData.OtherCondition[1][1])=="userdata" then + heroContion:SetActive(false) else - heroContion:SetActive(true) - for i=1, #tData.OtherCondition do - local t= Util.GetGameObject(heroContion.transform,"HeroList/hero"..tostring(i).."/hero/icon"):GetComponent("Image") - t.sprite=self.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"Id",tData.OtherCondition[i][1]).Icon)) - end - + heroContion:SetActive(true) + for i=1, #lastLevelData.OtherCondition do + local t= Util.GetGameObject(heroContion.transform,"HeroList/hero"..tostring(i).."/hero/icon"):GetComponent("Image") + t.sprite=self.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig,"Id",lastLevelData.OtherCondition[i][1]).Icon)) + end + end + else + heroContion:SetActive(false) + end - else + else heroContion:SetActive(false) + mySelfCondition.gameObject:SetActive(false) + condition.gameObject:SetActive(false) end - condition.gameObject:SetActive(tData.Desc~="") - condition.text=tData.Desc + trainingIcon:SetActive(tData.Level==curLevel and self._curHerodata.HeroTraining.isTraining==1) + --最外层Pre if not self.attList[_go] then self.attList[_go] = {} @@ -118,7 +130,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) v[1].gameObject:SetActive(false) end end - local ActiveButton = Util.GetGameObject(_go,"HeroInfo/ActiveBtn") + local ActiveButton = Util.GetGameObject(_go,"HeroInfo/title/TrainingStatus/ActiveBtn") local TrainingSetting=ConfigManager.GetConfigDataByDoubleKey(ConfigName.TrainSetting,"PoolID",tData.TrainSettingID,"Level",tData.Level) for i = 1, 3 do @@ -153,7 +165,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) end) NoOpen:SetActive(not isOpen); Finishi:SetActive(false); - Button.gameObject:SetActive(isOpen); + -- local string,string2 = PracticeManager.GetPreviewSingleText(templist[i].id,templist[i].value) @@ -192,6 +204,8 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) if tData.Level>curLevel then curExp=0 end + + Button.gameObject:SetActive(isOpen and self.OpenType==1); local size = curExp/trainExp if curExp>=trainExp then Button.gameObject:SetActive(false); @@ -218,7 +232,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) else activeIsOpen=false end - ActiveButton:SetActive(activeIsOpen) + ActiveButton:SetActive(activeIsOpen and self.OpenType==1) Util.AddOnceClick(ActiveButton, function() NetManager.TrainingUpLvRequest(tostring( self._curHerodata.dynamicId),function() self.curLevelData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.Train,"HeroID",self._curHerodata.id,"Level",self._curHerodata.HeroTraining.trainingLv) @@ -250,7 +264,12 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) local Name=Util.GetGameObject( SkillContent,"IconBG/Text"):GetComponent("Text") local Desc=Util.GetGameObject( SkillContent,"IconBG/des1/Text"):GetComponent("Text") local itemPre=Util.GetGameObject( SkillContent,"Chose/Content/itemPre") + local localContent=Util.GetGameObject( SkillContent,"Chose/Content") + local Chose=Util.GetGameObject( SkillContent,"Chose") local skillBtn=Util.GetGameObject( SkillContent,"Chose/Button") + local tip=Util.GetGameObject( SkillContent,"Chose/Tip") + local tip2=Util.GetGameObject( SkillContent,"IconBG/Tip2") + tip:GetComponent("Text").text="特训"..NumToChinese [tData.Level].."级开启" Util.AddOnceClick(skillBtn,function() if curLevel==tData.Level and (TrainingSetting.TrainExp1>self._curHerodata.HeroTraining.attackExp or TrainingSetting.TrainExp2>self._curHerodata.HeroTraining.defenseExp or TrainingSetting.TrainExp3>self._curHerodata.HeroTraining.hpExp )then PopupTipPanel.ShowTip(Language[12268]) @@ -290,8 +309,28 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) ) icon.sprite=self.spLoader:LoadSprite(GetResourcePath(skill.Icon)) Name.text=skill.Name - Desc.text=skill.Desc - + Desc.text=skill.Desc + if self.OpenType==1 then + if CheckListIsContainValue1(self._curHerodata.HeroTraining.unlockIds,tData.Id) then + Chose:SetActive(false) + tip2:SetActive(true) + else + Chose:SetActive(true) + tip2:SetActive(false) + end + else + if CheckListIsContainValue1(self._curHerodata.HeroTraining.unlockIds,tData.Id) then + Chose:SetActive(false) + tip2:SetActive(true) + localContent:SetActive(true) + skillBtn:SetActive(true) + else + Chose:SetActive(true) + tip2:SetActive(false) + localContent:SetActive(false) + skillBtn:SetActive(false) + end + end local tmpData={} for i=1,#tData.NeedItem1 do tmpData[i]={} @@ -377,7 +416,8 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) singleSkillList[i]:SetActive(true) end - else + + else SkillContent:SetActive(false) end @@ -393,6 +433,7 @@ end function SpecailTrainingInfoPopup:OnClose() selectSkillUnlockItems1={} selectSkillUnlockItems2={} + self.OpenType=1 end function SpecailTrainingInfoPopup:OnDestroy()