Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts: # Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab # Assets/ManagedResources/ResConfigs/ResourcePathConfig.assetdev_chengFeng
commit
fab5388536
Binary file not shown.
After Width: | Height: | Size: 265 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6c40cbcc7561b894299094265f2b5f6b
|
||||
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: 7a800a820072eef43a2f9f3cea38105d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TaiChuMiJuan
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7e20cdcea47b9244a9e92181e5623155
|
||||
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: 369, y: 754, z: 379, w: 708}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- 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: f71240a50b2a54d4093622b25e9f7535
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TaiChuMiJuan
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -939,86 +939,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: 2/2
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &748279275531520318
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5554396077996198771}
|
||||
- component: {fileID: 7733369986452347242}
|
||||
- component: {fileID: 7725914197097032385}
|
||||
m_Layer: 0
|
||||
m_Name: rate
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5554396077996198771
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 748279275531520318}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4402886311754985012}
|
||||
m_RootOrder: 0
|
||||
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: 0, y: 15}
|
||||
m_SizeDelta: {x: 100, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7733369986452347242
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 748279275531520318}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7725914197097032385
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 748279275531520318}
|
||||
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.92941177, g: 0.7137255, b: 0.29803923, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 99%
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &858017585524009983
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4797,81 +4717,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2654833333875093375
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8974435654369237730}
|
||||
- component: {fileID: 5506888490575211842}
|
||||
- component: {fileID: 7641064110401406138}
|
||||
m_Layer: 0
|
||||
m_Name: bottom
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8974435654369237730
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2654833333875093375}
|
||||
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: 3561782463372132795}
|
||||
m_Father: {fileID: 9055577096394680686}
|
||||
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: 0, y: 27}
|
||||
m_SizeDelta: {x: 900, y: 84}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5506888490575211842
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2654833333875093375}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7641064110401406138
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2654833333875093375}
|
||||
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: 7a37c8663d7814543baf6de1e8b993be, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2714905361555327835
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5198,6 +5043,86 @@ MonoBehaviour:
|
|||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2854168830860709693
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2794461961453412777}
|
||||
- component: {fileID: 7009010040367424077}
|
||||
- component: {fileID: 757626557383606599}
|
||||
m_Layer: 0
|
||||
m_Name: Star
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2794461961453412777
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2854168830860709693}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -93.25}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4250835300878011901}
|
||||
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: 312, y: 0}
|
||||
m_SizeDelta: {x: 136.09998, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7009010040367424077
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2854168830860709693}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &757626557383606599
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2854168830860709693}
|
||||
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.97647065, g: 0.7607844, b: 0.5058824, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9700\u898130"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &2919348480456994023
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5560,86 +5485,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "<color=#31FF00>\u540C\u7CFB</color>\u795E\u5C06<color=#31FF00>\u6BCF\u65E5</color>\u53EA\u53EF<color=#31FF00>\u9009\u62E9\u5E76\u83B7\u53D6\u4E00\u6B21</color>\u6982\u7387\u63D0\u5347"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &3398583330067361526
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3322469156518671238}
|
||||
- component: {fileID: 4982216009507940444}
|
||||
- component: {fileID: 2366484734779397708}
|
||||
m_Layer: 0
|
||||
m_Name: title
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3322469156518671238
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3398583330067361526}
|
||||
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: 6122998974980818414}
|
||||
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: 594}
|
||||
m_SizeDelta: {x: 384.31, y: 64.41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4982216009507940444
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3398583330067361526}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2366484734779397708
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3398583330067361526}
|
||||
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.9882353, g: 0.9607843, b: 0.827451, 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: 50
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u5956\u52B1\u8BE6\u60C5"
|
||||
LanguageIndex: 11266
|
||||
--- !u!1 &3424780219633728697
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5993,43 +5838,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3602317294306368723
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9055577096394680686}
|
||||
m_Layer: 0
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9055577096394680686
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3602317294306368723}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 22.75}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 928610283404527731}
|
||||
- {fileID: 8974435654369237730}
|
||||
m_Father: {fileID: 6122998974980818414}
|
||||
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: -63.4}
|
||||
m_SizeDelta: {x: 900, y: 1200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3704218281933313749
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -7105,86 +6913,6 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4359908297964994209
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3561782463372132795}
|
||||
- component: {fileID: 3511086619864554541}
|
||||
- component: {fileID: 9144015579268532486}
|
||||
m_Layer: 0
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3561782463372132795
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4359908297964994209}
|
||||
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: 8974435654369237730}
|
||||
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 &3511086619864554541
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4359908297964994209}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &9144015579268532486
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4359908297964994209}
|
||||
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.9882353, g: 0.9607843, b: 0.827451, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 50
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &4374406624893575674
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -8507,7 +8235,7 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5213656066974072310
|
||||
--- !u!1 &5208191871158868198
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
@ -8515,33 +8243,72 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 928610283404527731}
|
||||
- component: {fileID: 3827739693979613605}
|
||||
- component: {fileID: 4742467671142405772}
|
||||
- component: {fileID: 2489786142445598379}
|
||||
m_Layer: 0
|
||||
m_Name: Grid
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &928610283404527731
|
||||
--- !u!224 &3827739693979613605
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5213656066974072310}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_GameObject: {fileID: 5208191871158868198}
|
||||
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_LocalScale: {x: 0.7, y: 0.7, z: 0.8}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9055577096394680686}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 4250835300878011901}
|
||||
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: 0, y: 50}
|
||||
m_SizeDelta: {x: 900, y: 1100}
|
||||
m_AnchoredPosition: {x: 405.6, y: 2.7}
|
||||
m_SizeDelta: {x: 72, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4742467671142405772
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5208191871158868198}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2489786142445598379
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5208191871158868198}
|
||||
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: 8908080ead3926f4e9e9951397b9e29b, 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 &5356778114707042482
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -9689,150 +9456,6 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6024979662384741555}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &6033854116771934432
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4402886311754985012}
|
||||
- component: {fileID: 5903228422123585300}
|
||||
- component: {fileID: 4923269871464043821}
|
||||
- component: {fileID: 4609115193893410796}
|
||||
m_Layer: 5
|
||||
m_Name: itemPre
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4402886311754985012
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6033854116771934432}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 5554396077996198771}
|
||||
m_Father: {fileID: 6122998974980818414}
|
||||
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: -808, y: 26.65}
|
||||
m_SizeDelta: {x: 150, y: 208.71}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5903228422123585300
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6033854116771934432}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4923269871464043821
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6033854116771934432}
|
||||
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: 0
|
||||
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: 0}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &4609115193893410796
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6033854116771934432}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
tweenSequeue:
|
||||
- initV3: {x: 0, y: -20, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 11
|
||||
changeType: 0
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 0}
|
||||
- initV3: {x: 0, y: 0, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 1.15, y: 1.15, z: 1.15}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 1
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 0}
|
||||
- initV3: {x: 1.15, y: 1.15, z: 1.15}
|
||||
initFloat: 0
|
||||
isInit: 0
|
||||
changeV3: {x: 1, y: 1, z: 1}
|
||||
changeFloat: 0
|
||||
duration: 0.2
|
||||
delay: 0
|
||||
curveType: 0
|
||||
changeType: 4
|
||||
sequeueType: 0
|
||||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 0}
|
||||
isPlayAudio: 1
|
||||
isHaveCloseBtn: 0
|
||||
isPlayOnOpen: 0
|
||||
--- !u!1 &6081709781408499802
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -12129,7 +11752,6 @@ RectTransform:
|
|||
- {fileID: 4497667985347117890}
|
||||
- {fileID: 1823191076860614843}
|
||||
- {fileID: 7756266760337321785}
|
||||
- {fileID: 6122998974980818414}
|
||||
m_Father: {fileID: 1047325092235970838}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -12965,6 +12587,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2313678692522721823}
|
||||
- {fileID: 2794461961453412777}
|
||||
- {fileID: 3827739693979613605}
|
||||
m_Father: {fileID: 1126952660353491259}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -14641,53 +14265,6 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u5FC3\u613F\u795E\u5C06"
|
||||
LanguageIndex: 11266
|
||||
--- !u!1 &8623023358667449533
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6122998974980818414}
|
||||
- component: {fileID: 4739441883058836673}
|
||||
m_Layer: 5
|
||||
m_Name: GeneralBigPopup_XunBaoMiZong
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6122998974980818414
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8623023358667449533}
|
||||
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: 3322469156518671238}
|
||||
- {fileID: 9055577096394680686}
|
||||
- {fileID: 4402886311754985012}
|
||||
m_Father: {fileID: 2423465471356683207}
|
||||
m_RootOrder: 10
|
||||
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 &4739441883058836673
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8623023358667449533}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &8626664211375287488
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -276,7 +276,7 @@ RectTransform:
|
|||
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: -0.35732, y: 425}
|
||||
m_AnchoredPosition: {x: -0.35732, y: 621}
|
||||
m_SizeDelta: {x: 909.91, y: 76.8}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &200517447018466473
|
||||
|
@ -653,10 +653,10 @@ RectTransform:
|
|||
m_Father: {fileID: 199198497822447983}
|
||||
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.7999878, y: -43.5}
|
||||
m_SizeDelta: {x: 76.4, y: 854.6}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -140}
|
||||
m_SizeDelta: {x: 932.4, y: 1294.3}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &201167383377872827
|
||||
CanvasRenderer:
|
||||
|
@ -992,8 +992,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 463.10007, y: 377.71997}
|
||||
m_SizeDelta: {x: 912.8, y: 224.5}
|
||||
m_AnchoredPosition: {x: 463.10007, y: 573.72}
|
||||
m_SizeDelta: {x: 912.8, y: 424.94}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &201531387265230511
|
||||
CanvasRenderer:
|
||||
|
@ -1919,7 +1919,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: 0, y: 56.52002}
|
||||
m_AnchoredPosition: {x: 0, y: 184}
|
||||
m_SizeDelta: {x: 856.10004, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &19442842446654225
|
||||
|
@ -1975,7 +1975,7 @@ MonoBehaviour:
|
|||
- initV3: {x: 0, y: -300, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 1
|
||||
changeV3: {x: 0, y: 0, z: 0}
|
||||
changeV3: {x: 0, y: 100, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.8
|
||||
delay: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ab80274e04679574b9afa63651fa3efd
|
||||
timeCreated: 1552895521
|
||||
licenseType: Pro
|
||||
NativeFormatImporter:
|
||||
guid: 01c0eb41230a31b4f9bb8e59fe151c0c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 100100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
@ -2416,7 +2416,7 @@ BATTLE_TYPE = {
|
|||
BACK_BATTLE = 1000, -- 系统战斗回放
|
||||
EndlessMpaFight = 22, -- 无尽副本
|
||||
}
|
||||
--_1 本服 _2 跨服
|
||||
--_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断
|
||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1},
|
||||
[2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2},
|
||||
[3] = { bgImage = "r_zjm_paihangbang_banner03_zh", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3},
|
||||
|
@ -2441,6 +2441,11 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
|
|||
[21] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 7},
|
||||
[22] = { bgImage = "r_zjm_paihangbang_banner003_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 8},
|
||||
|
||||
[23] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_PERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 23},
|
||||
[24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 24},
|
||||
[25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 25},
|
||||
[26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 26},
|
||||
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
@ -28,6 +28,7 @@ imageDownloadMgr = App.ImageDownloadMgr
|
|||
PoolMgr = App.ObjectPoolMgr
|
||||
WWW = UnityEngine.WWW
|
||||
Sprite = UnityEngine.Sprite
|
||||
Texture2D = UnityEngine.Texture2D
|
||||
GameObject = UnityEngine.GameObject
|
||||
Camera = UnityEngine.Camera
|
||||
Input = UnityEngine.Input
|
||||
|
|
|
@ -12,9 +12,13 @@ function TaiChuMiJuanPanel:InitComponent()
|
|||
this.itemPre = Util.GetGameObject(this.btnRoot, "itemPre")
|
||||
|
||||
this.title = Util.GetGameObject(this.btnRoot, "title")
|
||||
this.grid = Util.GetGameObject(this.btnRoot, "bg/circle/root")
|
||||
this.grid = Util.GetGameObject(this.btnRoot, "bg/mask/circle/root")
|
||||
this.backBtn = Util.GetGameObject(this.btnRoot, "backBtn")
|
||||
this.NoneImage = Util.GetGameObject(this.btnRoot, "bg/NoneImage")
|
||||
this.cir = Util.GetGameObject(this.btnRoot, "bg/mask/circle")
|
||||
this.itemPres = {}
|
||||
|
||||
this.upview = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -41,22 +45,35 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function TaiChuMiJuanPanel:OnShow(...)
|
||||
for i = 1, math.max(#this.itemPres,#this.data) do
|
||||
if not this.data[i] then
|
||||
this.itemPres[i].go.gameObject:SetActive(false)
|
||||
else
|
||||
if not this.itemPres[i] then
|
||||
this.itemPres[i] = {}
|
||||
this.itemPres[i].go = newObjToParent(this.itemPre,this.grid)
|
||||
this.itemPres[i].bg = Util.GetGameObject(this.itemPres[i].go, "bg"):GetComponent("Image")
|
||||
if not this.upview then
|
||||
this.upview = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
|
||||
end
|
||||
this.upview:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
|
||||
if not this.data or #this.data < 1 then
|
||||
this.NoneImage.gameObject:SetActive(true)
|
||||
this.cir.gameObject:SetActive(false)
|
||||
else
|
||||
this.NoneImage.gameObject:SetActive(false)
|
||||
this.cir.gameObject:SetActive(true)
|
||||
for i = 1, math.max(#this.itemPres,#this.data) do
|
||||
if not this.data[i] then
|
||||
this.itemPres[i].go.gameObject:SetActive(false)
|
||||
else
|
||||
if not this.itemPres[i] then
|
||||
this.itemPres[i] = {}
|
||||
this.itemPres[i].go = newObjToParent(this.itemPre,this.grid)
|
||||
this.itemPres[i].bg = Util.GetGameObject(this.itemPres[i].go, "mask/bg"):GetComponent("Image")
|
||||
end
|
||||
this.itemPres[i].go.gameObject:SetActive(true)
|
||||
this.itemPres[i].bg.sprite = this.data[i].sprite
|
||||
this.itemPres[i].bg:SetNativeSize()
|
||||
Util.AddOnceClick(this.itemPres[i].go,function()
|
||||
SDKMgr:OpenWeb(this.data[i].linkAddress)
|
||||
end)
|
||||
end
|
||||
this.itemPres[i].go.gameObject:SetActive(true)
|
||||
this.itemPres[i].bg.sprite = this.data[i].sprite
|
||||
Util.AddOnceClick(this.itemPres[i].go,function()
|
||||
SDKMgr:OpenWeb(this.data[i].linkAddress)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
|
@ -68,6 +85,8 @@ end
|
|||
function TaiChuMiJuanPanel:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
this.itemPres = {}
|
||||
SubUIManager.Close(this.upview)
|
||||
this.upview = nil
|
||||
end
|
||||
|
||||
return TaiChuMiJuanPanel
|
|
@ -18,37 +18,33 @@ this.NiuQiIndex = 1
|
|||
this.TaiChuMiJuanData = {}
|
||||
function this.SetTaiChuMiJuanData(msg,fun)
|
||||
local datas
|
||||
if not msg or #msg.secretvolume < 1 then
|
||||
if not msg or not msg.secretvolume or #msg.secretvolume < 1 then
|
||||
---------------------------------------------测试数据
|
||||
datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"},
|
||||
[2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"},
|
||||
[3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"},
|
||||
[4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"},
|
||||
[5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"},
|
||||
[6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"},
|
||||
[7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"},
|
||||
[8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20200412/3062717289_23_800_349.jpg"},
|
||||
}
|
||||
-- if fun then
|
||||
-- fun(msg)
|
||||
-- end
|
||||
-- datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"},
|
||||
-- [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"},
|
||||
-- [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"},
|
||||
-- [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"},
|
||||
-- [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"},
|
||||
-- [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"},
|
||||
-- [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"},
|
||||
-- [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20200412/3062717289_23_800_349.jpg"},
|
||||
-- }
|
||||
if fun then
|
||||
fun(msg)
|
||||
end
|
||||
return
|
||||
else
|
||||
datas = msg.secretvolume
|
||||
end
|
||||
coroutine.start(function()
|
||||
for k,v in ipairs(datas) do
|
||||
local str = v.windowLink
|
||||
local www = WWW.New(str)
|
||||
coroutine.www(www)
|
||||
local tex2d = www.texture
|
||||
local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0));
|
||||
if not this.TaiChuMiJuanData[v.id] then
|
||||
this.TaiChuMiJuanData[v.id] = {}
|
||||
this.TaiChuMiJuanData[v.id].id = v.id
|
||||
this.TaiChuMiJuanData[v.id].linkAddress = v.strategyLink
|
||||
this.TaiChuMiJuanData[v.id].windowLink = v.windowLink
|
||||
this.TaiChuMiJuanData[v.id].sprite = m_sprite
|
||||
end
|
||||
this.GetATaiChuMiJuanData(v)
|
||||
--local time = 0
|
||||
while(not DynamicActivityManager.GetwwwProgress()) do
|
||||
coroutine.wait(0.01)
|
||||
--time = time + 0.01
|
||||
end
|
||||
--LogGreen("k:"..k.." time:"..time)
|
||||
end
|
||||
if fun then
|
||||
fun(msg)
|
||||
|
@ -62,20 +58,27 @@ end
|
|||
|
||||
function this.GetATaiChuMiJuanData(data)
|
||||
this.IsFisish = true
|
||||
if not this.TaiChuMiJuanData[data.id] or this.TaiChuMiJuanData[data.id].windowLink ~= data.windowLink then
|
||||
local str = string.match(data.windowLink,"^%s*(.-)%s*$")
|
||||
if not this.TaiChuMiJuanData[data.id] or this.TaiChuMiJuanData[data.id].windowLink ~= str then
|
||||
this.IsFisish = false
|
||||
coroutine.start(function()
|
||||
local str = data.windowLink
|
||||
local www = WWW.New(str)
|
||||
coroutine.www(www)
|
||||
local m_sprite
|
||||
local tex2d = www.texture
|
||||
local m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0));
|
||||
if not tex2d then
|
||||
Log("data.windowLink:"..str)
|
||||
LogError("data.windowLink:下载失败"..www.error)
|
||||
m_sprite = Util.LoadSprite("taichuMiJuanDefaultBanner")
|
||||
else
|
||||
m_sprite = Sprite.Create(tex2d, Rect.New(0, 0, tex2d.width, tex2d.height), Vector2.New(0, 0));
|
||||
end
|
||||
if not this.TaiChuMiJuanData[data.id] then
|
||||
this.TaiChuMiJuanData[data.id] = {}
|
||||
end
|
||||
this.TaiChuMiJuanData[data.id].id = data.id
|
||||
this.TaiChuMiJuanData[data.id].linkAddress = data.strategyLink
|
||||
this.TaiChuMiJuanData[data.id].windowLink = data.windowLink
|
||||
this.TaiChuMiJuanData[data.id].linkAddress = string.match(data.strategyLink,"^%s*(.-)%s*$")
|
||||
this.TaiChuMiJuanData[data.id].windowLink = str
|
||||
this.TaiChuMiJuanData[data.id].sprite = m_sprite
|
||||
this.IsFisish = true
|
||||
end)
|
||||
|
|
|
@ -52,6 +52,8 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
|
|||
local specialText = Util.GetGameObject(_go,"SpecialText"):GetComponent("Text")
|
||||
local textPre = Util.GetGameObject(_go,"Content/Text")
|
||||
local content = Util.GetGameObject(_go,"Content")
|
||||
local star = Util.GetGameObject(_go,"title/Star"):GetComponent("Text")
|
||||
local starImg = Util.GetGameObject(_go,"title/Image")
|
||||
if not self.textList[_go] then
|
||||
self.textList[_go] = {}
|
||||
end
|
||||
|
@ -102,6 +104,18 @@ function PracticeStatePreview:SetSingleData(index,_go,_data)
|
|||
specialText.gameObject:SetActive(false)
|
||||
end
|
||||
title.text = string.format("%s期",_data.RealmName)
|
||||
if _data.NeedStarNum ~= 0 then
|
||||
star.gameObject:SetActive(true)
|
||||
starImg.gameObject:SetActive(true)
|
||||
if _data.NeedStarNum > PracticeManager.StarNum then
|
||||
star.text = string.format("<color=red>需要%s</color>",_data.NeedStarNum)
|
||||
else
|
||||
star.text = string.format("<color=#00ff00>需要%s</color>",_data.NeedStarNum)
|
||||
end
|
||||
else
|
||||
star.gameObject:SetActive(false)
|
||||
starImg.gameObject:SetActive(false)
|
||||
end
|
||||
ForceRebuildLayout(_go.transform)
|
||||
_go:SetActive(true)
|
||||
end
|
||||
|
|
|
@ -296,56 +296,55 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function this:BindEvent()
|
||||
Util.AddOnceClick(this.taiChuMiJuanBtn,function()
|
||||
-- NetManager.TaiChuSecretvolumeRequest(function(msg)
|
||||
-- local data = {}
|
||||
-- if #msg.secretvolume < 1 then
|
||||
-- LogGreen("该功能暂未开放")
|
||||
-- return
|
||||
-- end
|
||||
-- coroutine.start(function()
|
||||
|
||||
-- for k,v in ipairs(msg.secretvolume) do
|
||||
-- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
|
||||
-- while(not DynamicActivityManager.GetwwwProgress()) do
|
||||
-- coroutine.wait(0.01)
|
||||
-- end
|
||||
-- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
|
||||
-- table.insert(data,isContinue)
|
||||
-- end
|
||||
-- table.sort(data,function(a,b)
|
||||
-- return a.id < b.id
|
||||
-- end)
|
||||
-- UIManager.OpenPanel(UIName.taiChuMiJuan,data)
|
||||
-- end)
|
||||
-- end)
|
||||
----------------------------------------------------------- 测试数据
|
||||
local data = {}
|
||||
local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"},
|
||||
[2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"},
|
||||
[3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"},
|
||||
[4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"},
|
||||
[5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"},
|
||||
[6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"},
|
||||
[7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"},
|
||||
[8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://dfzximg01.dftoutiao.com/minimodify/20210810/640x427_611230bb2fc8e.png"},
|
||||
[9] = {id = 9,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=ef71759530174eb7a644f43a1c82fc41_s&infoId=IC003K1PNC70DBQ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-da593f41724ecf38354bb712398cfca6.jpg?time=1628672089&signature=6EABA2FF759B313F41F158D7AD8FDF6A"},
|
||||
}
|
||||
NetManager.TaiChuSecretvolumeRequest(function(msg)
|
||||
local data = {}
|
||||
if not msg or not msg.secretvolume or #msg.secretvolume < 1 then
|
||||
UIManager.OpenPanel(UIName.taiChuMiJuan,data)
|
||||
return
|
||||
end
|
||||
coroutine.start(function()
|
||||
for k,v in ipairs(datas) do
|
||||
for k,v in ipairs(msg.secretvolume) do
|
||||
local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
|
||||
local time = 0
|
||||
while(not DynamicActivityManager.GetwwwProgress()) do
|
||||
coroutine.wait(0.01)
|
||||
time = time + 0.01
|
||||
end
|
||||
isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
|
||||
table.insert(data,isContinue)
|
||||
end
|
||||
table.sort(data,function(a,b)
|
||||
return a.id < b.id
|
||||
end)
|
||||
end)
|
||||
UIManager.OpenPanel(UIName.taiChuMiJuan,data)
|
||||
end)
|
||||
end)
|
||||
----------------------------------------------------------- 测试数据
|
||||
-- local data = {}
|
||||
-- local datas = {[1] = {id = 1,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=eed09eaec41c4d18abc08ddbb3452fdc_s&infoId=II003LYBG9XPE7A",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-e1fd1cf39f6abfc1cdb35be92b6bc3d0.jpg?time=1628668135&signature=89DFF74746F289F5ED404A0BC627387A"},
|
||||
-- [2] = {id = 2,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT00TLAILJ9X7KZ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-8e07612db47c17ec56fbba613d31cc7b.jpg?time=1628668250&signature=CA7856DD83E45651B5E2274D76D8BF48"},
|
||||
-- [3] = {id = 3,strategyLink = "https://mini.eastday.com/nsa/210811133830637498814.html?qid=02034",windowLink = "https://lupic.cdn.bcebos.com/20191203/3016121736_23.jpg"},
|
||||
-- [4] = {id = 4,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=b5f830ada8a04ab2bac07efa621ba453_s&infoId=IT003LL8LJF1X9E",windowLink = "https://lupic.cdn.bcebos.com/20210629/938550_23.jpg"},
|
||||
-- [5] = {id = 5,strategyLink = "https://mini.eastday.com/nsa/n210811082523736.html?qid=04232",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-361d4790c345bae2c5a5e1706c2b550b.jpg?time=1628668377&signature=B1350B327A0806326DD29054B83B071E"},
|
||||
-- [6] = {id = 6,strategyLink = "http://ex.chinadaily.com.cn/exchange/partners/82/rss/channel/cn/columns/sz8srm/stories/WS6111cd6fa3101e7ce975deae.html",windowLink = "http://cn.chinadaily.com.cn/image/2018/j-2.jpg"},
|
||||
-- [7] = {id = 7,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=bdba7a24fe304b598695dbd25219f8e4_s&infoId=II003JLZ9IT187M",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-9987eceb8e5181eadb24778c05d9195b.jpg?time=1628668882&signature=842592897E6CE7C3DB594FAFC515B22E"},
|
||||
-- [8] = {id = 8,strategyLink = "https://mini.eastday.com/nsa/210811065335765353208.html?qid=02034",windowLink = "https://dfzximg01.dftoutiao.com/minimodify/20210810/640x427_611230bb2fc8e.png"},
|
||||
-- [9] = {id = 9,strategyLink = "https://pc.yiyouliao.com/msn/article.html?recId=ef71759530174eb7a644f43a1c82fc41_s&infoId=IC003K1PNC70DBQ",windowLink = "https://img-nos.yiyouliao.com/inforec-20210811-da593f41724ecf38354bb712398cfca6.jpg?time=1628672089&signature=6EABA2FF759B313F41F158D7AD8FDF6A"},
|
||||
-- }
|
||||
-- coroutine.start(function()
|
||||
-- for k,v in ipairs(datas) do
|
||||
-- local isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
|
||||
-- local time = 0
|
||||
-- while(not DynamicActivityManager.GetwwwProgress()) do
|
||||
-- coroutine.wait(0.01)
|
||||
-- time = time + 0.01
|
||||
-- end
|
||||
-- isContinue = DynamicActivityManager.GetATaiChuMiJuanData(v)
|
||||
-- table.insert(data,isContinue)
|
||||
-- end
|
||||
-- table.sort(data,function(a,b)
|
||||
-- return a.id < b.id
|
||||
-- end)
|
||||
-- UIManager.OpenPanel(UIName.taiChuMiJuan,data)
|
||||
-- end)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(this.btnEndLess,function()
|
||||
|
|
|
@ -5477,18 +5477,18 @@ function this.XunBaoMiZongEnterMap(func)
|
|||
end
|
||||
--请求太初秘卷
|
||||
function NetManager.TaiChuSecretvolumeRequest(func)
|
||||
DynamicActivityManager.SetTaiChuMiJuanData(nil,func) --测试用
|
||||
-- local data=PlayerInfoProto_pb.TaiChuSecretvolumeRequest()
|
||||
-- local msg = data:SerializeToString()
|
||||
-- Network:SendMessageWithCallBack(MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_REQUEST, MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_RESPONS, msg, function(buffer)
|
||||
-- local data = buffer:DataByte()
|
||||
-- local msg = PlayerInfoProto_pb.TaiChuSecretvolumeResponse()
|
||||
-- msg:ParseFromString(data)
|
||||
-- for k,v in ipairs(msg.secretvolume) do
|
||||
-- LogGreen("id:"..v.id.." strategyLink:"..v.strategyLink.." windowLink:"..v.windowLink)
|
||||
-- end
|
||||
-- DynamicActivityManager.SetTaiChuMiJuanData(msg,func)
|
||||
-- end)
|
||||
--DynamicActivityManager.SetTaiChuMiJuanData(nil,func) --测试用
|
||||
local data=PlayerInfoProto_pb.TaiChuSecretvolumeRequest()
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_REQUEST, MessageTypeProto_pb.TAI_CHU_SECRET_VOLUME_RESPONSE, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.TaiChuSecretvolumeResponse()
|
||||
msg:ParseFromString(data)
|
||||
-- for k,v in ipairs(msg.secretvolume) do
|
||||
-- LogGreen("id:"..v.id.." strategyLink:"..v.strategyLink.." windowLink:"..v.windowLink)
|
||||
-- end
|
||||
DynamicActivityManager.SetTaiChuMiJuanData(msg,func)
|
||||
end)
|
||||
end
|
||||
|
||||
return this
|
|
@ -20,6 +20,7 @@ function PokemonGetInfoPopup:InitComponent()
|
|||
proList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/pro/singlePro ("..i..")")
|
||||
end
|
||||
|
||||
this.skillLvGo=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage")
|
||||
this.skillName=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/nameText"):GetComponent("Text")
|
||||
this.skillLv=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/skillImage/skillLv"):GetComponent("Text")
|
||||
this.skillIcon=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill/icon"):GetComponent("Image")
|
||||
|
@ -69,7 +70,6 @@ function this.GetShowPanelData()
|
|||
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, pokemonBackData.star,2,Vector2.New(60,60))
|
||||
--属性
|
||||
local allAddProVal=PokemonManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star)
|
||||
proList[0]:SetActive(true)
|
||||
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
|
||||
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level
|
||||
Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05")
|
||||
|
@ -96,6 +96,7 @@ function this.GetShowPanelData()
|
|||
end
|
||||
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
|
||||
this.skillName.text = GetLanguageStrById(curSkillConFig.Name)
|
||||
this.skillLvGo:SetActive(true)
|
||||
this.skillLv.text = curSkillConFig.Level
|
||||
this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon))
|
||||
Util.AddOnceClick(this.skillBtn, function()
|
||||
|
@ -111,7 +112,9 @@ function this.NoGetShowPanelData()
|
|||
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60))
|
||||
--属性
|
||||
local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
|
||||
proList[0]:SetActive(false)
|
||||
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
|
||||
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = "1/"..pokemonSData.MaxLevel
|
||||
Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05")
|
||||
local index = 0
|
||||
for key, value in pairs(allAddProVal) do
|
||||
index = index + 1
|
||||
|
@ -135,10 +138,12 @@ function this.NoGetShowPanelData()
|
|||
end
|
||||
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
|
||||
this.skillName.text = GetLanguageStrById(curSkillConFig.Name)
|
||||
this.skillLv.text = curSkillConFig.Level
|
||||
this.skillLvGo:SetActive(false)
|
||||
-- this.skillLv.text = curSkillConFig.Level
|
||||
this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon))
|
||||
Util.AddOnceClick(this.skillBtn, function()
|
||||
UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0)
|
||||
-- UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0)
|
||||
UIManager.OpenPanel(UIName.PokemonAllSkillInfoPopup,pokemonSid,1,0)
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require("Base/BasePanel")
|
||||
RewardTalismanSingleShowPopup = Inherit(BasePanel)
|
||||
local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
|
||||
local type
|
||||
local dId
|
||||
local sId
|
||||
|
@ -24,10 +25,12 @@ function RewardTalismanSingleShowPopup:InitComponent()
|
|||
self.refineLv=Util.GetGameObject(self.transform, "Content/bg/armorInfo/refineLv"):GetComponent("Text")
|
||||
|
||||
self.curMainProscroll=Util.GetGameObject(self.transform, "Content/mainProScroll")
|
||||
self.curMainProText=Util.GetGameObject(self.transform, "Content/mainProScroll/Text"):GetComponent("Text")
|
||||
self.curMainProGrid=Util.GetGameObject(self.transform, "Content/mainProScroll/proGrid")
|
||||
self.curotherProscroll=Util.GetGameObject(self.transform, "Content/otherProScroll")
|
||||
self.otherProPre=Util.GetGameObject(self.transform, "Content/proPre")
|
||||
self.otherProGrid=Util.GetGameObject(self.transform, "Content/otherProScroll/proGrid")
|
||||
self.otherProText=Util.GetGameObject(self.transform, "Content/otherProScroll/Text"):GetComponent("Text")
|
||||
self.curCastInfo=Util.GetGameObject(self.transform, "Content/skillObject/skillInfo"):GetComponent("Text")
|
||||
self.castInfoObject=Util.GetGameObject(self.transform, "Content/skillObject")
|
||||
self.castInfoObject:SetActive(false)
|
||||
|
@ -219,6 +222,10 @@ function RewardTalismanSingleShowPopup:OnShowPanelData()
|
|||
if self.jumpViewList and #self.jumpViewList then
|
||||
self.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,self.equipProGridCom.spacing*(#self.jumpViewList))
|
||||
end
|
||||
|
||||
local data = jewelConfig[sId]
|
||||
self.curMainProText.text = string.format("基础属性 [强化等级:%s/%s]",lv,data.Max[1])
|
||||
self.otherProText.text = string.format("基础属性 [精炼等级:%s/%s]",refineLv,data.Max[2])
|
||||
end
|
||||
--道具 和 装备分解 发送请求后 回调
|
||||
function RewardTalismanSingleShowPopup:SendBackResolveReCallBack(drop)
|
||||
|
|
|
@ -145,6 +145,7 @@ function this.GetPreViewData()
|
|||
local data = {}
|
||||
local configData = ConfigManager.GetConfigDataByKey(ConfigName.XiuXianConfig,"RealmId",i)
|
||||
data.RealmName = configData.RealmName
|
||||
data.NeedStarNum = configData.NeedStarNum
|
||||
if configData.RealmDesc then
|
||||
data.RealmDesc = configData.RealmDesc
|
||||
end
|
||||
|
|
|
@ -23,17 +23,16 @@ function this.InitData(rankType,fun,id,rankIndex)
|
|||
local isCross = 0
|
||||
for i = 1, #rankKingList do
|
||||
if rankType == rankKingList[i].rankType then
|
||||
if rankKingList[i].isRankingMainPanelShow >= 2 then
|
||||
if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then
|
||||
isCross = 1
|
||||
end
|
||||
if rankKingList[i].isRankingMainPanelShow == 4 then--跨服十绝阵判断
|
||||
if PlayerManager.isCross == 1 then
|
||||
isCross = 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
--跨服十绝阵判断
|
||||
-- if cur_rankType == RANK_TYPE.GUILD_DEATHPOS_PERSON or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_GUILD or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_ALLPERSON or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_ALLGUILD then
|
||||
-- if PlayerManager.isCross == 1 then
|
||||
-- isCross = 1
|
||||
-- end
|
||||
-- end
|
||||
-- LogYellow("cur_rankType "..cur_rankType.." isCross "..isCross)
|
||||
NetManager.RequestRankInfo(rankType, function (msg)--请求数据
|
||||
this.ReceiveRankingData(msg,fun)
|
||||
|
@ -50,9 +49,14 @@ function this.RequestNextWarPowerPageData(fun)
|
|||
local isCross = 0
|
||||
for i = 1, #rankKingList do
|
||||
if cur_rankType == rankKingList[i].rankType then
|
||||
if rankKingList[i].isRankingMainPanelShow >= 2 then
|
||||
if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then
|
||||
isCross = 1
|
||||
end
|
||||
if rankKingList[i].isRankingMainPanelShow == 4 then
|
||||
if PlayerManager.isCross == 1 then
|
||||
isCross = 1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据
|
||||
|
|
|
@ -313,8 +313,9 @@ function this.GetCanCompoundTreasureNumByTreasureId(_id, _type)
|
|||
end
|
||||
|
||||
--获取当前等级加成的属性
|
||||
function this.GetCurLvPropertyValue(_type, _id, _lv)
|
||||
function this.GetCurLvPropertyValue(_type, _id, _lv, _isShow)
|
||||
local lvConfig = nil
|
||||
local isShow = _isShow == true
|
||||
--获取当前等级属性加成
|
||||
for _, configInfo in ConfigPairs(jewerLevelUpConfig) do
|
||||
if configInfo.Type == _type and configInfo.PoolID == _id and configInfo.Level == _lv then
|
||||
|
@ -330,8 +331,12 @@ function this.GetCurLvPropertyValue(_type, _id, _lv)
|
|||
local index = info[1]
|
||||
local skillValue = {}
|
||||
skillValue.currValue = info[2]
|
||||
if info[2] ~= 0 then
|
||||
if isShow then
|
||||
proList[index] = skillValue
|
||||
else
|
||||
if info[2] ~= 0 then
|
||||
proList[index] = skillValue
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,94 +2,104 @@
|
|||
RoleEquipTreasureChangePopup = Inherit(BasePanel)
|
||||
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
local spcialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||
local jewelConfig = ConfigManager.GetConfig(ConfigName.JewelConfig)
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local this=RoleEquipTreasureChangePopup
|
||||
local type--1 穿装备 2 卸装备 3 替换装备
|
||||
local curHeroData
|
||||
local curEquipData
|
||||
local nextEquipData
|
||||
local equipData
|
||||
local openThisPanel
|
||||
local equipIdList
|
||||
local equipDataList
|
||||
local position
|
||||
local curMainpropertyList={}
|
||||
local nextMainPropertyList={}
|
||||
local curPropertyList={}
|
||||
local nextPropertyList={}
|
||||
local isGongMing = false
|
||||
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
function RoleEquipTreasureChangePopup:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
equipData = {}
|
||||
this.btnBack= Util.GetGameObject(self.transform, "btnBack")
|
||||
this.bg1= Util.GetGameObject(self.transform, "GameObject/bg1")
|
||||
this.desc1= Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/Text"):GetComponent("Text")
|
||||
this.currEquipProImg=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/proImg"):GetComponent("Image")
|
||||
this.curEquipName=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/name/text"):GetComponent("Text")
|
||||
this.curEquipFrame=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/frame"):GetComponent("Image")
|
||||
this.curEquipIcon=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/icon"):GetComponent("Image")
|
||||
this.curEquipTypeText=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/equipTypeText"):GetComponent("Text")
|
||||
this.curEquipLvText=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/lvTxt"):GetComponent("Text")
|
||||
this.curEquipRefineLvTxt=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/starTxt"):GetComponent("Text")
|
||||
this.curRefinePropertyTxt=Util.GetGameObject(self.transform, "GameObject/bg1/mainPro/Text2")
|
||||
this.curEquipBtns=Util.GetGameObject(self.transform, "GameObject/bg1/btns")
|
||||
this.curEquipBtnStrong=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnStrong")
|
||||
this.curEquipBtnStrongRed = Util.GetGameObject( this.curEquipBtnStrong, "red")
|
||||
this.curEquipBtnRefine=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnRefine")
|
||||
this.curEquipBtnRefineRed=Util.GetGameObject(this.curEquipBtnRefine, "red")
|
||||
this.curEquipBtnRemove=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnRemove")
|
||||
this.curEquipBtnAdd=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnAdd")
|
||||
this.curEquipBtnChange=Util.GetGameObject(self.transform, "GameObject/bg1/btns/btnChange")
|
||||
this.qualityText=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/qualityText"):GetComponent("Text")
|
||||
this.powerNum1=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/powerNum"):GetComponent("Text")
|
||||
this.powerUPorDown1=Util.GetGameObject(self.transform, "GameObject/bg1/equipInfo/powerUPorDown")
|
||||
this.GameObject=Util.GetGameObject(self.transform, "GameObject")
|
||||
this.BasePropertyList = {}
|
||||
this.RefinePropertyList = {}
|
||||
this.TreePropertyList = {}
|
||||
for i = 1, 2 do
|
||||
this.BasePropertyList[i] = {}
|
||||
this.RefinePropertyList[i] = {}
|
||||
this.TreePropertyList[i] = {}
|
||||
end
|
||||
this.treasurePanel = {}
|
||||
for i = 1, 2 do
|
||||
if not this.treasurePanel[i] then
|
||||
this.treasurePanel[i] = {}
|
||||
--信息
|
||||
this.treasurePanel[i].bg = Util.GetGameObject(self.transform, "GameObject/bg"..i)
|
||||
this.treasurePanel[i].desc = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/Text"):GetComponent("Text")
|
||||
this.treasurePanel[i].EquipProImg = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/proImg"):GetComponent("Image")
|
||||
this.treasurePanel[i].EquipName = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/name/text"):GetComponent("Text")
|
||||
this.treasurePanel[i].EquipFrame = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/frame"):GetComponent("Image")
|
||||
this.treasurePanel[i].EquipIcon = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/icon"):GetComponent("Image")
|
||||
this.treasurePanel[i].EquipTypeText = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/equipTypeText"):GetComponent("Text")
|
||||
this.treasurePanel[i].powerUPorDown = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/powerUPorDown")
|
||||
this.treasurePanel[i].qualityText = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/qualityText"):GetComponent("Text")
|
||||
this.treasurePanel[i].powerNum = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/powerNum"):GetComponent("Text")
|
||||
--按钮
|
||||
this.treasurePanel[i].EquipBtns = Util.GetGameObject(self.transform, "GameObject/bg"..i.."/btns")
|
||||
this.treasurePanel[i].EquipBtnStrong = Util.GetGameObject(this.treasurePanel[i].EquipBtns, "btnStrong")
|
||||
this.treasurePanel[i].EquipBtnRefine = Util.GetGameObject(this.treasurePanel[i].EquipBtns, "btnRefine")
|
||||
this.treasurePanel[i].EquipBtnRemove = Util.GetGameObject(this.treasurePanel[i].EquipBtns, "btnRemove")
|
||||
this.treasurePanel[i].EquipBtnAdd = Util.GetGameObject(this.treasurePanel[i].EquipBtns, "btnAdd")
|
||||
this.treasurePanel[i].EquipBtnChange = Util.GetGameObject(this.treasurePanel[i].EquipBtns, "btnChange")
|
||||
--红点
|
||||
this.treasurePanel[i].StrongRed = Util.GetGameObject(this.treasurePanel[i].EquipBtnStrong, "red")
|
||||
this.treasurePanel[i].RefineRed = Util.GetGameObject(this.treasurePanel[i].EquipBtnRefine, "red")
|
||||
--属性
|
||||
this.treasurePanel[i].EquipLvText = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/lvTxt"):GetComponent("Text")
|
||||
this.treasurePanel[i].EquipRefineLvTxt = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/starTxt"):GetComponent("Text")
|
||||
this.treasurePanel[i].EquipTreeLvTxt = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/treeImg/treeTxt"):GetComponent("Text")
|
||||
this.treasurePanel[i].treeImg = Util.GetGameObject(this.treasurePanel[i].bg, "equipInfo/treeImg")
|
||||
this.treasurePanel[i].treeImg:SetActive(false)
|
||||
--属性信息
|
||||
this.treasurePanel[i].bgScroll = Util.GetGameObject(this.treasurePanel[i].bg, "Scroll")
|
||||
--基础
|
||||
this.treasurePanel[i].BaseAttri = Util.GetGameObject(this.treasurePanel[i].bg, "Scroll/grid/baseAttri")
|
||||
this.treasurePanel[i].BaseAttriNum = Util.GetGameObject(this.treasurePanel[i].BaseAttri, "name/attriNum"):GetComponent("Text")
|
||||
this.treasurePanel[i].BaseAttriGrid = Util.GetGameObject(this.treasurePanel[i].BaseAttri, "grid")
|
||||
--精炼
|
||||
this.treasurePanel[i].RefineAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/refineAttri")
|
||||
this.treasurePanel[i].RefineAttriNum = Util.GetGameObject(this.treasurePanel[i].RefineAttri, "name/attriNum"):GetComponent("Text")
|
||||
this.treasurePanel[i].RefineAttriGrid = Util.GetGameObject(this.treasurePanel[i].RefineAttri, "grid")
|
||||
--神应
|
||||
this.treasurePanel[i].TreeAttri = Util.GetGameObject(this.treasurePanel[i].bgScroll, "grid/treeAttri")
|
||||
-- this.treasurePanel[i].TreeAttriNum = Util.GetGameObject(this.treasurePanel[i].TreeAttri, "name/attriNum"):GetComponent("Text")
|
||||
-- this.treasurePanel[i].TreeAttriGrid = Util.GetGameObject(this.treasurePanel[i].TreeAttri, "grid")
|
||||
this.treasurePanel[i].TreeAttri:SetActive(false)
|
||||
end
|
||||
|
||||
end
|
||||
--其他
|
||||
this.propertyPre=Util.GetGameObject(self.transform, "GameObject/bg1/PropertyTxt")
|
||||
this.curEquipSign=Util.GetGameObject(self.transform, "GameObject/bg1/Text")
|
||||
this.curMainPropertyGrid=Util.GetGameObject(self.transform, "GameObject/bg1/mainPro/grid")
|
||||
this.nextMainPropertyGrid=Util.GetGameObject(self.transform, "GameObject/bg2/mainPro/grid")
|
||||
this.propertyPre:SetActive(false)
|
||||
this.curPropertyGrid=Util.GetGameObject(self.transform, "GameObject/bg1/grid")
|
||||
this.bg2= Util.GetGameObject(self.transform, "GameObject/bg2")
|
||||
this.nextPropertyGrid=Util.GetGameObject(self.transform, "GameObject/bg2/grid")
|
||||
this.nextRefinePropertyTxt=Util.GetGameObject(self.transform, "GameObject/bg2/mainPro/Text2")
|
||||
this.desc2= Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/Text"):GetComponent("Text")
|
||||
this.nextEquipName=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/name/text"):GetComponent("Text")
|
||||
this.nextEquipFrame=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/frame"):GetComponent("Image")
|
||||
this.nextEquipIcon=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/icon"):GetComponent("Image")
|
||||
this.nextEquipTypeText=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/equipTypeText"):GetComponent("Text")
|
||||
this.nextEquipLvText=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/lvTxt"):GetComponent("Text")
|
||||
this.nextEquipBtns=Util.GetGameObject(self.transform, "GameObject/bg2/btns")
|
||||
this.nextEquipBtns:SetActive(false)
|
||||
this.nextEquipProImg=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/proImg"):GetComponent("Image")
|
||||
this.nextEquipBtnStrong=Util.GetGameObject(self.transform, "GameObject/bg2/btns/btnStrong")
|
||||
this.nextEquipBtnRefine=Util.GetGameObject(self.transform, "GameObject/bg2/btns/btnRefine")
|
||||
this.nextEquipBtnRemove=Util.GetGameObject(self.transform, "GameObject/bg2/btns/btnRemove")
|
||||
this.nextEquipBtnAdd=Util.GetGameObject(self.transform, "GameObject/bg2/btns/btnAdd")
|
||||
this.nextEquipBtnChange=Util.GetGameObject(self.transform, "GameObject/bg2/btns/btnChange")
|
||||
this.qualityText2=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/qualityText"):GetComponent("Text")
|
||||
this.GameObject=Util.GetGameObject(self.transform, "GameObject")
|
||||
this.powerNum2=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/powerNum"):GetComponent("Text")
|
||||
this.powerUPorDown2=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/powerUPorDown")
|
||||
this.nextEquipRefineLvTxt=Util.GetGameObject(self.transform, "GameObject/bg2/equipInfo/starTxt"):GetComponent("Text")
|
||||
|
||||
this.TextPre = Util.GetGameObject(self.transform, "GameObject/bg1/TextPre")
|
||||
this.space = Util.GetGameObject(self.transform, "GameObject/bg1/space")
|
||||
end
|
||||
local isGongMing = false
|
||||
--绑定事件(用于子类重写)
|
||||
function RoleEquipTreasureChangePopup:BindEvent()
|
||||
|
||||
Util.AddClick(this.btnBack, function()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.curEquipBtnRemove, function()
|
||||
|
||||
Util.AddClick(this.treasurePanel[1].EquipBtnRemove, function()
|
||||
equipIdList={}
|
||||
equipDataList={}
|
||||
table.insert(equipIdList,curEquipData.idDyn)
|
||||
table.insert(equipDataList,curEquipData)
|
||||
table.insert(equipIdList,equipData[1].idDyn)
|
||||
table.insert(equipDataList,equipData[1])
|
||||
NetManager.EquipUnLoadOptRequest(curHeroData.dynamicId,equipIdList ,2,function ()
|
||||
self:ClosePanel()
|
||||
openThisPanel.UpdateEquipPosHeroData(2,type,equipDataList)
|
||||
end)
|
||||
end)
|
||||
Util.AddClick(this.curEquipBtnAdd, function()
|
||||
Util.AddClick(this.treasurePanel[1].EquipBtnAdd, function()
|
||||
local config=spcialConfig[40]
|
||||
if config then
|
||||
local limits = string.split(config.Value, "|")
|
||||
|
@ -112,45 +122,43 @@ function RoleEquipTreasureChangePopup:BindEvent()
|
|||
end
|
||||
equipIdList={}
|
||||
equipDataList={}
|
||||
table.insert(equipIdList,curEquipData.idDyn)
|
||||
table.insert(equipDataList,curEquipData)
|
||||
table.insert(equipIdList,equipData[1].idDyn)
|
||||
table.insert(equipDataList,equipData[1])
|
||||
NetManager.EquipWearRequest(curHeroData.dynamicId,equipIdList,2,function ()
|
||||
self:ClosePanel()
|
||||
openThisPanel.UpdateEquipPosHeroData(2,type,equipDataList,0,position)
|
||||
end)
|
||||
end)
|
||||
Util.AddClick(this.nextEquipBtnChange, function()
|
||||
Util.AddClick(this.treasurePanel[2].EquipBtnChange, function()
|
||||
equipIdList={}
|
||||
equipDataList={}
|
||||
table.insert(equipIdList,nextEquipData.idDyn)
|
||||
table.insert(equipDataList,nextEquipData)
|
||||
table.insert(equipIdList,equipData[1].idDyn)
|
||||
table.insert(equipDataList,equipData[1])
|
||||
NetManager.EquipWearRequest(curHeroData.dynamicId,equipIdList,2,function ()
|
||||
self:ClosePanel()
|
||||
openThisPanel.UpdateEquipPosHeroData(2,type,equipDataList,curEquipData,position)
|
||||
openThisPanel.UpdateEquipPosHeroData(2,type,equipDataList,equipData[1],position)
|
||||
end)
|
||||
end)
|
||||
|
||||
Util.AddClick(this.nextEquipBtnStrong, function()
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,nextEquipData,1)
|
||||
Util.AddClick(this.treasurePanel[2].EquipBtnStrong, function()
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,equipData[1],1)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.curEquipBtnStrong, function()
|
||||
Util.AddClick(this.treasurePanel[1].EquipBtnStrong, function()
|
||||
if isGongMing then
|
||||
-- body
|
||||
PopupTipPanel.ShowTip(Language[12184])
|
||||
else
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,1)
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,equipData[1],1)
|
||||
self:ClosePanel()
|
||||
end
|
||||
|
||||
end)
|
||||
|
||||
Util.AddClick(this.nextEquipBtnRefine, function()
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,nextEquipData,2)
|
||||
Util.AddClick(this.treasurePanel[2].EquipBtnRefine, function()
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,equipData[1],2)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.curEquipBtnRefine, function()
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,curEquipData,2)
|
||||
Util.AddClick(this.treasurePanel[1].EquipBtnRefine, function()
|
||||
UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,equipData[1],2)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
|
@ -168,10 +176,10 @@ end
|
|||
function this.CurrEquipDataChange()
|
||||
--替换
|
||||
if type==3 then
|
||||
nextEquipData = EquipTreasureManager.GetSingleEquipTreasreData(nextEquipData.idDyn)
|
||||
equipData[1] = EquipTreasureManager.GetSingleEquipTreasreData(equipData[1].idDyn)
|
||||
this.NextCurEquipData()
|
||||
else
|
||||
curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(curEquipData.idDyn)
|
||||
equipData[1] = EquipTreasureManager.GetSingleEquipTreasreData(equipData[1].idDyn)
|
||||
this.ShowCurEquipData()
|
||||
end
|
||||
|
||||
|
@ -183,198 +191,263 @@ function RoleEquipTreasureChangePopup:OnOpen(_openThisPanel,_type,_curHeroData,_
|
|||
openThisPanel = _openThisPanel
|
||||
type = _type--1 穿戴 2 卸下 3 替换 4显示信息
|
||||
curHeroData = _curHeroData
|
||||
curEquipData = _curEquipData
|
||||
nextEquipData = _nextEquipData
|
||||
position = _position
|
||||
local index = curEquipData.equipType == 1 and HarmonyAddType.HunSoulPrint or HarmonyAddType.LingSoulPrint
|
||||
if HarmonyManager.IsInfo(curEquipData.upHeroDid) and HarmonyManager.GetSingleAdditions(index) ~= -1 then
|
||||
-- bod
|
||||
isGongMing = true
|
||||
Util.SetGray(this.curEquipBtnStrong, true)
|
||||
|
||||
else
|
||||
isGongMing = false
|
||||
Util.SetGray(this.curEquipBtnStrong, false)
|
||||
end
|
||||
equipData[1] = _curEquipData--lv
|
||||
equipData[2] = _nextEquipData--refinelv
|
||||
position = _position--treelv
|
||||
end
|
||||
function RoleEquipTreasureChangePopup:OnShow()
|
||||
this.bg1:SetActive(false)
|
||||
this.bg2:SetActive(false)
|
||||
this.curEquipBtns:SetActive(false)
|
||||
this.curEquipBtnStrong:SetActive(false)
|
||||
this.curEquipBtnRefine:SetActive(false)
|
||||
this.curEquipBtnRemove:SetActive(false)
|
||||
this.curEquipBtnAdd:SetActive(false)
|
||||
this.curEquipBtnChange:SetActive(false)
|
||||
this.nextEquipBtns:SetActive(false)
|
||||
this.nextEquipBtnStrong:SetActive(false)
|
||||
this.nextEquipBtnRefine:SetActive(false)
|
||||
this.nextEquipBtnRemove:SetActive(false)
|
||||
this.nextEquipBtnAdd:SetActive(false)
|
||||
this.nextEquipBtnChange:SetActive(false)
|
||||
if type==1 then
|
||||
this.ShowCurEquipData(1)
|
||||
this.bg1:SetActive(true)
|
||||
this.curEquipBtns:SetActive(true)
|
||||
this.curEquipBtnAdd:SetActive(true)
|
||||
this.curEquipBtnStrong:SetActive(true)
|
||||
this.curEquipBtnRefine:SetActive(true)
|
||||
this.curEquipSign.gameObject:SetActive(false)
|
||||
elseif type==2 then
|
||||
this.ShowCurEquipData(2)
|
||||
this.bg1:SetActive(true)
|
||||
this.curEquipBtns:SetActive(true)
|
||||
this.curEquipBtnStrong:SetActive(true)
|
||||
this.curEquipBtnRefine:SetActive(true)
|
||||
this.curEquipBtnRemove:SetActive(true)
|
||||
this.curEquipSign.gameObject:SetActive(false)
|
||||
elseif type==3 then
|
||||
this.ShowCurEquipData(2)
|
||||
this.NextCurEquipData()
|
||||
this.curEquipSign.gameObject:SetActive(true)
|
||||
this.bg1:SetActive(true)
|
||||
this.bg2:SetActive(true)
|
||||
this.nextEquipBtns:SetActive(true)
|
||||
this.nextEquipBtnChange:SetActive(true)
|
||||
this.nextEquipBtnStrong:SetActive(false)
|
||||
this.nextEquipBtnRefine:SetActive(false)
|
||||
elseif type==4 then
|
||||
this.ShowCurEquipData(2)
|
||||
this.bg1:SetActive(true)
|
||||
this.curEquipBtns:SetActive(false)
|
||||
this.curEquipBtnStrong:SetActive(true)
|
||||
this.curEquipBtnRefine:SetActive(true)
|
||||
this.curEquipBtnRemove:SetActive(true)
|
||||
this.curEquipSign.gameObject:SetActive(false)
|
||||
end
|
||||
if (not curEquipData.upHeroDid or curEquipData.upHeroDid == "" or curEquipData.upHeroDid == 0 or curEquipData.upHeroDid == "0") then
|
||||
this.curEquipBtnStrong:SetActive(false)
|
||||
this.curEquipBtnRefine:SetActive(false)
|
||||
end
|
||||
if (nextEquipData and (not nextEquipData.upHeroDid or nextEquipData.upHeroDid == "" or nextEquipData.upHeroDid == 0 or nextEquipData.upHeroDid == "0")) then
|
||||
this.nextEquipBtnStrong:SetActive(false)
|
||||
this.nextEquipBtnRefine:SetActive(false)
|
||||
Log("openType:"..tostring(type))
|
||||
--初始化
|
||||
for i = 1, 2 do
|
||||
this.treasurePanel[i].bg:SetActive(false)
|
||||
this.treasurePanel[i].EquipBtns:SetActive(false)
|
||||
this.treasurePanel[i].EquipBtnStrong:SetActive(false)
|
||||
this.treasurePanel[i].EquipBtnRefine:SetActive(false)
|
||||
this.treasurePanel[i].EquipBtnRemove:SetActive(false)
|
||||
this.treasurePanel[i].EquipBtnAdd:SetActive(false)
|
||||
this.treasurePanel[i].EquipBtnChange:SetActive(false)
|
||||
end
|
||||
this.space:SetActive(false)
|
||||
this.treasurePanel[1].BaseAttri:SetActive(true)
|
||||
|
||||
if type==3 then
|
||||
this.ShowEquipData(1)
|
||||
this.ShowEquipData(2)
|
||||
elseif type==5 then
|
||||
this.resetData()
|
||||
this.ShowEquipData(1)
|
||||
else
|
||||
this.ShowEquipData(1)
|
||||
end
|
||||
|
||||
this.treasurePanel[1].bg:SetActive(true)
|
||||
this.treasurePanel[1].EquipBtns:SetActive((type == 1) or (type == 2))
|
||||
this.treasurePanel[2].EquipBtns:SetActive(type == 3)
|
||||
this.treasurePanel[1].EquipBtnAdd:SetActive(type == 1)
|
||||
this.treasurePanel[1].EquipBtnStrong:SetActive((type == 2) or (type == 4))
|
||||
this.treasurePanel[1].EquipBtnRefine:SetActive((type == 2) or (type == 4))
|
||||
this.treasurePanel[1].EquipBtnRemove:SetActive((type == 2) or (type == 4))
|
||||
this.curEquipSign.gameObject:SetActive(type == 3)
|
||||
|
||||
this.treasurePanel[2].bg:SetActive(type == 3)
|
||||
this.treasurePanel[2].EquipBtnChange:SetActive(type == 3)
|
||||
this.treasurePanel[2].EquipBtnStrong:SetActive(false)
|
||||
this.treasurePanel[2].EquipBtnRefine:SetActive(false)
|
||||
this.space:SetActive(type == 5)
|
||||
|
||||
if equipData[1] and equipData[1] ~= 0 then
|
||||
isGongMing = HarmonyManager.IsInfo(equipData[1].upHeroDid)
|
||||
Util.SetGray(this.treasurePanel[1].EquipBtnStrong, isGongMing)
|
||||
end
|
||||
end
|
||||
function this.ShowCurEquipData()
|
||||
local equipConfigData=ConfigManager.GetConfigData(ConfigName.JewelConfig, curEquipData.id)
|
||||
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, curEquipData.id)
|
||||
this.curEquipBtnStrongRed.gameObject:SetActive(HeroManager.CheckIsUpTreasure(curEquipData.idDyn,1))
|
||||
this.curEquipBtnRefineRed.gameObject:SetActive(HeroManager.CheckIsUpTreasure(curEquipData.idDyn,2))
|
||||
local curPower=EquipTreasureManager.CalculateWarForce(curEquipData.idDyn)
|
||||
this.powerNum1.text=curPower
|
||||
this.desc1.text=GetLanguageStrById(itemConfigData.ItemDescribe)
|
||||
if type==3 and nextEquipData~=nil then
|
||||
local nextPower=EquipTreasureManager.CalculateWarForce(nextEquipData.idDyn)
|
||||
if(curPower>nextPower) then
|
||||
this.powerUPorDown1:SetActive(true)
|
||||
this.powerUPorDown1:GetComponent("Image").sprite=this.spLoader:LoadSprite(PowerChangeIconDef[1])
|
||||
elseif(curPower<nextPower )then
|
||||
this.powerUPorDown1:SetActive(true)
|
||||
this.powerUPorDown1:GetComponent("Image").sprite=this.spLoader:LoadSprite(PowerChangeIconDef[2])
|
||||
|
||||
function this.resetData()
|
||||
|
||||
local single = {}
|
||||
local staticId = curHeroData
|
||||
local currJewel = jewelConfig[staticId]
|
||||
single.id = staticId
|
||||
single.lv = equipData[1]
|
||||
single.refineLv = equipData[2]
|
||||
single.maxLv = currJewel.Max[1]
|
||||
single.maxRefineLv = currJewel.Max[2]
|
||||
single.maxTreeLv = currJewel.GodHoodMaxlv
|
||||
single.upHeroDid = "1"
|
||||
single.treeLv = position
|
||||
|
||||
local quantity = currJewel.Level
|
||||
single.quantity = quantity
|
||||
single.race = currJewel.Race
|
||||
single.frame = GetQuantityImageByquality(quantity)
|
||||
single.name = itemConfig[staticId].Name
|
||||
single.itemConfig = itemConfig[staticId]
|
||||
single.levelPool = currJewel.LevelupPool
|
||||
single.proIcon = GetProStrImageByProNum(currJewel.Race)
|
||||
single.refinePool = currJewel.RankupPool
|
||||
single.treePool = currJewel.GodHoodPool
|
||||
single.equipType = currJewel.Location
|
||||
if currJewel.Location == 1 then
|
||||
single.type = Language[10505]
|
||||
else
|
||||
single.type = Language[10506]
|
||||
end
|
||||
single.icon = GetResourcePath(itemConfig[staticId].ResourceID)
|
||||
equipData[1] = single
|
||||
end
|
||||
|
||||
function this.ShowEquipData(i)
|
||||
local equipConfigData = ConfigManager.GetConfigData(ConfigName.JewelConfig, equipData[i].id)
|
||||
local itemConfigData = ConfigManager.GetConfigData(ConfigName.ItemConfig, equipData[i].id)
|
||||
local Power = {}
|
||||
Power[1] = 0
|
||||
Power[2] = 0
|
||||
|
||||
--计算战力
|
||||
if type == 5 then
|
||||
if i == 1 then
|
||||
if not equipData[i].idDyn then
|
||||
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv, equipData[1].treeLv)
|
||||
else
|
||||
Power[1] = EquipTreasureManager.CalculateWarForce(equipData[1].idDyn)
|
||||
end
|
||||
elseif i == 2 then
|
||||
Power[2] = EquipTreasureManager.CalculateWarForce(equipData[2].idDyn)
|
||||
end
|
||||
elseif type == 3 then
|
||||
if not equipData[i].idDyn then
|
||||
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv, equipData[1].treeLv)
|
||||
else
|
||||
this.powerUPorDown1:SetActive(false)
|
||||
Power[1] = EquipTreasureManager.CalculateWarForce(equipData[1].idDyn)
|
||||
end
|
||||
Power[2] = EquipTreasureManager.CalculateWarForce(equipData[2].idDyn)
|
||||
else
|
||||
if not equipData[i].idDyn then
|
||||
Power[1] = EquipTreasureManager.CalculateWarForceBySid(equipData[1].id, equipData[1].lv, equipData[1].refineLv, equipData[1].treeLv)
|
||||
else
|
||||
Power[1] = EquipTreasureManager.CalculateWarForce(equipData[1].idDyn)
|
||||
end
|
||||
end
|
||||
|
||||
this.treasurePanel[i].powerNum.text = Power[i]
|
||||
--装备描述
|
||||
this.treasurePanel[i].desc.text = GetLanguageStrById(itemConfigData.ItemDescribe)
|
||||
|
||||
if type==3 and equipData[2] ~= nil and i == 1 then
|
||||
if(Power[1] > Power[2]) then
|
||||
this.treasurePanel[1].powerUPorDown:SetActive(true)
|
||||
this.treasurePanel[1].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[1])
|
||||
elseif(Power[1] < Power[2] )then
|
||||
this.treasurePanel[1].powerUPorDown:SetActive(true)
|
||||
this.treasurePanel[1].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[2])
|
||||
else
|
||||
this.treasurePanel[1].powerUPorDown:SetActive(false)
|
||||
end
|
||||
elseif type==3 and equipData[1] ~= nil and i == 2 then
|
||||
if Power[2] > Power[1] then
|
||||
this.treasurePanel[2].powerUPorDown:SetActive(true)
|
||||
this.treasurePanel[2].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[1])
|
||||
elseif Power[2] < Power[1] then
|
||||
this.treasurePanel[2].powerUPorDown:SetActive(true)
|
||||
this.treasurePanel[2].powerUPorDown:GetComponent("Image").sprite = Util.LoadSprite(PowerChangeIconDef[2])
|
||||
else
|
||||
this.treasurePanel[2].powerUPorDown:SetActive(false)
|
||||
end
|
||||
else
|
||||
this.powerUPorDown1:SetActive(false)
|
||||
this.treasurePanel[1].powerUPorDown:SetActive(false)
|
||||
end
|
||||
|
||||
this.qualityText.text=GetStringByEquipQua(equipConfigData.Level,GetQuaStringByEquipQua(equipConfigData.Level))
|
||||
this.curEquipName.text=GetLanguageStrById(itemConfigData.Name)
|
||||
this.curEquipTypeText.text=string.format(Language[11803],EquipTreasureTypeStr[equipConfigData.Location])
|
||||
this.curEquipFrame.sprite = this.spLoader:LoadSprite(curEquipData.frame)
|
||||
this.curEquipIcon.sprite = this.spLoader:LoadSprite(curEquipData.icon)
|
||||
this.currEquipProImg.sprite=this.spLoader:LoadSprite(curEquipData.proIcon)
|
||||
local lv=curEquipData.lv
|
||||
if lv==0 then
|
||||
this.curEquipLvText.gameObject:SetActive(false)
|
||||
else
|
||||
this.curEquipLvText.gameObject:SetActive(true)
|
||||
this.curEquipLvText.text=lv
|
||||
end
|
||||
local refine=curEquipData.refineLv
|
||||
if refine==0 then
|
||||
this.curEquipRefineLvTxt.gameObject:SetActive(false)
|
||||
else
|
||||
this.curEquipRefineLvTxt.gameObject:SetActive(true)
|
||||
this.curEquipRefineLvTxt.text="+"..refine
|
||||
end
|
||||
local info=EquipTreasureManager.GetCurLvPropertyValue(1,curEquipData.levelPool,curEquipData.lv)
|
||||
this.SetPropertyShow(info,curMainpropertyList,this.curMainPropertyGrid)
|
||||
local info1=EquipTreasureManager.GetCurLvPropertyValue(2,curEquipData.refinePool,curEquipData.refineLv)
|
||||
if LengthOfTable(info1)==0 or info1==nil then
|
||||
this.curRefinePropertyTxt.gameObject:SetActive(false)
|
||||
this.curPropertyGrid.gameObject:SetActive(false)
|
||||
else
|
||||
this.curRefinePropertyTxt.gameObject:SetActive(true)
|
||||
this.curPropertyGrid.gameObject:SetActive(true)
|
||||
this.SetPropertyShow(info1,curPropertyList,this.curPropertyGrid)
|
||||
end
|
||||
this.treasurePanel[i].qualityText.text = GetStringByEquipQua(equipConfigData.Level,GetQuaStringByEquipQua(equipConfigData.Level))
|
||||
this.treasurePanel[i].EquipName.text=GetStringByEquipQua(itemConfigData.Quantity,GetLanguageStrById(itemConfigData.Name))
|
||||
this.treasurePanel[i].EquipTypeText.text = string.format(Language[11803],EquipTreasureTypeStr[equipConfigData.Location])
|
||||
this.treasurePanel[i].EquipFrame.sprite = Util.LoadSprite(equipData[i].frame)
|
||||
this.treasurePanel[i].EquipIcon.sprite = Util.LoadSprite(equipData[i].icon)
|
||||
this.treasurePanel[i].EquipProImg.sprite = Util.LoadSprite(equipData[i].proIcon)
|
||||
|
||||
end
|
||||
function this.NextCurEquipData()
|
||||
local equipConfigData=ConfigManager.GetConfigData(ConfigName.JewelConfig, nextEquipData.id)
|
||||
local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, nextEquipData.id)
|
||||
local nextPower=EquipTreasureManager.CalculateWarForce(nextEquipData.idDyn)
|
||||
local curPower=0
|
||||
if curEquipData~=nil then
|
||||
curPower=EquipTreasureManager.CalculateWarForce(curEquipData.idDyn)
|
||||
end
|
||||
this.powerNum2.text=nextPower
|
||||
this.powerUPorDown2:SetActive(false)
|
||||
if type==3 and curEquipData~=null then
|
||||
if nextPower>curPower then
|
||||
this.powerUPorDown2:SetActive(true)
|
||||
this.powerUPorDown2:GetComponent("Image").sprite=this.spLoader:LoadSprite(PowerChangeIconDef[1])
|
||||
elseif nextPower<curPower then
|
||||
this.powerUPorDown2:SetActive(true)
|
||||
this.powerUPorDown2:GetComponent("Image").sprite=this.spLoader:LoadSprite(PowerChangeIconDef[2])
|
||||
else
|
||||
this.powerUPorDown2:SetActive(false)
|
||||
end
|
||||
|
||||
--强化等级
|
||||
local lv = equipData[i].lv
|
||||
if lv == 0 then
|
||||
this.treasurePanel[i].EquipLvText.gameObject:SetActive(false)
|
||||
else
|
||||
this.powerUPorDown1:SetActive(false)
|
||||
this.treasurePanel[i].EquipLvText.gameObject:SetActive(true)
|
||||
this.treasurePanel[i].EquipLvText.text = lv
|
||||
end
|
||||
this.qualityText2.text=GetStringByEquipQua(equipConfigData.Level,GetQuaStringByEquipQua(equipConfigData.Level))
|
||||
this.nextEquipName.text=nextEquipData.name
|
||||
this.desc2.text=GetLanguageStrById(itemConfigData.ItemDescribe)
|
||||
local lv=nextEquipData.lv
|
||||
if lv==0 then
|
||||
this.nextEquipLvText.gameObject:SetActive(false)
|
||||
--精良等级
|
||||
local refine=equipData[i].refineLv
|
||||
if refine == 0 then
|
||||
this.treasurePanel[i].EquipRefineLvTxt.gameObject:SetActive(false)
|
||||
else
|
||||
this.nextEquipLvText.gameObject:SetActive(true)
|
||||
this.nextEquipLvText.text=lv
|
||||
this.treasurePanel[i].EquipRefineLvTxt.gameObject:SetActive(true)
|
||||
this.treasurePanel[i].EquipRefineLvTxt.text="+"..refine
|
||||
end
|
||||
local refine=nextEquipData.refineLv
|
||||
if refine==0 then
|
||||
this.nextEquipRefineLvTxt.gameObject:SetActive(false)
|
||||
--神应等级
|
||||
-- local treeLv = equipData[i].treeLv
|
||||
-- if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or treeLv == 0 then
|
||||
-- this.treasurePanel[i].treeImg:SetActive(false)
|
||||
-- else
|
||||
-- this.treasurePanel[i].treeImg:SetActive(true)
|
||||
-- this.treasurePanel[i].EquipTreeLvTxt.text = treeLv
|
||||
-- end
|
||||
|
||||
--(基础属性)
|
||||
this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,100)
|
||||
local baseInfo = EquipTreasureManager.GetCurLvPropertyValue(1,equipData[i].levelPool,equipData[i].lv)
|
||||
this.treasurePanel[i].BaseAttriNum.text = string.format("[强化等级:%s/%s]",equipData[i].lv,equipData[i].maxLv)
|
||||
this.SetPropertyShow1(baseInfo,this.BasePropertyList[i],this.treasurePanel[i].BaseAttriGrid)
|
||||
--(精炼属性)
|
||||
local refineInfo = EquipTreasureManager.GetCurLvPropertyValue(2,equipData[i].refinePool,equipData[i].refineLv,true)
|
||||
this.treasurePanel[i].RefineAttriNum.text = string.format("[精炼等级:%s/%s]",equipData[i].refineLv,equipData[i].maxRefineLv)
|
||||
if LengthOfTable(refineInfo) == 0 or refineInfo == nil then
|
||||
this.treasurePanel[i].RefineAttri:SetActive(false)
|
||||
else
|
||||
this.nextEquipRefineLvTxt.gameObject:SetActive(true)
|
||||
this.nextEquipRefineLvTxt.text="+" ..refine
|
||||
this.treasurePanel[i].RefineAttri:SetActive(true)
|
||||
this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,250)
|
||||
this.SetPropertyShow1(refineInfo,this.RefinePropertyList[i],this.treasurePanel[i].RefineAttriGrid)
|
||||
end
|
||||
this.nextEquipFrame.sprite = this.spLoader:LoadSprite(nextEquipData.frame)
|
||||
this.nextEquipIcon.sprite = this.spLoader:LoadSprite(nextEquipData.icon)
|
||||
this.nextEquipProImg.sprite=this.spLoader:LoadSprite(nextEquipData.proIcon)
|
||||
this.nextEquipTypeText.text=string.format(Language[11803],EquipTreasureTypeStr[equipConfigData.Location])
|
||||
local info=EquipTreasureManager.GetCurLvPropertyValue(1,nextEquipData.levelPool,nextEquipData.lv)
|
||||
this.SetPropertyShow(info,nextMainPropertyList,this.nextMainPropertyGrid)
|
||||
local info1=EquipTreasureManager.GetCurLvPropertyValue(2,nextEquipData.refinePool,nextEquipData.refineLv)
|
||||
if LengthOfTable(info1)==0 or info1==nil then
|
||||
this.nextRefinePropertyTxt.gameObject:SetActive(false)
|
||||
this.nextPropertyGrid.gameObject:SetActive(false)
|
||||
else
|
||||
this.nextRefinePropertyTxt.gameObject:SetActive(true)
|
||||
this.nextPropertyGrid.gameObject:SetActive(true)
|
||||
this.SetPropertyShow(info1,nextPropertyList,this.nextPropertyGrid)
|
||||
--(神应属性)
|
||||
-- local treeInfo=EquipTreasureManager.GetCurLvPropertyValue(3,equipData[i].treePool,equipData[i].treeLv)
|
||||
-- this.treasurePanel[i].TreeAttriNum.text = string.format("[神应等级:%s/%s]",equipData[i].treeLv,equipData[i].maxTreeLv)
|
||||
-- if equipData[i].upHeroDid == "" or equipData[i].upHeroDid == "0" or treeLv == 0 then
|
||||
-- this.treasurePanel[i].TreeAttri:SetActive(false)
|
||||
-- else
|
||||
-- this.treasurePanel[i].TreeAttri:SetActive(true)
|
||||
-- this.treasurePanel[i].bgScroll:GetComponent("RectTransform").sizeDelta = Vector2.New(800,500)
|
||||
-- this.SetPropertyShow2(treeInfo,this.TreePropertyList[i],this.treasurePanel[i].TreeAttriGrid)
|
||||
-- end
|
||||
if i == 1 then
|
||||
this.treasurePanel[i].StrongRed:SetActive(HeroManager.CheckIsUpTreasure(equipData[i].idDyn,1))
|
||||
this.treasurePanel[i].RefineRed:SetActive(HeroManager.CheckIsUpTreasure(equipData[i].idDyn,2))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function this.SetPropertyShow(_infos,_preList,_grid)
|
||||
--神应专用
|
||||
function this.SetPropertyShow2(_infos,_preList,_grid)
|
||||
local curTree = SacredTreeManager.CulAttri()
|
||||
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0).PropertyUnlcokLevelForClient
|
||||
local dataCount=LengthOfTable(_infos)
|
||||
local preCount = #_preList
|
||||
local preCount=#_preList
|
||||
for i = 1, dataCount-preCount do
|
||||
local go = newObject(this.propertyPre)
|
||||
local go = newObject(this.TextPre)
|
||||
local t = math.floor((i+1)/2)
|
||||
local trans = Util.GetGameObject(_grid.transform,"line ("..t..")")
|
||||
go.transform:SetParent(trans.transform)
|
||||
go.transform.localScale = Vector3.one
|
||||
go.transform.localPosition = Vector3.zero
|
||||
go.gameObject:SetActive(false)
|
||||
table.insert(_preList,go)
|
||||
end
|
||||
local index=1
|
||||
for key, value in pairs(attriConfig) do
|
||||
local obj=_preList[index]
|
||||
local proper=propertyConfig[value[1]]
|
||||
local string
|
||||
if proper.Style==1 then
|
||||
string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue--value.currValue
|
||||
else
|
||||
string = GetLanguageStrById(proper.Info).."+".._infos[value[1]].currValue/100 .."%"
|
||||
end
|
||||
if index <= curTree then
|
||||
string = "<color=#66FF00>"..string.."</color>"
|
||||
else
|
||||
-- string = "<color=#828282>"..string.."\n".."<size=25>(四灵试炼"..attriConfig[index][2].."层解锁)</size></color>"
|
||||
string = "<color=#828282>"..string.."\n".."<size=25>"..string.format("(四灵试炼%s层解锁)",attriConfig[index][2]).."</size></color>"
|
||||
end
|
||||
obj.transform:GetComponent("Text").text = string
|
||||
obj.gameObject:SetActive(true)
|
||||
index=index+1
|
||||
end
|
||||
for i = 1, #_preList do
|
||||
if i>=index then
|
||||
_preList[i]:SetActive(false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this.SetPropertyShow1(_infos,_preList,_grid)
|
||||
local dataCount=LengthOfTable(_infos)
|
||||
local preCount=#_preList
|
||||
for i = 1, dataCount-preCount do
|
||||
local go = newObject(this.TextPre)
|
||||
go.transform:SetParent(_grid.transform)
|
||||
go.transform.localScale = Vector3.one
|
||||
go.transform.localPosition = Vector3.zero
|
||||
|
@ -385,11 +458,10 @@ function this.SetPropertyShow(_infos,_preList,_grid)
|
|||
for key, value in pairs(_infos) do
|
||||
local obj=_preList[index]
|
||||
local proper=propertyConfig[key]
|
||||
Util.GetGameObject(obj, "Text"):GetComponent("Text").text=GetLanguageStrById(proper.Info)
|
||||
if proper.Style==1 then
|
||||
obj.transform:GetComponent("Text").text=" +".. value.currValue
|
||||
obj.transform:GetComponent("Text").text = GetLanguageStrById(proper.Info).."+".. value.currValue
|
||||
else
|
||||
obj.transform:GetComponent("Text").text=" +".. value.currValue/100 .."%"
|
||||
obj.transform:GetComponent("Text").text=GetLanguageStrById(proper.Info).."+"..value.currValue/100 .."%"
|
||||
end
|
||||
obj.gameObject:SetActive(true)
|
||||
index=index+1
|
||||
|
@ -408,19 +480,13 @@ end
|
|||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function RoleEquipTreasureChangePopup:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
type=0--1 穿装备 2 卸装备 3 替换装备
|
||||
curHeroData=nil
|
||||
curEquipData=nil
|
||||
nextEquipData=nil
|
||||
openThisPanel=nil
|
||||
equipIdList=nil
|
||||
equipDataList=nil
|
||||
position=0
|
||||
curMainpropertyList={}
|
||||
nextMainPropertyList={}
|
||||
curPropertyList={}
|
||||
nextPropertyList={}
|
||||
type=0--1 穿装备 2 卸装备 3 替换装备
|
||||
curHeroData=nil
|
||||
equipData=nil
|
||||
openThisPanel=nil
|
||||
equipIdList=nil
|
||||
equipDataList=nil
|
||||
position=0
|
||||
end
|
||||
|
||||
return RoleEquipTreasureChangePopup
|
|
@ -434,36 +434,6 @@ function RoleInfoLayout:OnSortingOrderChange()
|
|||
|
||||
end
|
||||
|
||||
function RoleInfoLayout:IsCanUpLv(curLv, targetLv)
|
||||
-- 如果是进阶不用判断
|
||||
if isHeroUpTuPo and curLv == upTuPoRankUpConfig.LimitLevel then
|
||||
return true
|
||||
end
|
||||
|
||||
-- 没有突破等级时,最大等级为30级
|
||||
local limitLv
|
||||
if not curTuPoRankUpConfig then
|
||||
limitLv = 30
|
||||
end
|
||||
--
|
||||
if curTuPoRankUpConfig then
|
||||
-- 有突破等级,最大等级为当前突破等级的开放等级
|
||||
if not limitLv or limitLv > curTuPoRankUpConfig.OpenLevel then
|
||||
limitLv = curTuPoRankUpConfig.OpenLevel
|
||||
end
|
||||
-- 如果当前达到了最大的突破阶段,最大等级为当前星级的开放等级
|
||||
if curTuPoRankUpConfig.Id == 6 then --curTuPoRankUpConfig.Id == 17 四星英雄最大突破等级配置ID为17
|
||||
if curStarRankUpConfig then
|
||||
limitLv = curStarRankUpConfig.OpenLevel
|
||||
end
|
||||
end
|
||||
end
|
||||
-- 如果目标等级超过限制则不让升级
|
||||
if targetLv > limitLv then
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
--升级按钮点击事件处理
|
||||
function RoleInfoLayout:LvUpClick(isSingleLvUp)
|
||||
--是否为最大等级
|
||||
|
@ -506,11 +476,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
|
|||
else
|
||||
if isUpLvMaterials then
|
||||
if isSingleLvUp then--是否是单次升级
|
||||
if not this:IsCanUpLv(curHeroData.lv, curHeroData.lv + 1) then
|
||||
Log("无法升级")
|
||||
PopupTipPanel.ShowTip("无法升级")
|
||||
return
|
||||
end
|
||||
NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv + 1,curHeroData.lv,function (msg)
|
||||
this:DeleteLvUpMaterials(isSingleLvUp,msg)
|
||||
end)
|
||||
|
@ -539,12 +504,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
|
|||
else
|
||||
if isUpLvMaterials then
|
||||
if isSingleLvUp then--是否是单次升级
|
||||
-- 判断是否可以升级
|
||||
if not this:IsCanUpLv(curHeroData.lv, curHeroData.lv + 1) then
|
||||
Log("无法升级")
|
||||
PopupTipPanel.ShowTip("无法升级")
|
||||
return
|
||||
end
|
||||
local curUpLv = curHeroData.lv
|
||||
if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then
|
||||
curUpLv = curHeroData.lv
|
||||
|
@ -571,12 +530,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp)
|
|||
end
|
||||
--长按升级结束后请求协议
|
||||
function RoleInfoLayout:LongLvUpClick(oldLv)
|
||||
-- 判断是否可以升级
|
||||
if not this:IsCanUpLv(oldLv, curHeroData.lv) then
|
||||
Log("无法升级")
|
||||
PopupTipPanel.ShowTip("无法升级")
|
||||
return
|
||||
end
|
||||
NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv,oldLv,function (msg)
|
||||
this:DeleteLvUpMaterials2(msg)
|
||||
end)
|
||||
|
|
|
@ -36,7 +36,7 @@ function this.InitData(func)
|
|||
end
|
||||
|
||||
function this.InitDataList(id)
|
||||
local configs = ConfigManager.TryGetConfigDataByKey(ConfigName.LingLongPool,"ActivityId",id)
|
||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.LingLongPool,"ActivityId",id)
|
||||
if configs then
|
||||
for i = 1 ,#configs do
|
||||
local data = {}
|
||||
|
|
|
@ -324,7 +324,7 @@ namespace GameEditor.FrameTool {
|
|||
{
|
||||
if (!string.IsNullOrEmpty(versionPath) && Directory.Exists(versionPath))
|
||||
{
|
||||
m_Files = Directory.GetFiles(versionPath, "*", SearchOption.AllDirectories);
|
||||
m_Files = Directory.GetFiles(versionPath, "*.txt", SearchOption.AllDirectories);
|
||||
m_Choose = new bool[m_Files.Length];
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue