diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png new file mode 100644 index 0000000000..353675df65 Binary files /dev/null and b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png differ diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta new file mode 100644 index 0000000000..c96290dd8c --- /dev/null +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_hero_jineng_tian.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2cf41b512bcd93648a1c34d3bdab6b2b +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: 2f0f0feb38e63a048ab7749e823a0755 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: HeroAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta b/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta index 23e3049cdd..2de6844326 100644 --- a/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta +++ b/Assets/ManagedResources/Atlas/HeroAtlas/r_tongyong_shenhun_icon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b4fbc1b043f0d3b459ef1743b24cb849 +guid: a2b5055e009b24343a5917735d90b92b TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: 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 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: d54e37fc423e0fe45b2299f25b7a0851 + spriteID: bb7a89aa65946054b82a639cb36ea2a9 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab index 289fba9575..4f6f36b125 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SkillInfoPopup.prefab @@ -76,101 +76,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &885351063493527978 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4154239177533303857} - - component: {fileID: 6871622883756293186} - - component: {fileID: 8611141055276569167} - - component: {fileID: 5056131969430361751} - m_Layer: 5 - m_Name: line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4154239177533303857 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - 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: 7775848301174822185} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 4.58, y: -13.59} - m_SizeDelta: {x: 441.4, y: 2} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &6871622883756293186 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - m_CullTransparentMesh: 0 ---- !u!114 &8611141055276569167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - 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: 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_Sprite: {fileID: 21300000, guid: 36e05fe912e1e9e47aef85f30fd11d93, 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 &5056131969430361751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885351063493527978} - 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 &1272730104103476269 GameObject: m_ObjectHideFlags: 0 @@ -1056,7 +961,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7776147267272310759} - - {fileID: 4154239177533303857} m_Father: {fileID: 4824128418226270383} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 3acf92a274..3768f0a36a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -43010,6 +43010,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224353307690090294} + - {fileID: 6637659864277122635} - {fileID: 224121395815468788} - {fileID: 224681068575272128} m_Father: {fileID: 224445502205186148} @@ -63100,7 +63101,7 @@ RectTransform: - {fileID: 224129801811890890} - {fileID: 8795387183264503407} m_Father: {fileID: 224558474284908024} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -87281,9 +87282,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8204720010108857596} - - {fileID: 4573250569383195525} m_Father: {fileID: 224558474284908024} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -96799,81 +96799,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8D64\u708E\u836F\u5E08" LanguageIndex: 10898 ---- !u!1 &156519083606563073 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4294846205027911603} - - component: {fileID: 3304244818298500556} - - component: {fileID: 4338796073857792544} - m_Layer: 5 - m_Name: TitleBg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4294846205027911603 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156519083606563073} - 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: 6906339372280010588} - m_Father: {fileID: 468245187776722909} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 81.65005} - m_SizeDelta: {x: 387.2, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3304244818298500556 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156519083606563073} - m_CullTransparentMesh: 0 ---- !u!114 &4338796073857792544 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 156519083606563073} - 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: 0.9528302, g: 0.774318, b: 0.63372195, 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_Sprite: {fileID: 21300000, guid: 6855519ff9d6ad742bd124d6932043ac, 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 &423002597689776110 GameObject: m_ObjectHideFlags: 0 @@ -97177,6 +97102,82 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1044067860525199598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6811487750097457237} + - component: {fileID: 8958681429632674031} + - component: {fileID: 7595094421135736355} + m_Layer: 5 + m_Name: Pos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6811487750097457237 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044067860525199598} + 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: 3787308882671181896} + - {fileID: 1228224766086152148} + m_Father: {fileID: 468245187776722909} + 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: 269.8, y: -38.149994} + m_SizeDelta: {x: 287, y: 142.40002} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8958681429632674031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044067860525199598} + 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: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &7595094421135736355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1044067860525199598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1165459557923164387 GameObject: m_ObjectHideFlags: 0 @@ -182549,6 +182550,52 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u786E \u5B9A" LanguageIndex: 10152 +--- !u!1 &1691056267236155436 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7495242390579781977} + - component: {fileID: 3260145328625104902} + m_Layer: 5 + m_Name: TitleBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7495242390579781977 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691056267236155436} + 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: 4930794380363053426} + - {fileID: 1328168189959362842} + m_Father: {fileID: 468245187776722909} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -258, y: -38.149963} + m_SizeDelta: {x: 347.64, y: 142.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3260145328625104902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691056267236155436} + m_CullTransparentMesh: 0 --- !u!1 &1790930152063138769 GameObject: m_ObjectHideFlags: 0 @@ -192033,7 +192080,7 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &1804913774911209981 +--- !u!1 &1884766110686385504 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -192041,79 +192088,58 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6906339372280010588} - - component: {fileID: 3188727142546430765} - - component: {fileID: 6579913159305037139} - - component: {fileID: 5455799123382695942} + - component: {fileID: 1228224766086152148} + - component: {fileID: 888004739153871973} + - component: {fileID: 3555795162194110844} m_Layer: 5 - m_Name: Title + m_Name: PosText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6906339372280010588 +--- !u!224 &1228224766086152148 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1884766110686385504} + 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: 4294846205027911603} - m_RootOrder: 0 + m_Father: {fileID: 6811487750097457237} + 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: 193.6, y: 8.849976} - m_SizeDelta: {x: 404.7, y: 70} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3188727142546430765 + m_AnchoredPosition: {x: 174.5, y: -71.20001} + m_SizeDelta: {x: 225, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &888004739153871973 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} + m_GameObject: {fileID: 1884766110686385504} m_CullTransparentMesh: 0 ---- !u!114 &6579913159305037139 +--- !u!114 &3555795162194110844 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} + m_GameObject: {fileID: 1884766110686385504} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 70 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &5455799123382695942 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1804913774911209981} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 0.9019608, g: 0.7921569, b: 0.627451, a: 1} + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -192121,19 +192147,18 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_MinSize: 4 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5149\u73AF \u56DE\u6012 \u65E0\u654C" - LanguageIndex: 11490 + m_Text: "\u707C\u70E7\u961F\u8F85\u52A9" --- !u!1 &1927312550457178104 GameObject: m_ObjectHideFlags: 0 @@ -192249,6 +192274,86 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &2040858868293623553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1328168189959362842} + - component: {fileID: 2614135478898552151} + - component: {fileID: 8336839007626671309} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1328168189959362842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040858868293623553} + 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: 7495242390579781977} + 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: 234.52, y: -71.2} + m_SizeDelta: {x: 321.15, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2614135478898552151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040858868293623553} + m_CullTransparentMesh: 0 +--- !u!114 &8336839007626671309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040858868293623553} + 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.9019608, g: 0.7921569, b: 0.627451, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 55 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5149\u73AF \u56DE\u6012 \u65E0\u654C" + LanguageIndex: 0 --- !u!1 &2205073105291886742 GameObject: m_ObjectHideFlags: 0 @@ -192397,6 +192502,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &3449381789191473778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4930794380363053426} + - component: {fileID: 3778598524646794727} + - component: {fileID: 1410323929195104986} + m_Layer: 5 + m_Name: po + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4930794380363053426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3449381789191473778} + 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: 7495242390579781977} + 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: 31, y: -71.2} + m_SizeDelta: {x: 70, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3778598524646794727 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3449381789191473778} + m_CullTransparentMesh: 0 +--- !u!114 &1410323929195104986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3449381789191473778} + 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: 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_Sprite: {fileID: 21300000, guid: 02b8bbbaafb89d84a99da3dc5017a5aa, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3699904631118917597 GameObject: m_ObjectHideFlags: 0 @@ -255322,7 +255501,7 @@ RectTransform: m_Children: - {fileID: 439766457450116605} m_Father: {fileID: 468245187776722909} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -255369,6 +255548,196 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5321688270316283741} m_CullTransparentMesh: 0 +--- !u!1 &5683555352183435737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3787308882671181896} + - component: {fileID: 1205094569297172439} + - component: {fileID: 8520049788795518155} + - component: {fileID: 1438423483563911247} + m_Layer: 5 + m_Name: PosImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3787308882671181896 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + 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: 6811487750097457237} + 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: 31, y: -71.20001} + m_SizeDelta: {x: 62, y: 62} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1205094569297172439 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + m_CullTransparentMesh: 0 +--- !u!114 &8520049788795518155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + 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: 99ac359296768a54990c6e2a8912efae, 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 &1438423483563911247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5683555352183435737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 62 + m_PreferredHeight: 62 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &5696048352838328926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6637659864277122635} + - component: {fileID: 2473743150135751695} + - component: {fileID: 5830598276207552205} + - component: {fileID: 1084146396283711813} + m_Layer: 5 + m_Name: posQuality + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6637659864277122635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + 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: 224558474284908024} + 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: -366, y: 644} + m_SizeDelta: {x: 156, y: 422} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2473743150135751695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + m_CullTransparentMesh: 0 +--- !u!114 &5830598276207552205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + 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: 78763a042307189468192e0bc0b018b9, 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 &1084146396283711813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5696048352838328926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 62 + m_PreferredHeight: 62 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &5779875340601305572 GameObject: m_ObjectHideFlags: 0 @@ -255724,236 +256093,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!1 &7354958877339657946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1222144166322523087} - - component: {fileID: 1701758990595977622} - - component: {fileID: 2677216368538382960} - m_Layer: 5 - m_Name: PosText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1222144166322523087 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354958877339657946} - 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: 4573250569383195525} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -12.275} - m_SizeDelta: {x: 46.01, y: 217.55} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1701758990595977622 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354958877339657946} - m_CullTransparentMesh: 0 ---- !u!114 &2677216368538382960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7354958877339657946} - 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.90196085, g: 0.7803922, b: 0.49803925, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u707C\u70E7\u961F\u8F85\u52A9" - LanguageIndex: 10916 ---- !u!1 &7760986139338632641 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4115362798329252288} - - component: {fileID: 8917331983395831021} - - component: {fileID: 174781018756952109} - m_Layer: 5 - m_Name: PosImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4115362798329252288 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760986139338632641} - 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: 4573250569383195525} - 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: 0, y: 127.5} - m_SizeDelta: {x: 62, y: 62} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8917331983395831021 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760986139338632641} - m_CullTransparentMesh: 0 ---- !u!114 &174781018756952109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7760986139338632641} - 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: 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_Sprite: {fileID: 21300000, guid: 83432f17b727aa740aa065d3a17c5484, 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 &7902120421258653545 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4573250569383195525} - - component: {fileID: 774209003986926821} - - component: {fileID: 4352305618709847796} - m_Layer: 5 - m_Name: Pos - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4573250569383195525 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902120421258653545} - 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: 4115362798329252288} - - {fileID: 1222144166322523087} - m_Father: {fileID: 224121395815468788} - 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: -438.9, y: 1275} - m_SizeDelta: {x: 76, y: 317} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &774209003986926821 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902120421258653545} - m_CullTransparentMesh: 0 ---- !u!114 &4352305618709847796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7902120421258653545} - 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: 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_Sprite: {fileID: 21300000, guid: 160f9d20d35bf3c47937e17cd7060d09, 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 &8029049751717713216 GameObject: m_ObjectHideFlags: 0 @@ -255986,7 +256125,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 480935560315310008} - - {fileID: 4294846205027911603} + - {fileID: 7495242390579781977} + - {fileID: 6811487750097457237} - {fileID: 9144041776289725838} m_Father: {fileID: 8204720010108857596} m_RootOrder: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index 50ffc0cbee..0013935ef5 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -629,9 +629,9 @@ RectTransform: m_Father: {fileID: 5493559332277853408} 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: 31, y: -71.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1173538945110251614 @@ -2668,7 +2668,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 126.5, y: 31.695} + m_AnchoredPosition: {x: 94.5, y: 20.7} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2722006554956443899 @@ -3207,7 +3207,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: b4fbc1b043f0d3b459ef1743b24cb849, type: 3} + m_Sprite: {fileID: 21300000, guid: a2b5055e009b24343a5917735d90b92b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3290,6 +3290,8 @@ GameObject: - component: {fileID: 871027738489403935} - component: {fileID: 5274284421785695141} - component: {fileID: 238968780715353373} + - component: {fileID: 1116243716763637883} + - component: {fileID: 3232807113400389329} m_Layer: 5 m_Name: posBtn m_TagString: Untagged @@ -3313,11 +3315,11 @@ RectTransform: m_Father: {fileID: 7662967509015272728} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 389.78998, y: -49.5} - m_SizeDelta: {x: -685.15, y: 142.4} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -33.58, y: -49.5} + m_SizeDelta: {x: 0, y: 142.4} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &650529087623267775 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3416,6 +3418,43 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1116243716763637883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3697084287494790549} + 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: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &3232807113400389329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3697084287494790549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &3748087398088511068 GameObject: m_ObjectHideFlags: 0 @@ -3662,6 +3701,7 @@ GameObject: - component: {fileID: 3915846666900563107} - component: {fileID: 35534546367631598} - component: {fileID: 6308169570023901556} + - component: {fileID: 7459288734510652830} m_Layer: 5 m_Name: PosInfo m_TagString: Untagged @@ -3683,11 +3723,11 @@ RectTransform: m_Father: {fileID: 5493559332277853408} 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: 234.52, y: -71.2} - m_SizeDelta: {x: 321.15, y: 85} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 70, y: 0} + m_SizeDelta: {x: 0, y: 85} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &35534546367631598 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3723,7 +3763,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 55 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -3731,6 +3771,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5149\u73AF \u56DE\u6012 \u65E0\u654C" LanguageIndex: 0 +--- !u!114 &7459288734510652830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4065605281392485048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &4096148106584707376 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index b05919edd8..1f9f8f3924 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -54086,8 +54086,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.099976, y: -302.8} - m_SizeDelta: {x: 227, y: 210} + m_AnchoredPosition: {x: -116.8, y: -274} + m_SizeDelta: {x: 198.7, y: 183.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6900503861996968449 CanvasRenderer: @@ -54374,7 +54374,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -116.8, y: -162.5} - m_SizeDelta: {x: 198.69995, y: 183.8} + m_SizeDelta: {x: 121, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7345339821710159408 CanvasRenderer: @@ -54477,9 +54477,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6121298216406054189} - {fileID: 1243633643177871126} - {fileID: 4335717813882998829} - - {fileID: 6121298216406054189} - {fileID: 224438664217865725} m_Father: {fileID: 224750236772289674} m_RootOrder: 6 @@ -54487,7 +54487,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 203, y: -177} - m_SizeDelta: {x: 243, y: 84} + m_SizeDelta: {x: 405, y: 138} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3901079369435443197 CanvasRenderer: @@ -55242,7 +55242,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6768597193923982555} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -55322,8 +55322,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -116.1, y: -469.7} - m_SizeDelta: {x: 152, y: 152} + m_AnchoredPosition: {x: -116.8, y: -417} + m_SizeDelta: {x: 124, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2420754012896772010 CanvasRenderer: @@ -56286,15 +56286,15 @@ RectTransform: m_GameObject: {fileID: 5189905295769671105} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6768597193923982555} - 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: 85.81002, y: -10} - m_SizeDelta: {x: 127.42, y: 30} + m_AnchoredPosition: {x: 54.5, y: -14.8} + m_SizeDelta: {x: 190.6, y: 61.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4654559960055660368 CanvasRenderer: @@ -56350,7 +56350,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -32.08 + _textSpacing: -30.48 --- !u!1 &5361733365052867487 GameObject: m_ObjectHideFlags: 0 @@ -57137,7 +57137,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6768597193923982555} - 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} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e448f20711..7f4bc067e0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2654,7 +2654,8 @@ EquipTreasureTypeStr = { "r_hero_jineng_fahong", --法宝 4 "r_hero_jineng_tianjin", --天赋角标 9 "r_hero_jineng_tianhong", --天赋角标 10 - "r_hero_jineng_tianbaijin", --天赋角标(觉醒以后) 11 + "r_hero_jineng_tianbaijin", --天赋角标(觉醒) 11 + "r_hero_jineng_tian", --天赋角标(觉醒以后) 12 "r_hero_jineng_hun", --神魂角标 8 } diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua index 2784d7eac9..5eb3356c97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua @@ -83,8 +83,6 @@ function this:OnOpen(...) this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Jue])--绝技 elseif curSkillData.skillConfig.Type == SkillType.Bei then this.skillTypeImage.sprite=this.spLoader:LoadSprite(SkillIconType[SkillType.Bei])--被动技 - this.skillTypeImage.enabled = false - this.skillTypeText.gameObject:SetActive(true) end -- this.cureffect.transform:DOAnchorPosY(0,0,true) -- this.cureffect.text = GetCurrSkillConfigDesc(curSkillData.skillConfig,soulLv) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua index a982831827..9d7a37d382 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua @@ -61,14 +61,16 @@ function SingleRecruitPanel:InitComponent() this.UI_Effect_choukaR = Util.GetGameObject(self.transform, "bg/UI_Effect_chouka_R") this.jumpBtn = Util.GetGameObject(this.jumpPanel.transform, "btnContinue/jumpBtn") this.jumpBtnGo = Util.GetGameObject(this.jumpPanel.transform, "btnContinue") - self.posImage=Util.GetGameObject(self.transform,"Pos/PosImage"):GetComponent("Image") - self.posText=Util.GetGameObject(self.transform,"Pos/PosText"):GetComponent("Text") + self.posImage=Util.GetGameObject(self.gameObject,"rolePanel/rolePanel1/Panel/Info/Pos/PosImage"):GetComponent("Image") + self.posText=Util.GetGameObject(self.gameObject,"rolePanel/rolePanel1/Panel/Info/Pos/PosText"):GetComponent("Text") this.info=Util.GetGameObject(self.gameObject,"rolePanel/rolePanel1/Panel/Info") this.infoTitleBg=Util.GetGameObject(this.info,"TitleBg") this.infoTitle=Util.GetGameObject(this.infoTitleBg,"Title"):GetComponent("Text") this.infoBody=Util.GetGameObject(this.info,"BodyBg/Viewport/Body"):GetComponent("Text") this.infoBodyGo=Util.GetGameObject(this.info,"BodyBg") + + this.posQuality=Util.GetGameObject(self.transform,"rolePanel/posQuality"):GetComponent("Image") end --绑定事件(用于子类重写) @@ -366,6 +368,7 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) this.info:SetActive(heroStaticData.Star == 5 or heroStaticData.Star == 4) this.infoBodyGo:SetActive(heroStaticData.Star == 5) this.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1) + this.posQuality.sprite=this.spLoader:LoadSprite(GetHeroQualityStr(heroStaticData.Natural)) if heroStaticData.Star == 5 then local t={} local upStarSkillDataList={} --数据容器 @@ -427,7 +430,6 @@ function SingleRecruitPanel:UpdataPanelData(_heroData) -- self.profession.sprite = this.spLoader:LoadSprite(GetJobSpriteStrByJobNum(heroStaticData.Profession)) self.proImage.sprite =this.spLoader:LoadSprite(GetProStrImageByProNum(heroStaticData.PropertyName)) self.heroName.text =GetLanguageStrById(heroStaticData.ReadingName) --string.format("lv.%s", heroData.lv) - Util.GetGameObject(self.transform,"Pos"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroPosBgStr(heroStaticData.Profession)) self.posImage.sprite=this.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession)) self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation) SetTextVerTial(self.posText.gameObject,Vector3.New(63.76,1.5,0),"MiddleLeft") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 8ee99aedbc..8d55d55600 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -434,15 +434,15 @@ function this.GetSkillsData() heroSkill.state = 1 if curHeroData.star == 12 then heroSkill.Icon = "r_tongyong_feisheng_icon1" --飞升一 - heroSkill.Type = 7 + heroSkill.Type = 8 heroSkill.quality = 1 elseif curHeroData.star == 13 then heroSkill.Icon = "r_tongyong_feisheng_icon2" --飞升二 - heroSkill.Type = 7 + heroSkill.Type = 8 heroSkill.quality = 1 elseif curHeroData.star > 13 then heroSkill.Icon = "r_tongyong_feisheng_icon3" --飞升三 - heroSkill.Type = 7 + heroSkill.Type = 8 heroSkill.quality = 1 elseif curHeroData.star == 11 then heroSkill.Icon = "r_tongyong_tianfu_icon" --觉醒 @@ -466,7 +466,7 @@ function this.GetSkillsData() local heroSkill = {} heroSkill.skillId = 0 heroSkill.skillConfig = nil - heroSkill.Type = 8 + heroSkill.Type = 9 heroSkill.Skilltips = nil heroSkill.Name = nil heroSkill.Icon = "r_tongyong_shenhun_icon" @@ -616,9 +616,9 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills if this.skillPanel then UIManager.ClosePanel(UIName.SkillInfoPopup) end - if this.skillData[i].Type > 4 and this.skillData[i].Type < 8 then + if this.skillData[i].Type > 4 and this.skillData[i].Type < 9 then UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) - elseif this.skillData[i].Type == 8 then + elseif this.skillData[i].Type == 9 then if this.skillData[i].state == 0 then UIManager.OpenPanel(UIName.RoleGodSoulLayout,curHeroData.heroConfig,11) else @@ -629,7 +629,6 @@ function this.UpdateHeroUpStarProUpSkillShow(skillGridGO,skillTabs,passiveSkills end) end end - LogGreen("#this.skillData:"..#this.skillData) if #this.skillData > 2 then this.line1.gameObject:SetActive(true) else @@ -926,7 +925,7 @@ function this.OnUpdate() --长按 if Time.realtimeSinceStartup - this.timePressStarted > 0.4 then if timer <= 0 then - timer = timer + 0.2 + timer = timer + 0.15 _isLongPress = true this:LvUpClick(false) end